diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch deleted file mode 100644 index a3b35d30..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 308bddc0bfedb6ab222e3b626ef9bb5234c819b4 Mon Sep 17 00:00:00 2001 -From: Frank Tang <ftang@chromium.org> -Date: Tue, 20 Oct 2020 01:09:43 +0000 -Subject: [PATCH] chromium: Remove TRUE to prep landing of icu68 - -ICU 68, to work with C++20, remove the #define of TRUE -since the usage in libxml is as an int, use 1 instead. - -Upstream-Status: Backport [https://github.com/chromium/chromium/commit/e8aa87fa88f55e76ce08794690665ce30caa3183] -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> ---- - chromium/third_party/libxml/README.chromium | 2 ++ - chromium/third_party/libxml/src/encoding.c | 6 +++--- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/chromium/third_party/libxml/README.chromium b/chromium/third_party/libxml/README.chromium -index e1b7e1d8065..5cb589f04fd 100644 ---- a/chromium/third_party/libxml/README.chromium -+++ b/chromium/third_party/libxml/README.chromium -@@ -24,6 +24,8 @@ Modifications: - non-recursive broke a few web platform tests. - - add-fuzz-target.patch: Prevents autoreconf from failing on mac due to a - missing makefile for fuzz. -+- chromium-issue-1138555.patch: Change TRUE to 1 for ICU68 which remove the -+ #define of TRUE. - - Add helper classes in the chromium/ subdirectory. - - Delete various unused files, see chromium/roll.py - -diff --git a/chromium/third_party/libxml/src/encoding.c b/chromium/third_party/libxml/src/encoding.c -index 730e2532e45..f876e0c02de 100644 ---- a/chromium/third_party/libxml/src/encoding.c -+++ b/chromium/third_party/libxml/src/encoding.c -@@ -1882,7 +1882,7 @@ xmlIconvWrapper(iconv_t cd, unsigned char *out, int *outlen, - * @outlen: the length of @out - * @in: a pointer to an array of input bytes - * @inlen: the length of @in -- * @flush: if true, indicates end of input -+ * @flush: if 1, indicates end of input - * - * Returns 0 if success, or - * -1 by lack of space, or -@@ -1922,7 +1922,7 @@ xmlUconvWrapper(uconv_t *cd, int toUnicode, unsigned char *out, int *outlen, - *inlen = ucv_in - (const char*) in; - *outlen = ucv_out - (char *) out; - if (U_SUCCESS(err)) { -- /* reset pivot buf if this is the last call for input (flush==TRUE) */ -+ /* reset pivot buf if this is the last call for input (flush==1) */ - if (flush) - cd->pivot_source = cd->pivot_target = cd->pivot_buf; - return 0; -@@ -2028,7 +2028,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, - #ifdef LIBXML_ICU_ENABLED - else if (handler->uconv_out != NULL) { - ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen, -- TRUE); -+ 1); - } - #endif /* LIBXML_ICU_ENABLED */ - else { |