diff --git a/0001-fix-TRUE-and-FALSE-was-not-declared.patch b/0001-fix-TRUE-and-FALSE-was-not-declared.patch new file mode 100644 index 0000000..97aae28 --- /dev/null +++ b/0001-fix-TRUE-and-FALSE-was-not-declared.patch @@ -0,0 +1,71 @@ +From d5d8791a6159f6ac5b09b1b782b7a1f9520ab52c Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Thu, 13 Jan 2022 18:02:19 +0800 +Subject: [PATCH] fix TRUE and FALSE was not declared + +--- + Source/WebCore/platform/text/TextCodecICU.cpp | 3 +++ + Source/WebCore/platform/text/icu/UTextProvider.h | 3 +++ + Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp | 3 +++ + Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp | 3 +++ + 4 files changed, 12 insertions(+) + +diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp +index dd6ff06..ef258c9 100644 +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/Source/WebCore/platform/text/TextCodecICU.cpp +@@ -39,6 +39,9 @@ + #include + #include + ++#define FALSE (1 != 1) ++#define TRUE (1 == 1) ++ + 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 c254fc4..6bd3bf2 100644 +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -28,6 +28,9 @@ + + #include + ++#define FALSE (1 != 1) ++#define TRUE (1 == 1) ++ + namespace WebCore { + + enum class UTextProviderContext { +diff --git a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +index cd6852c..c4ce2de 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -29,6 +29,9 @@ + #include "UTextProvider.h" + #include + ++#define FALSE (1 != 1) ++#define TRUE (1 == 1) ++ + namespace WebCore { + + // Latin1 provider +diff --git a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +index 7aaac48..ab41175 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -28,6 +28,9 @@ + + #include "UTextProvider.h" + ++#define FALSE (1 != 1) ++#define TRUE (1 == 1) ++ + namespace WebCore { + + // UTF16ContextAware provider +-- +2.30.0 + diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 9d022e4..d1a56e5 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 5 +Release: 6 Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -27,6 +27,7 @@ Source0: https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_modu Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch Patch3: fix_build_with_bison.patch Patch4: fix_build_with_glib2_68.patch +Patch5: 0001-fix-TRUE-and-FALSE-was-not-declared.patch BuildRequires: bison BuildRequires: cmake @@ -109,6 +110,7 @@ BuildArch: noarch %prep %autosetup -p1 -n %{qt_module}-%{version}%{?prerel_tag} +sed -i 's/json.load(bytecodeFile, encoding = "utf-8")/json.load(bytecodeFile)/g' ./Source/JavaScriptCore/generate-bytecode-files # find/fix pngs with "libpng warning: iCCP: known incorrect sRGB profile" find -name \*.png | xargs -n1 pngcrush -ow -fix @@ -233,6 +235,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Thu Jan 13 2022 Ge Wang - 5.212.0-6 +- fix build fail due to json.load dose not surport pramam encoding + * Thu July 23 2021 yangyunyi - 5.212.0-5 - fix build fail with glib 2.68.1