drop upstream patch
This commit is contained in:
parent
22be3c359a
commit
ea3337dff5
@ -1,15 +0,0 @@
|
|||||||
diff -up qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp.broken qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp
|
|
||||||
--- qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp.broken 2009-03-25 13:42:23.000000000 -0400
|
|
||||||
+++ qt-x11-opensource-src-4.5.0/src/corelib/global/qlibraryinfo.cpp 2009-03-25 13:58:04.000000000 -0400
|
|
||||||
@@ -488,7 +488,11 @@ QT_END_NAMESPACE
|
|
||||||
# include <sys/syscall.h>
|
|
||||||
# include <unistd.h>
|
|
||||||
|
|
||||||
+#if defined(QT_ARCH_IA64)
|
|
||||||
+char boilerplate[] =
|
|
||||||
+#else
|
|
||||||
static const char boilerplate[] =
|
|
||||||
+#endif
|
|
||||||
"This is the QtCore library version " QT_VERSION_STR "\n"
|
|
||||||
"Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
|
|
||||||
"Contact: Qt Software Information (qt-info@nokia.com)\n"
|
|
@ -1,11 +0,0 @@
|
|||||||
--- qt-x11-opensource-src-4.5.1/configure 2009-04-22 01:57:35.000000000 +0200
|
|
||||||
+++ qt-x11-opensource-src-4.5.1.new/configure 2009-06-02 17:58:00.000000000 +0200
|
|
||||||
@@ -3970,7 +3984,7 @@
|
|
||||||
[ "$CFG_DEV" = "yes" ] && SYNCQT_OPTS="$SYNCQT_OPTS -check-includes"
|
|
||||||
if [ "$OPT_SHADOW" = "yes" ]; then
|
|
||||||
"$outpath/bin/syncqt" $SYNCQT_OPTS
|
|
||||||
- elif [ "$CFG_DEV" = "yes" ]; then
|
|
||||||
+ elif [ "$CFG_DEV" = "yes" ] || [ ! -d $relpath/include ]; then
|
|
||||||
QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS
|
|
||||||
fi
|
|
||||||
fi
|
|
2
qt.spec
2
qt.spec
@ -46,7 +46,6 @@ Patch16: qt-x11-opensource-src-4.5.1-kde4_plugins.patch
|
|||||||
# (The GStreamer backend handles this entirely differently, with a separate
|
# (The GStreamer backend handles this entirely differently, with a separate
|
||||||
# "sink" setting, and should pick up the PulseAudio "sink" without patches.)
|
# "sink" setting, and should pick up the PulseAudio "sink" without patches.)
|
||||||
Patch17: phonon-4.2.96-pulseaudio.patch
|
Patch17: phonon-4.2.96-pulseaudio.patch
|
||||||
Patch18: qt-x11-opensource-src-4.5.1-syncqt-header.patch
|
|
||||||
Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
|
Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
|
||||||
|
|
||||||
## upstreamable bits
|
## upstreamable bits
|
||||||
@ -379,7 +378,6 @@ test -x apply_patches && ./apply_patches
|
|||||||
pushd src/3rdparty/phonon
|
pushd src/3rdparty/phonon
|
||||||
%patch17 -p1 -b .phonon-pulseaudio
|
%patch17 -p1 -b .phonon-pulseaudio
|
||||||
popd
|
popd
|
||||||
%patch18 -p1 -b .header
|
|
||||||
%patch19 -p1 -b .servicesfile
|
%patch19 -p1 -b .servicesfile
|
||||||
%patch51 -p1 -b .qdoc3
|
%patch51 -p1 -b .qdoc3
|
||||||
%patch52 -p1 -b .sparc64
|
%patch52 -p1 -b .sparc64
|
||||||
|
Loading…
Reference in New Issue
Block a user