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).
27 lines
1.9 KiB
Diff
27 lines
1.9 KiB
Diff
diff -up qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp.linguist_qtmake-qt4 qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp
|
|
--- qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp.linguist_qtmake-qt4 2012-04-26 21:45:50.000000000 +0200
|
|
+++ qt-everywhere-opensource-src-4.8.2/tools/linguist/lrelease/main.cpp 2012-05-29 12:17:03.416561535 +0200
|
|
@@ -314,9 +314,9 @@ int main(int argc, char **argv)
|
|
parseHandler.verbose = evalHandler.verbose = cd.isVerbose();
|
|
ProFileOption option;
|
|
#ifdef QT_BOOTSTRAPPED
|
|
- option.initProperties(binDir + QLatin1String("/qmake"));
|
|
+ option.initProperties(binDir + QLatin1String("/qmake-qt4"));
|
|
#else
|
|
- option.initProperties(app.applicationDirPath() + QLatin1String("/qmake"));
|
|
+ option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4"));
|
|
#endif
|
|
ProFileParser parser(0, &parseHandler);
|
|
ProFileEvaluator visitor(&option, &parser, &evalHandler);
|
|
diff -up qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp.linguist_qtmake-qt4 qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp
|
|
--- qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp.linguist_qtmake-qt4 2012-04-26 21:45:50.000000000 +0200
|
|
+++ qt-everywhere-opensource-src-4.8.2/tools/linguist/lupdate/main.cpp 2012-05-29 11:46:48.811134546 +0200
|
|
@@ -765,7 +765,7 @@ int main(int argc, char **argv)
|
|
|
|
parseHandler.verbose = evalHandler.verbose = !!(options & Verbose);
|
|
ProFileOption option;
|
|
- option.initProperties(app.applicationDirPath() + QLatin1String("/qmake"));
|
|
+ option.initProperties(app.applicationDirPath() + QLatin1String("/qmake-qt4"));
|
|
option.setCommandLineArguments(QStringList() << QLatin1String("CONFIG+=lupdate_run"));
|
|
ProFileParser parser(0, &parseHandler);
|
|
|