...
 
qt4-x11 (4:4.8.7+dfsg-17) UNRELEASED; urgency=medium
[ Lisandro Damián Nicanor Pérez Meyer ]
* Add fix-build-icu59.patch from OpenSuse. Fixes build with icu59
(Closes: #898542). Thanks John Paul Adrian Glaubitz for digging the
patch!
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 15 May 2018 12:57:22 -0300
qt4-x11 (4:4.8.7+dfsg-16) unstable; urgency=medium
* Update symbols files with buildds' logs.
......
Description: 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.
Origin: https://build.opensuse.org/package/view_file/KDE:Qt/libqt4/fix-build-icu59.patch
Author: Fabian Vogt <fabian@ritter-vogt.de>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=898542
Forwarded: not-needed
Reviewd-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
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
}
......@@ -65,3 +65,4 @@ add-mate-support.patch
add-lxde-support.patch
openssl_1.1.patch
riscv64-support.patch
fix-build-icu59.patch