rpms/qt/devel qt-x11-opensource-src-4.5.1-kde4_plugins.patch, NONE, 1.1 qt.spec, 1.276, 1.277

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6363

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.1-kde4_plugins.patch 
Log Message:
* Wed May 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-9
- include kde4 plugin path by default (#498809)


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

--- NEW FILE qt-x11-opensource-src-4.5.1-kde4_plugins.patch ---
diff -up qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp
--- qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins	2009-04-21 18:57:41.000000000 -0500
+++ qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp	2009-05-06 13:53:40.258081854 -0500
@@ -2061,6 +2061,15 @@ QStringList QCoreApplication::libraryPat
                 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);
+        }
+
         // If QCoreApplication is not yet instantiated,
         // make sure we add the application path when we construct the QCoreApplication
         if (self) self->d_func()->appendApplicationPathToLibraryPaths();


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -p -r1.276 -r1.277
--- qt.spec	4 May 2009 14:40:25 -0000	1.276
+++ qt.spec	6 May 2009 19:46:13 -0000	1.277
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -42,6 +42,8 @@ Patch13: qt-x11-opensource-src-4.5.0-gcc
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
 Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.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 
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -347,6 +349,7 @@ test -x apply_patches && ./apply_patches
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
 %patch15 -p1 -b .enable_ft_lcdfilter
+%patch16 -p1 -b .kde4_plugins
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
@@ -825,6 +828,9 @@ gtk-update-icon-cache -q %{_datadir}/ico
 
 
 %changelog
+* Wed May 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-9
+- include kde4 plugin path by default (#498809)
+
 * Mon May 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-8
 - fix invalid assumptions about mysql_config --libs (bug #440673)
 - fix %%files breakage from 4.5.1-5