summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2020-11-10 17:11:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-11 10:08:12 +0000
commitc967114b0e162b8111cb06b719e141036474d92a (patch)
tree5790cd4a645d93f0c1ebe2acfae4e4cada110015 /meta/recipes-sato
parent57f75912e994aea40a7ea48f28be2f0d7d8522dc (diff)
downloadpoky-c967114b0e162b8111cb06b719e141036474d92a.tar.gz
webkitgtk: fix build with ICU 68.1
ICU 68.1 doesn't expose TRUE/FALSE macros anymore, so backport a patch to fix the build from upstream. (From OE-Core rev: 55e09fff01758088bba51ab6a24f833a8846683e) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch180
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.30.2.bb1
2 files changed, 181 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch
new file mode 100644
index 0000000000..3a02253e5e
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch
@@ -0,0 +1,180 @@
1From 8d1c44a03c1870912991467f8d8cd8bb6f85efa5 Mon Sep 17 00:00:00 2001
2From: "stephan.szabo@sony.com" <stephan.szabo@sony.com>
3Date: Tue, 3 Nov 2020 20:06:15 +0000
4Subject: [PATCH] ICU 68.1 no longer exposes FALSE and TRUE macros by default
5 https://bugs.webkit.org/show_bug.cgi?id=218522
6
7Reviewed by Don Olmstead.
8
9Source/WebCore:
10
11* platform/text/TextCodecICU.cpp: Replace use of TRUE with true
12
13Source/WebKit:
14
15* UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false
16
17Source/WTF:
18
19Replace uses of FALSE and TRUE with false and true.
20
21* wtf/text/icu/UTextProvider.h:
22* wtf/text/icu/UTextProviderLatin1.cpp:
23* wtf/text/icu/UTextProviderUTF16.cpp:
24
25Upstream-Status: Backport
26Signed-off-by: Ross Burton <ross.burton@arm.com>
27
28git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269325 268f45cc-cd09-0410-ab3c-d52691b4dbfc
29---
30 Source/WTF/wtf/text/icu/UTextProvider.h | 8 ++++----
31 Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp | 14 +++++++-------
32 Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp | 4 ++--
33 Source/WebCore/platform/text/TextCodecICU.cpp | 2 +-
34 .../DrawingAreaProxyCoordinatedGraphics.cpp | 2 +-
35 5 files changed, 15 insertions(+), 15 deletions(-)
36
37diff --git a/Source/WTF/wtf/text/icu/UTextProvider.h b/Source/WTF/wtf/text/icu/UTextProvider.h
38index c8f28d6e..3c6fbeab 100644
39--- a/Source/WTF/wtf/text/icu/UTextProvider.h
40+++ b/Source/WTF/wtf/text/icu/UTextProvider.h
41@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
42 // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
43 ASSERT(offset < std::numeric_limits<int32_t>::max());
44 text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
45- isAccessible = TRUE;
46+ isAccessible = true;
47 return true;
48 }
49 if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
50 text->chunkOffset = text->chunkLength;
51- isAccessible = FALSE;
52+ isAccessible = false;
53 return true;
54 }
55 } else {
56@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
57 // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
58 ASSERT(offset < std::numeric_limits<int32_t>::max());
59 text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
60- isAccessible = TRUE;
61+ isAccessible = true;
62 return true;
63 }
64 if (nativeIndex <= 0 && !text->chunkNativeStart) {
65 text->chunkOffset = 0;
66- isAccessible = FALSE;
67+ isAccessible = false;
68 return true;
69 }
70 }
71diff --git a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
72index 0a646b7f..49980f95 100644
73--- a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
74+++ b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp
75@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
76 if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
77 // Already inside the buffer. Set the new offset.
78 uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
79- return TRUE;
80+ return true;
81 }
82 if (index >= length && uText->chunkNativeLimit == length) {
83 // Off the end of the buffer, but we can't get it.
84 uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
85- return FALSE;
86+ return false;
87 }
88 } else {
89 if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
90 // Already inside the buffer. Set the new offset.
91 uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
92- return TRUE;
93+ return true;
94 }
95 if (!index && !uText->chunkNativeStart) {
96 // Already at the beginning; can't go any farther.
97 uText->chunkOffset = 0;
98- return FALSE;
99+ return false;
100 }
101 }
102
103@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
104
105 uText->nativeIndexingLimit = uText->chunkLength;
106
107- return TRUE;
108+ return true;
109 }
110
111 static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
112@@ -337,7 +337,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text)
113 static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
114 {
115 if (!text->context)
116- return FALSE;
117+ return false;
118 int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
119 UBool isAccessible;
120 if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
121@@ -357,7 +357,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo
122 ASSERT(newContext == UTextProviderContext::PriorContext);
123 textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
124 }
125- return TRUE;
126+ return true;
127 }
128
129 static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
130diff --git a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
131index 69c8d091..9c3fa709 100644
132--- a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
133+++ b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
134@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text)
135 static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
136 {
137 if (!text->context)
138- return FALSE;
139+ return false;
140 int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
141 UBool isAccessible;
142 if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
143@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo
144 ASSERT(newContext == UTextProviderContext::PriorContext);
145 textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
146 }
147- return TRUE;
148+ return true;
149 }
150
151 static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
152diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp
153index c2684939..e716a6fb 100644
154--- a/Source/WebCore/platform/text/TextCodecICU.cpp
155+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
156@@ -240,7 +240,7 @@ void TextCodecICU::createICUConverter() const
157 UErrorCode error = U_ZERO_ERROR;
158 m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close };
159 if (m_converter)
160- ucnv_setFallback(m_converter.get(), TRUE);
161+ ucnv_setFallback(m_converter.get(), true);
162 }
163
164 int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error)
165diff --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
166index 61e3f605..5a51b9ec 100644
167--- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
168+++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
169@@ -402,7 +402,7 @@ DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::~DrawingMonitor()
170 int DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyCoordinatedGraphics::DrawingMonitor* monitor)
171 {
172 monitor->didDraw();
173- return FALSE;
174+ return false;
175 }
176
177 void DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::start(WTF::Function<void(CallbackBase::Error)>&& callback)
178--
1792.25.1
180
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb
index 94fcbd8abe..58b66c0f66 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.30.2.bb
@@ -18,6 +18,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
18 file://0001-Fix-build-with-musl.patch \ 18 file://0001-Fix-build-with-musl.patch \
19 file://include_array.patch \ 19 file://include_array.patch \
20 file://include_xutil.patch \ 20 file://include_xutil.patch \
21 file://0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch \
21 " 22 "
22SRC_URI[sha256sum] = "c467e0bc2bc610c2570928e3fd63cedaadc4719cbf9b04aa99f79dd71ad5682a" 23SRC_URI[sha256sum] = "c467e0bc2bc610c2570928e3fd63cedaadc4719cbf9b04aa99f79dd71ad5682a"
23 24
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-12 16:17:10 +0000