rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rebase patch

Browse Source
This commit is contained in:
Lukas Tinkl 2009-06-25 18:02:40 +00:00
parent ea3337dff5
commit 91c2fd10b6
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qt-x11-opensource-src-4.5.0-qdoc3.patch
View File

@ -1,22 +1,21 @@
diff -up qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro.qdoc3 qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro diff -ur qt-orig/tools/qdoc3/qdoc3.pro qt-4.5.2/tools/qdoc3/qdoc3.pro
--- qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro.qdoc3 2009-02-25 15:09:26.000000000 -0600 --- qt-orig/tools/qdoc3/qdoc3.pro 2009-06-20 06:57:59.000000000 +0200
+++ qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro 2009-03-04 09:30:05.000000000 -0600 +++ qt-4.5.2/tools/qdoc3/qdoc3.pro 2009-06-25 20:00:12.000000000 +0200
@@ -106,3 +106,7 @@ win32 { @@ -99,3 +99,6 @@
QT_WINCONFIG = debug webxmlgenerator.cpp \
} yyindent.cpp
}
+
+TARGET= qdoc3 +TARGET= qdoc3
+target.path = $$[QT_INSTALL_BINS] +target.path = $$[QT_INSTALL_BINS]
+INSTALLS += target +INSTALLS += target
diff -up qt-x11-opensource-src-4.5.0/tools/tools.pro.qdoc3 qt-x11-opensource-src-4.5.0/tools/tools.pro diff -ur qt-orig/tools/tools.pro qt-4.5.2/tools/tools.pro
--- qt-x11-opensource-src-4.5.0/tools/tools.pro.qdoc3 2009-02-25 15:09:27.000000000 -0600 --- qt-orig/tools/tools.pro 2009-06-20 06:57:59.000000000 +0200
+++ qt-x11-opensource-src-4.5.0/tools/tools.pro 2009-03-04 09:44:18.000000000 -0600 +++ qt-4.5.2/tools/tools.pro 2009-06-25 19:59:19.000000000 +0200
@@ -13,6 +13,7 @@ no-png { @@ -13,6 +13,7 @@
SUBDIRS += designer SUBDIRS += designer
} }
SUBDIRS += linguist SUBDIRS += linguist
+ SUBDIRS += qdoc3 + SUBDIRS += qdoc3
wince*: SUBDIRS = qtestlib designer wince*: SUBDIRS = qtestlib designer
unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
win32:!wince*:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt win32:!wince*:SUBDIRS += activeqt

40
qt-x11-opensource-src-4.5.1-phonon.patch
View File

@ -1,19 +1,7 @@
diff -up qt-x11-opensource-src-4.5.1/src/3rdparty/phonon/gstreamer/gstreamer.desktop.orig qt-x11-opensource-src-4.5.1/src/3rdparty/phonon/gstreamer/gstreamer.desktop diff -ur qt-orig/src/phonon/phonon.pro qt-x11-opensource-src-4.5.2/src/phonon/phonon.pro
--- qt-x11-opensource-src-4.5.1/src/3rdparty/phonon/gstreamer/gstreamer.desktop.orig 2009-06-07 14:00:40.000000000 +0200 --- qt-orig/src/phonon/phonon.pro 2009-06-20 06:57:57.000000000 +0200
+++ qt-x11-opensource-src-4.5.1/src/3rdparty/phonon/gstreamer/gstreamer.desktop 2009-06-07 14:00:46.000000000 +0200 +++ qt-x11-opensource-src-4.5.2/src/phonon/phonon.pro 2009-06-25 19:30:00.000000000 +0200
@@ -2,7 +2,7 @@ @@ -112,4 +112,9 @@
Type=Service
X-KDE-ServiceTypes=PhononBackend
MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;x-mpegurl;audio/x-mpegurl;audio/mp3;audio/mpeg;
-X-KDE-Library=phonon_gstreamer
+X-KDE-Library=libphonon_gstreamer
X-KDE-PhononBackendInfo-InterfaceVersion=1
X-KDE-PhononBackendInfo-Version=0.1
X-KDE-PhononBackendInfo-Website=http://gstreamer.freedesktop.org/
diff -up qt-x11-opensource-src-4.5.1/src/phonon/phonon.pro.orig qt-x11-opensource-src-4.5.1/src/phonon/phonon.pro
--- qt-x11-opensource-src-4.5.1/src/phonon/phonon.pro.orig 2009-06-07 12:38:34.000000000 +0200
+++ qt-x11-opensource-src-4.5.1/src/phonon/phonon.pro 2009-06-07 13:55:48.000000000 +0200
@@ -112,4 +112,9 @@ contains(QT_CONFIG, dbus) {
DEFINES += QT_NO_DBUS DEFINES += QT_NO_DBUS
} }
@ -23,10 +11,10 @@ diff -up qt-x11-opensource-src-4.5.1/src/phonon/phonon.pro.orig qt-x11-opensourc
+INSTALLS += sources +INSTALLS += sources
+ +
contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols
diff -up qt-x11-opensource-src-4.5.1/src/plugins/phonon/gstreamer/gstreamer.pro.orig qt-x11-opensource-src-4.5.1/src/plugins/phonon/gstreamer/gstreamer.pro diff -ur qt-orig/src/plugins/phonon/gstreamer/gstreamer.pro qt-x11-opensource-src-4.5.2/src/plugins/phonon/gstreamer/gstreamer.pro
--- qt-x11-opensource-src-4.5.1/src/plugins/phonon/gstreamer/gstreamer.pro.orig 2009-06-07 13:11:28.000000000 +0200 --- qt-orig/src/plugins/phonon/gstreamer/gstreamer.pro 2009-06-20 06:57:58.000000000 +0200
+++ qt-x11-opensource-src-4.5.1/src/plugins/phonon/gstreamer/gstreamer.pro 2009-06-07 13:57:15.000000000 +0200 +++ qt-x11-opensource-src-4.5.2/src/plugins/phonon/gstreamer/gstreamer.pro 2009-06-25 19:31:36.000000000 +0200
@@ -62,6 +62,9 @@ SOURCES += $$PHONON_GSTREAMER_DIR/audioo @@ -62,6 +62,8 @@
} }
target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
@ -36,3 +24,15 @@ diff -up qt-x11-opensource-src-4.5.1/src/plugins/phonon/gstreamer/gstreamer.pro.
+INSTALLS += target services +INSTALLS += target services
include(../../qpluginbase.pri) include(../../qpluginbase.pri)
diff -ur qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop
--- qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop 2009-06-20 06:57:54.000000000 +0200
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop 2009-06-25 19:30:00.000000000 +0200
@@ -2,7 +2,7 @@
Type=Service
X-KDE-ServiceTypes=PhononBackend
MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;x-mpegurl;audio/x-mpegurl;audio/mp3;audio/mpeg;
-X-KDE-Library=phonon_gstreamer
+X-KDE-Library=libphonon_gstreamer
X-KDE-PhononBackendInfo-InterfaceVersion=1
X-KDE-PhononBackendInfo-Version=0.1
X-KDE-PhononBackendInfo-Website=http://gstreamer.freedesktop.org/