From 2c2403e2135b28bed4c3abc62983f753e7502d0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 2 Dec 2020 22:51:59 +0100 Subject: [PATCH] qtwebkit: fix build with icu >= 68 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...Do-not-skip-build-for-cross-compile.patch} | 0 ...x-build-with-non-glibc-libc-on-musl.patch} | 0 ...=> 0003-Fix-build-bug-for-armv32-BE.patch} | 0 ...Do-not-generate-hardcoded-include-p.patch} | 0 ...atch => 0005-Fix-build-with-bison37.patch} | 0 ...ted-to-HTTP-2-when-Qt-is-configured.patch} | 0 ...ith-Python-3.9-avoid-passing-encodi.patch} | 0 .../qtwebkit/0008-Fix-build-with-icu-68.patch | 125 ++++++++++++++++++ recipes-qt/qt5/qtwebkit_git.bb | 15 ++- 9 files changed, 133 insertions(+), 7 deletions(-) rename recipes-qt/qt5/qtwebkit/{0002-Do-not-skip-build-for-cross-compile.patch => 0001-Do-not-skip-build-for-cross-compile.patch} (100%) rename recipes-qt/qt5/qtwebkit/{0003-Fix-build-with-non-glibc-libc-on-musl.patch => 0002-Fix-build-with-non-glibc-libc-on-musl.patch} (100%) rename recipes-qt/qt5/qtwebkit/{0004-Fix-build-bug-for-armv32-BE.patch => 0003-Fix-build-bug-for-armv32-BE.patch} (100%) rename recipes-qt/qt5/qtwebkit/{0005-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch => 0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch} (100%) rename recipes-qt/qt5/qtwebkit/{0006-Fix-build-with-bison37.patch => 0005-Fix-build-with-bison37.patch} (100%) rename recipes-qt/qt5/qtwebkit/{0007-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch => 0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch} (100%) rename recipes-qt/qt5/qtwebkit/{0008-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch => 0007-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch} (100%) create mode 100644 recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch diff --git a/recipes-qt/qt5/qtwebkit/0002-Do-not-skip-build-for-cross-compile.patch b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch similarity index 100% rename from recipes-qt/qt5/qtwebkit/0002-Do-not-skip-build-for-cross-compile.patch rename to recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch diff --git a/recipes-qt/qt5/qtwebkit/0003-Fix-build-with-non-glibc-libc-on-musl.patch b/recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch similarity index 100% rename from recipes-qt/qt5/qtwebkit/0003-Fix-build-with-non-glibc-libc-on-musl.patch rename to recipes-qt/qt5/qtwebkit/0002-Fix-build-with-non-glibc-libc-on-musl.patch diff --git a/recipes-qt/qt5/qtwebkit/0004-Fix-build-bug-for-armv32-BE.patch b/recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch similarity index 100% rename from recipes-qt/qt5/qtwebkit/0004-Fix-build-bug-for-armv32-BE.patch rename to recipes-qt/qt5/qtwebkit/0003-Fix-build-bug-for-armv32-BE.patch diff --git a/recipes-qt/qt5/qtwebkit/0005-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch similarity index 100% rename from recipes-qt/qt5/qtwebkit/0005-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch rename to recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch diff --git a/recipes-qt/qt5/qtwebkit/0006-Fix-build-with-bison37.patch b/recipes-qt/qt5/qtwebkit/0005-Fix-build-with-bison37.patch similarity index 100% rename from recipes-qt/qt5/qtwebkit/0006-Fix-build-with-bison37.patch rename to recipes-qt/qt5/qtwebkit/0005-Fix-build-with-bison37.patch diff --git a/recipes-qt/qt5/qtwebkit/0007-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch b/recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch similarity index 100% rename from recipes-qt/qt5/qtwebkit/0007-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch rename to recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch diff --git a/recipes-qt/qt5/qtwebkit/0008-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch b/recipes-qt/qt5/qtwebkit/0007-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch similarity index 100% rename from recipes-qt/qt5/qtwebkit/0008-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch rename to recipes-qt/qt5/qtwebkit/0007-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch diff --git a/recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch b/recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch new file mode 100644 index 0000000..1715c8f --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0008-Fix-build-with-icu-68.patch @@ -0,0 +1,125 @@ +From 0e94085f74b562bf8edf5418142323785a069454 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 2 Dec 2020 22:34:54 +0100 +Subject: [PATCH] Fix build with icu >= 68 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + Source/WebCore/platform/text/TextCodecICU.cpp | 15 +++++++++++++++ + Source/WebCore/platform/text/icu/UTextProvider.h | 15 +++++++++++++++ + .../platform/text/icu/UTextProviderLatin1.cpp | 15 +++++++++++++++ + .../platform/text/icu/UTextProviderUTF16.cpp | 15 +++++++++++++++ + 4 files changed, 60 insertions(+) + +diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp +index dd6ff0675..7ce8a70ef 100644 +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -39,6 +39,21 @@ + #include + #include + ++// Since icu 68.1 icu we have to: ++#ifndef TRUE ++// Taken from umachibe.h: ++/** ++ * The TRUE value of a UBool. ++ * ++ * @deprecated ICU 68 Use standard "true" instead. ++ */ ++# define TRUE true ++#endif ++ ++#ifndef FALSE ++# define FALSE false ++#endif ++ + namespace WebCore { + + const size_t ConversionBufferSize = 16384; +diff --git a/Source/WebCore/platform/text/icu/UTextProvider.h b/Source/WebCore/platform/text/icu/UTextProvider.h +index c254fc4c7..9d2ad8b8c 100644 +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -28,6 +28,21 @@ + + #include + ++// Since icu 68.1 icu we have to: ++#ifndef TRUE ++// Taken from umachibe.h: ++/** ++ * The TRUE value of a UBool. ++ * ++ * @deprecated ICU 68 Use standard "true" instead. ++ */ ++# define TRUE true ++#endif ++ ++#ifndef FALSE ++# define FALSE false ++#endif ++ + namespace WebCore { + + enum class UTextProviderContext { +diff --git a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +index cd6852c71..0c95ea529 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -29,6 +29,21 @@ + #include "UTextProvider.h" + #include + ++// Since icu 68.1 icu we have to: ++#ifndef TRUE ++// Taken from umachibe.h: ++/** ++ * The TRUE value of a UBool. ++ * ++ * @deprecated ICU 68 Use standard "true" instead. ++ */ ++# define TRUE true ++#endif ++ ++#ifndef FALSE ++# define FALSE false ++#endif ++ + namespace WebCore { + + // Latin1 provider +diff --git a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +index 7aaac48c8..6ac693602 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -28,6 +28,21 @@ + + #include "UTextProvider.h" + ++// Since icu 68.1 icu we have to: ++#ifndef TRUE ++// Taken from umachibe.h: ++/** ++ * The TRUE value of a UBool. ++ * ++ * @deprecated ICU 68 Use standard "true" instead. ++ */ ++# define TRUE true ++#endif ++ ++#ifndef FALSE ++# define FALSE false ++#endif ++ + namespace WebCore { + + // UTF16ContextAware provider +-- +2.26.2 + diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 9ce948e..e415dab 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -12,13 +12,14 @@ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf- # Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.13 # 5.13.meta-qt5.1 SRC_URI += "\ - file://0002-Do-not-skip-build-for-cross-compile.patch \ - file://0003-Fix-build-with-non-glibc-libc-on-musl.patch \ - file://0004-Fix-build-bug-for-armv32-BE.patch \ - file://0005-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \ - file://0006-Fix-build-with-bison37.patch \ - file://0007-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch \ - file://0008-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch \ + file://0001-Do-not-skip-build-for-cross-compile.patch \ + file://0002-Fix-build-with-non-glibc-libc-on-musl.patch \ + file://0003-Fix-build-bug-for-armv32-BE.patch \ + file://0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \ + file://0005-Fix-build-with-bison37.patch \ + file://0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch \ + file://0007-Fix-compilation-with-Python-3.9-avoid-passing-encodi.patch \ + file://0008-Fix-build-with-icu-68.patch \ " inherit cmake_qt5 perlnative