icu59.patch

   1 From: Fabian Vogt <fabian@ritter-vogt.de>
   2 Subject: Fix build with ICU >= 59
   3
   4 ICU >= 59 requires C++11 for its header files.
   5 Qt can't be compiled with -std=c++11 as a whole, so only enable
   6 it for qlocale_icu.cpp.
   7
   8 Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri
   9 ===================================================================
  10 --- qt-everywhere-opensource-src-4.8.7.orig/src/corelib/tools/tools.pri
  11 +++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri
  12 @@ -102,7 +102,15 @@ contains(QT_CONFIG, zlib):include($$PWD/
  13  else:include($$PWD/../../3rdparty/zlib_dependency.pri)
  14
  15  contains(QT_CONFIG,icu) {
  16 -    SOURCES += tools/qlocale_icu.cpp
  17 +    cpp11.name = cpp11
  18 +    cpp11.input = SOURCES_CPP11
  19 +    cpp11.dependency_type = TYPE_C
  20 +    cpp11.variable_out = OBJECTS
  21 +    cpp11.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)}
  22 +    cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++11 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
  23 +    QMAKE_EXTRA_COMPILERS += cpp11
  24 +
  25 +    SOURCES_CPP11 += tools/qlocale_icu.cpp
  26      DEFINES += QT_USE_ICU
  27  }
  28
  29 --- qt-everywhere-opensource-src-4.8.7/config.tests/unix/icu/icu.pro.orig       2015-05-07 16:14:42.000000000 +0200
  30 +++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/icu/icu.pro    2019-04-18 17:14:05.122419116 +0200
  31 @@ -1,4 +1,11 @@
  32 -SOURCES = icu.cpp
  33 +cpp11.name = cpp11
  34 +cpp11.input = SOURCES_CPP11
  35 +cpp11.dependency_type = TYPE_C
  36 +cpp11.variable_out = OBJECTS
  37 +cpp11.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)}
  38 +cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++11 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
  39 +QMAKE_EXTRA_COMPILERS += cpp11
  40 +SOURCES_CPP11 = icu.cpp
  41  CONFIG -= qt dylib app_bundle
  42  unix:LIBS += -licuuc -licui18n
  43  win32:LIBS += -licuin