commit 7540311bd8be75a3e11443788bf7e1edd13d5d59
Author: Jan Palus <at...@pld-linux.org>
Date: Sun Jan 19 19:25:02 2025 +0100
compile icu sources in c++17 mode
icu59.patch | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/icu59.patch b/icu59.patch
index 6fd673d..82eb72c 100644
--- a/icu59.patch
+++ b/icu59.patch
@@ -14,15 +14,15 @@ Index:
qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.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
++ 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
}
@@ -30,14 +30,14 @@ Index:
qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri
+++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/icu/icu.pro
2019-04-18 17:14:05.122419116 +0200
@@ -1,4 +1,11 @@
-SOURCES = 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 = icu.cpp
++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_CPP17 = icu.cpp
CONFIG -= qt dylib app_bundle
unix:LIBS += -licuuc -licui18n
win32:LIBS += -licuin
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt4.git/commitdiff/7540311bd8be75a3e11443788bf7e1edd13d5d59
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
