summaryrefslogtreecommitdiff
path: root/dev-qt/qtwebengine/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-02-02 05:44:58 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-02-02 05:44:58 +0000
commitcc4bdc5d184af171efd67a1b32de966071ee18d3 (patch)
tree99813a24b6b194fb3987dff98bcc0bbbf8eda9de /dev-qt/qtwebengine/files
parentc641f12d6bd92a8ea812f9b0e68a9a525a9c9ecc (diff)
gentoo auto-resync : 02:02:2024 - 05:44:58
Diffstat (limited to 'dev-qt/qtwebengine/files')
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.15.11_p20231120-libxml2-2.12.patch43
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch16
2 files changed, 0 insertions, 59 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.11_p20231120-libxml2-2.12.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.11_p20231120-libxml2-2.12.patch
deleted file mode 100644
index 3a0a3df43469..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.11_p20231120-libxml2-2.12.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 871f8ae9b65ce2679b0bc0be36902d65edf0c1e4 Mon Sep 17 00:00:00 2001
-From: Joey Arhar <jarhar@chromium.org>
-Date: Thu, 2 Nov 2023 20:45:11 +0000
-Subject: [PATCH] Roll libxml from b8961a75 to 7a2d412f
-
-Bug: 934413
-Change-Id: I6fb176d76dba9a9adf411395fa5f6b950b52920a
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4985186
-Reviewed-by: David Baron <dbaron@chromium.org>
-Commit-Queue: Joey Arhar <jarhar@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1219084}
----
- .../blink/renderer/core/xml/xslt_processor.h | 2 +-
- .../core/xml/xslt_processor_libxslt.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
- create mode 100644 third_party/libxml/src/testparser.c
-
-diff --git a/third_party/blink/renderer/core/xml/xslt_processor.h b/third_party/blink/renderer/core/xml/xslt_processor.h
-index d53835e9675793..2eaea31ed29b90 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
-@@ -77,7 +77,7 @@ class XSLTProcessor final : public ScriptWrappable {
-
- void reset();
-
-- static void ParseErrorFunc(void* user_data, xmlError*);
-+ static void ParseErrorFunc(void* user_data, const xmlError*);
- static void GenericErrorFunc(void* user_data, const char* msg, ...);
-
- // Only for libXSLT callbacks
-diff --git a/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc b/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
-index 133e0b3355d2f0..f424077089da87 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
-@@ -66,7 +66,7 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) {
- // It would be nice to do something with this error message.
- }
-
--void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
-+void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
- FrameConsole* console = static_cast<FrameConsole*>(user_data);
- if (!console)
- return;
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
deleted file mode 100644
index 3d42f3f933c5..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Quick fix for a static_assert failure with icu74. Still waiting
-for a proper upstream fix and unknown if entirely right, but is
-an extension of [1] (is now 48 rather than 43).
-
-https://bugs.gentoo.org/917633
-
-[1] https://crrev.com/e60b571faa3f14dd9119a6792dccf12f8bf80192
---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
-@@ -163,3 +163,5 @@
-
--#if U_ICU_VERSION_MAJOR_NUM >= 58
-+#if U_ICU_VERSION_MAJOR_NUM >= 74
-+#define BA_LB_COUNT (U_LB_COUNT - 8)
-+#elif U_ICU_VERSION_MAJOR_NUM >= 58
- #define BA_LB_COUNT (U_LB_COUNT - 3)