diff --git a/qt-everywhere-opensource-src-4.8.5-qt_plugin_path.patch b/qt-everywhere-opensource-src-4.8.5-qt_plugin_path.patch index d95419e..6a87783 100644 --- a/qt-everywhere-opensource-src-4.8.5-qt_plugin_path.patch +++ b/qt-everywhere-opensource-src-4.8.5-qt_plugin_path.patch @@ -1,7 +1,7 @@ -diff -up qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp ---- qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins 2013-06-07 00:16:52.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp 2013-06-18 13:31:35.357173956 -0500 -@@ -2511,6 +2511,24 @@ QStringList QCoreApplication::libraryPat +diff -up qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp.qt_plugin_path qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp +--- qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp.qt_plugin_path 2013-06-07 00:16:52.000000000 -0500 ++++ qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication.cpp 2013-06-21 07:14:10.045039936 -0500 +@@ -2511,6 +2511,15 @@ QStringList QCoreApplication::libraryPat if (!app_libpaths->contains(installPathPlugins)) app_libpaths->append(installPathPlugins); } @@ -14,15 +14,6 @@ diff -up qt-everywhere-opensource-src-4.8.5/src/corelib/kernel/qcoreapplication. + if (!app_libpaths->contains(kde4PathPlugins)) + app_libpaths->append(kde4PathPlugins); + } -+ -+ // hack in support for multilib qt4 plugin path -- Rex -+ QString qt4_multilibPathPlugins = QLatin1String("/usr/lib/qt4/plugins"); -+ if (QFile::exists(qt4_multilibPathPlugins)) { -+ // Make sure we convert from backslashes to slashes. -+ //qt4_multilibPathPlugins = QDir(qt4_multilibPathPlugins).canonicalPath(); -+ if (!app_libpaths->contains(qt4_multilibPathPlugins)) -+ app_libpaths->append(qt4_multilibPathPlugins); -+ } #endif // If QCoreApplication is not yet instantiated, diff --git a/qt.spec b/qt.spec index 486d413..1af6def 100644 --- a/qt.spec +++ b/qt.spec @@ -27,7 +27,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.8.5 -Release: 0.4.%{pre}%{?dist} +Release: 0.5.%{pre}%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -1173,6 +1173,9 @@ fi %changelog +* Fri Jun 21 2013 Rex Dieter 4.8.5-0.5.rc2 +- drop multilib portion from qt_plugin_path.patch + * Tue Jun 18 2013 Rex Dieter 4.8.5-0.4.rc2 - (re)add kde4/multilib QT_PLUGIN_PATH