qt5-webkit

2025-02-23 23:14:36 +03:00
parent 8b07baee00
commit 25b22dde1c
3 changed files with 45 additions and 3 deletions
@@ -0,0 +1,31 @@
+From 756e1c8f23dc2720471298281c421c0076d02df8 Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev <annulen@yandex.ru>
+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
@@ -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 <algorithm>
+ #include <string.h>
+ #include <stdlib.h>
+#include <cstdint>
+ 
+ namespace gl
+ {
@@ -63,9 +63,9 @@
            <Patch level="1">d92b11fe.patch</Patch>
            <Patch level="1">bug-206233-20200114175227.patch</Patch>
            <Patch level="1">qt5-webkit-icu76.patch</Patch>
-<!--             <Patch level="1">qt5-webkit-null-pointer-dereference.patch</Patch> --> -->
-<!--             <Patch level="1">qt5-webkit-trojita-1.patch</Patch> --> -->
-<!--             <Patch level="1">qt5-webkit-trojita-2.patch</Patch> -->
+<!--             <Patch level="1">webkit-offlineasm-warnings-ruby27.patch</Patch> -->
+            <Patch level="1">qtwebkit-cstdint.patch</Patch>
+            <Patch level="1">qt5-webkit-icu75.patch</Patch>
        </Patches>
    </Source>