mirror of
git://slackware.nl/current.git
synced 2025-01-04 23:02:35 +01:00
125048ad7d
d/gcc-9.1.0-x86_64-1.txz: Upgraded. d/gcc-brig-9.1.0-x86_64-1.txz: Upgraded. d/gcc-g++-9.1.0-x86_64-1.txz: Upgraded. d/gcc-gfortran-9.1.0-x86_64-1.txz: Upgraded. d/gcc-gnat-9.1.0-x86_64-1.txz: Upgraded. d/gcc-go-9.1.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. d/gcc-objc-9.1.0-x86_64-1.txz: Upgraded. d/libtool-2.4.6-x86_64-11.txz: Rebuilt. Recompiled to update embedded GCC version number. d/llvm-8.0.0-x86_64-2.txz: Rebuilt. Recompiled with -DLLVM_INSTALL_UTILS=ON. Thanks to Lockywolf. d/swig-4.0.0-x86_64-1.txz: Upgraded. l/glib2-2.60.2-x86_64-1.txz: Upgraded. l/qt-4.8.7-x86_64-13.txz: Rebuilt. Patched to fix FTBFS with gcc9 (also fixes FTBFS with qtscriptgenerator and possibly other projects that use qt4).
19 lines
1.1 KiB
Diff
19 lines
1.1 KiB
Diff
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);
|
|
}
|
|
+
|
|
+ // 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,
|