From 778a4976fccacac8583941f38caf124c675552d9 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Fri, 24 Jan 2025 22:51:15 +0800 Subject: [PATCH] fix build with icu 76 --- ...atch => qt-everywhere-opensource-src-4.8.7-icu76.patch | 8 ++++---- qt.spec | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) rename qt-everywhere-opensource-src-4.8.7-icu59.patch => qt-everywhere-opensource-src-4.8.7-icu76.patch (81%) diff --git a/qt-everywhere-opensource-src-4.8.7-icu59.patch b/qt-everywhere-opensource-src-4.8.7-icu76.patch similarity index 81% rename from qt-everywhere-opensource-src-4.8.7-icu59.patch rename to qt-everywhere-opensource-src-4.8.7-icu76.patch index 3edcdef..5741299 100644 --- a/qt-everywhere-opensource-src-4.8.7-icu59.patch +++ b/qt-everywhere-opensource-src-4.8.7-icu76.patch @@ -1,8 +1,8 @@ From: Fabian Vogt -Subject: Fix build with ICU >= 59 +Subject: Fix build with ICU >= 76 -ICU >= 59 requires C++11 for its header files. -Qt can't be compiled with -std=c++11 as a whole, so only enable +ICU >= 76 requires C++17 for its header files. +Qt can't be compiled with -std=c++17 as a whole, so only enable it for qlocale_icu.cpp. Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri @@ -19,7 +19,7 @@ Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri + 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} ++ cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++17 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + QMAKE_EXTRA_COMPILERS += cpp11 + + SOURCES_CPP11 += tools/qlocale_icu.cpp diff --git a/qt.spec b/qt.spec index 3e3776d..8c2d3fd 100644 --- a/qt.spec +++ b/qt.spec @@ -13,7 +13,7 @@ Name: qt Epoch: 1 Version: 4.8.7 -Release: 62 +Release: 63 Summary: A software toolkit for developing applications License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT URL: https://www.qt.io/ @@ -65,7 +65,7 @@ Patch33: qt-everywhere-opensource-src-4.8.7-mips64.patch Patch34: qt-everywhere-opensource-src-4.8.7-gcc6.patch Patch35: qt-everywhere-opensource-src-4.8.7-alsa-1.1.patch Patch36: qt-everywhere-opensource-src-4.8.7-openssl-1.1.patch -Patch37: qt-everywhere-opensource-src-4.8.7-icu59.patch +Patch37: qt-everywhere-opensource-src-4.8.7-icu76.patch Patch38: qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch Patch39: qt-everywhere-opensource-src-4.8.6-QTBUG-22829.patch Patch40: qt-aarch64.patch @@ -442,6 +442,9 @@ fi %{_qt4_prefix}/examples/ %changelog +* Fri Jan 24 2025 Funda Wang - 1:4.8.7-63 +- fix build with icu 76 + * Thu Jan 23 2025 Jia Chao - 1:4.8.7-62 - Fix: use the same src build for all arches. -- Gitee