Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2018-01-09 14:48:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4" Tue Jan 9 14:48:07 2018 rev:225 rq:560556 version:4.8.7 Changes: -------- libqt4-sql-plugins.changes: same change --- /work/SRC/openSUSE:Factory/libqt4/libqt4.changes 2017-12-16 20:44:49.930280056 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4.changes 2018-01-09 14:48:08.414016437 +0100 @@ -1,0 +2,6 @@ +Tue Dec 26 12:42:05 UTC 2017 - [email protected] + +- Change fix-build-icu59.patch to build qlocale_icu.cpp with + -std=c++11 to support ICU60 headers + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ libqt4-sql-plugins.spec: same change libqt4.spec: same change ++++++ fix-build-icu59.patch ++++++ --- /var/tmp/diff_new_pack.RjpybD/_old 2018-01-09 14:48:13.945757066 +0100 +++ /var/tmp/diff_new_pack.RjpybD/_new 2018-01-09 14:48:13.945757066 +0100 @@ -1,29 +1,28 @@ -From: Fabian Vogt <[email protected]> +From: Fabian Vogt <[email protected]> Subject: Fix build with ICU >= 59 -This works around the C++11 requirement of ICU4C >= 59, -resulting in -/usr/include/unicode/umachine.h:347:13: error: 'char16_t' does not name a type -and ultimately: -/usr/include/unicode/uversion.h:167:55: error: 'UChar' does not name a type +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. ---- - src/corelib/tools/qlocale_icu.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/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/qlocale_icu.cpp -+++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/qlocale_icu.cpp -@@ -43,6 +43,11 @@ - #include "qlibrary.h" - #include "qdebug.h" +--- 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) -+#if __cplusplus < 201103L -+// ICU59 requires C++11, work around that -+typedef qint16 char16_t; -+#endif + 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 + - #include "unicode/uversion.h" - #include "unicode/ucol.h" ++ SOURCES_CPP11 += tools/qlocale_icu.cpp + DEFINES += QT_USE_ICU + }
