rpms/qt/devel qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch, NONE, 1.1 qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch, NONE, 1.1 qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch, NONE, 1.1 qt.spec, 1.413, 1.414 qt-x11-opensource-src-4.5.1-kde4_plugins.patch, 1.2, NONE qt-x11-opensource-src-4.5.1-mysql_config.patch, 1.2, NONE qt-x11-opensource-src-4.5.1-phonon.patch, 1.3, NONE

Rex Dieter rdieter at fedoraproject.org
Thu Jul 8 14:08:08 UTC 2010 

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19676

Modified Files:
	qt.spec 
Added Files:
	qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch 
	qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch 
	qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch 
Removed Files:
	qt-x11-opensource-src-4.5.1-kde4_plugins.patch 
	qt-x11-opensource-src-4.5.1-mysql_config.patch 
	qt-x11-opensource-src-4.5.1-phonon.patch 
Log Message:
* Thu Jul 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.0-0.26.beta1
- rebase patches, avoiding use of patch fuzz
- omit old qt-copy/kde-qt patches, pending review
- omit kde4_plugin patch
- ftbfs: qml/libQtMediaServices no longer included


qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch:
 qcoreapplication.cpp |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch ---
diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp
--- qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins	2010-06-29 20:53:15.000000000 -0500
+++ qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp	2010-07-08 08:24:12.714604479 -0500
@@ -2262,6 +2262,15 @@ QStringList QCoreApplication::libraryPat
             if (!app_libpaths->contains(installPathPlugins))
                 app_libpaths->append(installPathPlugins);
         }
+
+        // hack in support for kde4 plugin paths -- Rex
+        QString kde4PathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + QLatin1String("/kde4/plugins");
+        if (QFile::exists(kde4PathPlugins)) {
+            // Make sure we convert from backslashes to slashes.
+            // kde4PathPlugins = QDir(kde4PathPlugins).canonicalPath();
+            if (!app_libpaths->contains(kde4PathPlugins))
+                app_libpaths->append(kde4PathPlugins);
+        }
 #endif
 
         // If QCoreApplication is not yet instantiated,

qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch:
 configure |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch ---
diff -up qt-everywhere-opensource-src-4.7.0-beta2/configure.mysql_config qt-everywhere-opensource-src-4.7.0-beta2/configure
--- qt-everywhere-opensource-src-4.7.0-beta2/configure.mysql_config	2010-06-29 20:53:10.000000000 -0500
+++ qt-everywhere-opensource-src-4.7.0-beta2/configure	2010-07-08 08:30:32.148864934 -0500
@@ -4849,8 +4849,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
 		[ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`"$WHICH" mysql_config`
                 if [ -x "$CFG_MYSQL_CONFIG" ]; then
                     QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null`
+                    $CFG_MYSQL_CONFIG --pkglibdir &>/dev/null && \
+                      QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null`
+                    if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then
+                    QT_LFLAGS_MYSQL_R="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient_r"
+                    QT_LFLAGS_MYSQL="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient"
+                    else
                     QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null`
                     QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null`
+                    fi
 		    QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null`
                     QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1`
                 fi

qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch:
 3rdparty/phonon/gstreamer/gstreamer.desktop |    2 +-
 phonon/phonon.pro                           |    5 +++++
 plugins/phonon/gstreamer/gstreamer.pro      |    4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch ---
diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop.servicesfile qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop
--- qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop.servicesfile	2010-06-29 20:53:12.000000000 -0500
+++ qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop	2010-07-08 08:25:50.419855085 -0500
@@ -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/
diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro.servicesfile qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro
--- qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro.servicesfile	2010-06-29 20:53:13.000000000 -0500
+++ qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro	2010-07-08 08:26:58.307612257 -0500
@@ -122,6 +122,11 @@ contains(QT_CONFIG, dbus) {
        DEFINES += QT_NO_DBUS
 }
 
+# install dbus service file
+sources.files = $$PHONON_DIR/org.kde.Phonon.AudioOutput.xml
+sources.path = /usr/share/dbus-1/interfaces
+INSTALLS += sources
+
 contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols
 
 unix:!isEmpty(QT_CFLAGS_PULSEAUDIO) {
diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro.servicesfile qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro
--- qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro.servicesfile	2010-06-29 20:53:14.000000000 -0500
+++ qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro	2010-07-08 08:25:50.387854526 -0500
@@ -64,6 +64,8 @@ SOURCES += $$PHONON_GSTREAMER_DIR/abstra
 }
 
 target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
-INSTALLS += target
+services.files = $$PHONON_GSTREAMER_DIR/gstreamer.desktop
+services.path = /usr/share/kde4/services/phononbackends
+INSTALLS += target services
 
 include(../../qpluginbase.pri)


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -p -r1.413 -r1.414
--- qt.spec	8 Jul 2010 13:04:26 -0000	1.413
+++ qt.spec	8 Jul 2010 14:08:07 -0000	1.414
@@ -8,10 +8,8 @@
 ## WAS https://bugs.webkit.org/show_bug.cgi?id=35154
 #define no_javascript_jit  -no-javascript-jit
 
-%define _default_patch_fuzz 3 
-
 # enable kde-qt integration/patches 
-%define kde_qt 1
+#define kde_qt 1
 
 %define pre beta2
 
@@ -19,7 +17,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.7.0
-Release: 0.25.%{pre}%{?dist}
+Release: 0.26.%{pre}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -44,8 +42,9 @@ Patch4: qt-everywhere-opensource-src-4.7
 Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
 Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 # include kde4 plugin path, http://bugzilla.redhat.com/498809
-Patch16: qt-x11-opensource-src-4.5.1-kde4_plugins.patch 
-Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
+# omit for now, (seems?) causes unwelcome side-effects -- Rex
+Patch16: qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch 
+Patch19: qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch 
 # use system ca-bundle certs, http://bugzilla.redhat.com/521911
 Patch22: qt-x11-opensource-src-4.5.3-system_ca_certificates.patch 
 Requires: ca-certificates
@@ -58,7 +57,7 @@ Patch23: qt-everywhere-opensource-src-4.
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 # fix invalid assumptions about mysql_config --libs
 # http://bugzilla.redhat.com/440673
-Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
+Patch54: qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch
 # http://bugs.kde.org/show_bug.cgi?id=180051#c22
 Patch55: qt-everywhere-opensource-src-4.6.2-cups.patch
 # Add s390x as 64bit and s390 as 31bit bigendian platform
@@ -416,8 +415,8 @@ Qt libraries used for drawing widgets an
 
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch15 -p1 -b .enable_ft_lcdfilter
-%patch16 -p1 -b .kde4_plugins
-%patch19 -p1 -b .servicesfile
+#patch16 -p1 -b .kde4_plugins
+%patch19 -p1 -b .phonon_servicesfile
 %patch22 -p1 -b .system_ca_certificates
 %patch23 -p1 -b .glib_eventloop_nullcheck
 ## TODO: still worth carrying?  if so, upstream it.
@@ -1072,7 +1071,6 @@ fi
 %{_qt4_libdir}/libQtDesignerComponents.so.4*
 %{_qt4_libdir}/libQtGui.so.4*
 %{_qt4_libdir}/libQtHelp.so.4*
-%{_qt4_libdir}/libQtMediaServices.so.4*
 %{_qt4_libdir}/libQtMultimedia.so.4*
 %{_qt4_libdir}/libQtOpenGL.so.4*
 %{_qt4_libdir}/libQtScriptTools.so.4*
@@ -1086,12 +1084,10 @@ fi
 %endif
 %if "%{_qt4_bindir}" != "%{_bindir}"
 %{_bindir}/assistant*
-%{_bindir}/qml
 %{?dbus:%{_bindir}/qdbusviewer}
 %{_bindir}/qt*config*
 %endif
 %{_qt4_bindir}/assistant*
-%{_qt4_bindir}/qml
 %{?dbus:%{_qt4_bindir}/qdbusviewer}
 %{_qt4_bindir}/qt*config*
 %{_datadir}/applications/*qtconfig.desktop
@@ -1099,6 +1095,12 @@ fi
 
 
 %changelog
+* Thu Jul 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.0-0.26.beta1
+- rebase patches, avoiding use of patch fuzz
+- omit old qt-copy/kde-qt patches, pending review
+- omit kde4_plugin patch
+- ftbfs: qml/libQtMediaServices no longer included
+
 * Thu Jul 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.0-0.25.beta1
 - 4.7.0-beta2
 


--- qt-x11-opensource-src-4.5.1-kde4_plugins.patch DELETED ---


--- qt-x11-opensource-src-4.5.1-mysql_config.patch DELETED ---


--- qt-x11-opensource-src-4.5.1-phonon.patch DELETED ---

More information about the scm-commits mailing list