File fix-build-icu75.patch of Package libqt4

Overview Repositories Revisions Requests Users Attributes Meta

File fix-build-icu75.patch of Package libqt4

From: Wolfgang Bauer <wbauer1@a1.net>
Subject: Fix build with ICU >= 75

ICU >= 75 now requires C++17 for its header files.

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,15 +102,15 @@ contains(QT_CONFIG, zlib):include($$PWD/
 else:include($$PWD/../../3rdparty/zlib_dependency.pri)
 
 contains(QT_CONFIG,icu) {
-    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
+    cpp17.name = cpp17
+    cpp17.input = SOURCES_CPP17
+    cpp17.dependency_type = TYPE_C
+    cpp17.variable_out = OBJECTS
+    cpp17.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)}
+    cpp17.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++17 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+    QMAKE_EXTRA_COMPILERS += cpp17
 
-    SOURCES_CPP11 += tools/qlocale_icu.cpp
+    SOURCES_CPP17 += tools/qlocale_icu.cpp
     DEFINES += QT_USE_ICU
 }

Places

File fix-build-icu75.patch of Package libqt4

Places