mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
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
|
|
}
|
|
|