diff --git a/desktop/toolkit/qt5/qt5-webkit/files/qt5-webkit-icu75.patch b/desktop/toolkit/qt5/qt5-webkit/files/qt5-webkit-icu75.patch new file mode 100644 index 0000000000..42ebe518d4 --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webkit/files/qt5-webkit-icu75.patch @@ -0,0 +1,31 @@ +From 756e1c8f23dc2720471298281c421c0076d02df8 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Mon, 27 May 2024 23:23:11 +0300 +Subject: [PATCH] Partial backport of r260554 (79fe19caf) + +In particular, we need -DU_SHOW_CPLUSPLUS_API=0 to avoid compilation +errors in C++ parts of ICU headers which we are not using anyway. + +Change-Id: Ib45c74e3caad148fbd778d0c07330127f7dab5ec +--- + Source/WTF/wtf/Platform.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index a7b0f74bb7d17..af85a675266f8 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -1138,6 +1138,13 @@ + #define ENABLE_PLATFORM_FONT_LOOKUP 1 + #endif + ++/* FIXME: This does not belong in Platform.h and should instead be included in another mechanism (compiler option, prefix header, config.h, etc) */ ++/* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */ ++#define U_SHOW_CPLUSPLUS_API 0 ++#ifdef __cplusplus ++#define UCHAR_TYPE char16_t ++#endif ++ + #if COMPILER(MSVC) + #undef __STDC_LIMIT_MACROS + #define __STDC_LIMIT_MACROS diff --git a/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-cstdint.patch b/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-cstdint.patch new file mode 100644 index 0000000000..6ef551575e --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webkit/files/qtwebkit-cstdint.patch @@ -0,0 +1,11 @@ +diff -up qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h.me qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h +--- qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h.me 2023-02-20 15:40:04.045911245 +0100 ++++ qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h 2023-02-20 15:40:39.038549787 +0100 +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + namespace gl + { diff --git a/desktop/toolkit/qt5/qt5-webkit/pspec.xml b/desktop/toolkit/qt5/qt5-webkit/pspec.xml index 40fb428556..351b6a48a8 100755 --- a/desktop/toolkit/qt5/qt5-webkit/pspec.xml +++ b/desktop/toolkit/qt5/qt5-webkit/pspec.xml @@ -63,9 +63,9 @@ d92b11fe.patch bug-206233-20200114175227.patch qt5-webkit-icu76.patch - --> - --> - + + qtwebkit-cstdint.patch + qt5-webkit-icu75.patch