mirror of
git://slackware.nl/current.git
synced 2024-12-31 10:28:29 +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).
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From: Fabian Vogt <fabian@ritter-vogt.de>
|
|
Subject: Fix build with ICU >= 59
|
|
|
|
ICU >= 59 requires C++11 for its header files.
|
|
Qt can't be compiled with -std=c++11 as a whole, so only enable
|
|
it for qlocale_icu.cpp.
|
|
|
|
Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri
|
|
===================================================================
|
|
--- qt-everywhere-opensource-src-4.8.7.orig/src/corelib/tools/tools.pri
|
|
+++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri
|
|
@@ -102,7 +102,15 @@ contains(QT_CONFIG, zlib):include($$PWD/
|
|
else:include($$PWD/../../3rdparty/zlib_dependency.pri)
|
|
|
|
contains(QT_CONFIG,icu) {
|
|
- SOURCES += tools/qlocale_icu.cpp
|
|
+ cpp11.name = cpp11
|
|
+ cpp11.input = SOURCES_CPP11
|
|
+ cpp11.dependency_type = TYPE_C
|
|
+ cpp11.variable_out = OBJECTS
|
|
+ cpp11.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)}
|
|
+ cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++11 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
|
|
+ QMAKE_EXTRA_COMPILERS += cpp11
|
|
+
|
|
+ SOURCES_CPP11 += tools/qlocale_icu.cpp
|
|
DEFINES += QT_USE_ICU
|
|
}
|
|
|