diff options
| -rw-r--r-- | qt5/qtwebengine/patches/icu.patch | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/qt5/qtwebengine/patches/icu.patch b/qt5/qtwebengine/patches/icu.patch index 497b881f02..b571644511 100644 --- a/qt5/qtwebengine/patches/icu.patch +++ b/qt5/qtwebengine/patches/icu.patch @@ -1,7 +1,6 @@ -diff --git a/src/3rdparty/chromium/base/i18n/file_util_icu.cc b/src/3rdparty/chromium/base/i18n/file_util_icu.cc -index f7525adf816..7085a51fbe3 100644 ---- a/src/3rdparty/chromium/base/i18n/file_util_icu.cc -+++ b/src/3rdparty/chromium/base/i18n/file_util_icu.cc +diff -uNr qtwebengine-5.15.10/src/3rdparty/chromium/base/i18n/file_util_icu.cc qtw-mod/src/3rdparty/chromium/base/i18n/file_util_icu.cc +--- qtwebengine-5.15.10/src/3rdparty/chromium/base/i18n/file_util_icu.cc 2022-05-23 13:38:40.000000000 +0200 ++++ qtw-mod/src/3rdparty/chromium/base/i18n/file_util_icu.cc 2022-09-09 13:42:19.527652774 +0200 @@ -22,6 +22,7 @@ #include "build/build_config.h" #include "third_party/icu/source/common/unicode/uniset.h" @@ -10,10 +9,9 @@ index f7525adf816..7085a51fbe3 100644 namespace base { namespace i18n { -diff --git a/src/3rdparty/chromium/base/i18n/rtl.cc b/src/3rdparty/chromium/base/i18n/rtl.cc -index 62c2d3f5cdf..5efd76a783e 100644 ---- a/src/3rdparty/chromium/base/i18n/rtl.cc -+++ b/src/3rdparty/chromium/base/i18n/rtl.cc +diff -uNr qtwebengine-5.15.10/src/3rdparty/chromium/base/i18n/rtl.cc qtw-mod/src/3rdparty/chromium/base/i18n/rtl.cc +--- qtwebengine-5.15.10/src/3rdparty/chromium/base/i18n/rtl.cc 2022-05-23 13:38:40.000000000 +0200 ++++ qtw-mod/src/3rdparty/chromium/base/i18n/rtl.cc 2022-09-09 13:42:19.527652774 +0200 @@ -23,6 +23,7 @@ #include "third_party/icu/source/common/unicode/uchar.h" #include "third_party/icu/source/common/unicode/uscript.h" @@ -22,22 +20,9 @@ index 62c2d3f5cdf..5efd76a783e 100644 #if defined(OS_IOS) #include "base/debug/crash_logging.h" -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h -index d7a6b487484..8709861b1bf 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h -@@ -35,6 +35,7 @@ - #include "third_party/blink/renderer/platform/wtf/text/string_view.h" - #include "third_party/blink/renderer/platform/wtf/wtf_export.h" - #include "third_party/blink/renderer/platform/wtf/wtf_size_t.h" -+#include "third_party/icu/source/common/unicode/utf.h" - - #ifdef __OBJC__ - #include <objc/objc.h> -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_view.h b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_view.h -index 0178c7b0c59..5d67f67d5a0 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_view.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_view.h +diff -uNr qtwebengine-5.15.10/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_view.h qtw-mod/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_view.h +--- qtwebengine-5.15.10/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_view.h 2022-05-23 13:38:40.000000000 +0200 ++++ qtw-mod/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_view.h 2022-09-09 13:42:19.527652774 +0200 @@ -15,6 +15,7 @@ #include "third_party/blink/renderer/platform/wtf/std_lib_extras.h" #include "third_party/blink/renderer/platform/wtf/text/string_impl.h" @@ -46,3 +31,25 @@ index 0178c7b0c59..5d67f67d5a0 100644 namespace WTF { +diff -uNr qtwebengine-5.15.10/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_utf8.h qtw-mod/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_utf8.h +--- qtwebengine-5.15.10/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_utf8.h 2022-05-23 13:38:40.000000000 +0200 ++++ qtw-mod/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_utf8.h 2022-09-09 13:50:27.928617067 +0200 +@@ -27,6 +27,7 @@ + #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_TEXT_TEXT_CODEC_UTF8_H_ + + #include <memory> ++#include "third_party/icu/source/common/unicode/utf8.h" + #include "third_party/blink/renderer/platform/wtf/text/text_codec.h" + + namespace WTF { +diff -uNr qtwebengine-5.15.10/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h qtw-mod/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h +--- qtwebengine-5.15.10/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h 2022-05-23 13:38:40.000000000 +0200 ++++ qtw-mod/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h 2022-09-09 13:42:19.527652774 +0200 +@@ -35,6 +35,7 @@ + #include "third_party/blink/renderer/platform/wtf/text/string_view.h" + #include "third_party/blink/renderer/platform/wtf/wtf_export.h" + #include "third_party/blink/renderer/platform/wtf/wtf_size_t.h" ++#include "third_party/icu/source/common/unicode/utf.h" + + #ifdef __OBJC__ + #include <objc/objc.h> |