rev 15465 - in trunk/packages/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-08-03 19:09:57 +0000 (Mon, 03 Aug 2009)
New Revision: 15465

Added:
   trunk/packages/qt4-x11/debian/patches/08_add_kde4_plugins_path_539623.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
Add patch to add KDE 4 plugins path to libraries paths list. (Closes: #539623)


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2009-08-03 17:28:55 UTC (rev 15464)
+++ trunk/packages/qt4-x11/debian/changelog	2009-08-03 19:09:57 UTC (rev 15465)
@@ -7,6 +7,8 @@
     character references, which allows remote attackers to execute
     arbitrary code or cause a denial of service (memory corruption and
     application crash) via a crafted HTML document.
+  * Add patch to add KDE 4 plugins path to libraries paths list.
+    (Closes: #539623)
 
   +++ Changes by Sune Vuorela:
 

Added: trunk/packages/qt4-x11/debian/patches/08_add_kde4_plugins_path_539623.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/08_add_kde4_plugins_path_539623.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/08_add_kde4_plugins_path_539623.diff	2009-08-03 19:09:57 UTC (rev 15465)
@@ -0,0 +1,17 @@
+author: Fathi Boudra <fabo at debian.org>
+
+--- a/src/corelib/kernel/qcoreapplication.cpp
++++ b/src/corelib/kernel/qcoreapplication.cpp
+@@ -2061,6 +2061,12 @@ QStringList QCoreApplication::libraryPat
+                 app_libpaths->append(installPathPlugins);
+         }
+ 
++        QString kde4PathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + QLatin1String("/kde4/plugins");
++        if (QFile::exists(kde4PathPlugins)) {
++            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();

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2009-08-03 17:28:55 UTC (rev 15464)
+++ trunk/packages/qt4-x11/debian/patches/series	2009-08-03 19:09:57 UTC (rev 15465)
@@ -18,6 +18,7 @@
 05_append_qt4_target.diff
 06_CVE-2009-1725.diff
 07_trust_dpkg-arch_over_uname-m.diff
+08_add_kde4_plugins_path_539623.diff
 09_qmake_lflags_as-needed.diff
 10_config_tests_fixes.diff
 14_add_libraries_to_gui_build_where_actually_needed.diff