diff options
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch | 28 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch | 42 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch | 41 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/93920b55f52ff8b883296f4845269e2ed746acb3.patch | 37 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch | 30 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.40.2.bb (renamed from meta/recipes-sato/webkit/webkitgtk_2.38.5.bb) | 16 |
6 files changed, 108 insertions, 86 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch new file mode 100644 index 0000000000..bbe265059d --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From cd65e3d9256a4f6eb7906a9f10678c29a4ffef2f Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 26 Jun 2023 14:30:02 +0200 | ||
4 | Subject: [PATCH] Source/JavaScriptCore/CMakeLists.txt: ensure reproducibility | ||
5 | of __TIMESTAMP__ | ||
6 | |||
7 | __TIMESTAMP__ refers to mtime of the file that contains it, which is unstable | ||
8 | and breaks binary reproducibility when the file is generated at build time. To ensure | ||
9 | this does not happen, mtime should be set from the original file. | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/15293] | ||
12 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
13 | --- | ||
14 | Source/JavaScriptCore/CMakeLists.txt | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt | ||
18 | index 43dc22ff..c2e3b1cd 100644 | ||
19 | --- a/Source/JavaScriptCore/CMakeLists.txt | ||
20 | +++ b/Source/JavaScriptCore/CMakeLists.txt | ||
21 | @@ -159,6 +159,7 @@ add_custom_command( | ||
22 | OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBytecodeCacheVersion.cpp | ||
23 | MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/runtime/JSCBytecodeCacheVersion.cpp.in | ||
24 | COMMAND ${PERL_EXECUTABLE} -pe s/CACHED_TYPES_CKSUM/__TIMESTAMP__/ ${JAVASCRIPTCORE_DIR}/runtime/JSCBytecodeCacheVersion.cpp.in > ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBytecodeCacheVersion.cpp | ||
25 | + COMMAND touch -r ${JAVASCRIPTCORE_DIR}/runtime/JSCBytecodeCacheVersion.cpp.in ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBytecodeCacheVersion.cpp | ||
26 | VERBATIM | ||
27 | ) | ||
28 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch b/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch index 32f92f7ff5..34e0ff9af3 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0d3344e17d258106617b0e6d783d073b188a2548.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From 0d3344e17d258106617b0e6d783d073b188a2548 Mon Sep 17 00:00:00 2001 | 1 | From 647c93de99a0f71f478d76a4cc7714eba7ba1447 Mon Sep 17 00:00:00 2001 |
2 | From: Adrian Perez de Castro <aperez@igalia.com> | 2 | From: Adrian Perez de Castro <aperez@igalia.com> |
3 | Date: Thu, 2 Jun 2022 11:19:06 +0300 | 3 | Date: Thu, 2 Jun 2022 11:19:06 +0300 |
4 | Subject: [PATCH] [ARM][NEON] FELightningNEON.cpp fails to build, NEON fast | 4 | Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems |
5 | path seems unused https://bugs.webkit.org/show_bug.cgi?id=241182 | 5 | unused https://bugs.webkit.org/show_bug.cgi?id=241182 |
6 | 6 | ||
7 | Reviewed by NOBODY (OOPS!). | 7 | Reviewed by NOBODY (OOPS!). |
8 | 8 | ||
@@ -30,19 +30,21 @@ left for a follow-up fix. | |||
30 | * Source/WebCore/platform/graphics/filters/PointLightSource.h: | 30 | * Source/WebCore/platform/graphics/filters/PointLightSource.h: |
31 | * Source/WebCore/platform/graphics/filters/SpotLightSource.h: | 31 | * Source/WebCore/platform/graphics/filters/SpotLightSource.h: |
32 | * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: | 32 | * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: |
33 | --- | 33 | |
34 | Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/1233] | 34 | Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/1233] |
35 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 35 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
36 | 36 | --- | |
37 | .../cpu/arm/filters/FELightingNEON.cpp | 4 +- | 37 | .../cpu/arm/filters/FELightingNEON.cpp | 4 +- |
38 | .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- | 38 | .../graphics/cpu/arm/filters/FELightingNEON.h | 52 +++++++++---------- |
39 | .../graphics/filters/DistantLightSource.h | 4 ++ | 39 | .../graphics/filters/DistantLightSource.h | 4 ++ |
40 | .../platform/graphics/filters/FELighting.h | 7 --- | 40 | .../platform/graphics/filters/FELighting.h | 7 --- |
41 | .../graphics/filters/PointLightSource.h | 4 ++ | 41 | .../graphics/filters/PointLightSource.h | 4 ++ |
42 | .../graphics/filters/SpotLightSource.h | 4 ++ | 42 | .../graphics/filters/SpotLightSource.h | 4 ++ |
43 | .../software/FELightingSoftwareApplier.h | 16 ++++++ | 43 | .../software/FELightingSoftwareApplier.h | 16 ++++++ |
44 | 7 files changed, 57 insertions(+), 36 deletions(-) | 44 | 7 files changed, 56 insertions(+), 35 deletions(-) |
45 | 45 | ||
46 | diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp | ||
47 | index f6ff8c20..42a97ffc 100644 | ||
46 | --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp | 48 | --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp |
47 | +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp | 49 | +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp |
48 | @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() | 50 | @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() |
@@ -63,6 +65,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
63 | { | 65 | { |
64 | // Calling a powf function from the assembly code would require to save | 66 | // Calling a powf function from the assembly code would require to save |
65 | // and reload a lot of NEON registers. Since the base is in range [0..1] | 67 | // and reload a lot of NEON registers. Since the base is in range [0..1] |
68 | diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | ||
69 | index b17c603d..e4629cda 100644 | ||
66 | --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | 70 | --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h |
67 | +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | 71 | +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h |
68 | @@ -24,14 +24,15 @@ | 72 | @@ -24,14 +24,15 @@ |
@@ -104,7 +108,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
104 | 0, | 108 | 0, |
105 | 0, | 109 | 0, |
106 | 0, | 110 | 0, |
107 | @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeo | 111 | @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS |
108 | // Set light source arguments. | 112 | // Set light source arguments. |
109 | floatArguments.constOne = 1; | 113 | floatArguments.constOne = 1; |
110 | 114 | ||
@@ -133,7 +137,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
133 | floatArguments.lightX = spotLightSource.position().x(); | 137 | floatArguments.lightX = spotLightSource.position().x(); |
134 | floatArguments.lightY = spotLightSource.position().y(); | 138 | floatArguments.lightY = spotLightSource.position().y(); |
135 | floatArguments.lightZ = spotLightSource.position().z(); | 139 | floatArguments.lightZ = spotLightSource.position().z(); |
136 | @@ -145,7 +146,7 @@ inline void FELighting::platformApplyNeo | 140 | @@ -145,7 +146,7 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS |
137 | if (spotLightSource.specularExponent() == 1) | 141 | if (spotLightSource.specularExponent() == 1) |
138 | neonData.flags |= FLAG_CONE_EXPONENT_IS_1; | 142 | neonData.flags |= FLAG_CONE_EXPONENT_IS_1; |
139 | } else { | 143 | } else { |
@@ -142,7 +146,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
142 | floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); | 146 | floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); |
143 | floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); | 147 | floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); |
144 | floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); | 148 | floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); |
145 | @@ -155,38 +156,39 @@ inline void FELighting::platformApplyNeo | 149 | @@ -155,38 +156,39 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS |
146 | // Set lighting arguments. | 150 | // Set lighting arguments. |
147 | floatArguments.surfaceScale = data.surfaceScale; | 151 | floatArguments.surfaceScale = data.surfaceScale; |
148 | floatArguments.minusSurfaceScaleDividedByFour = -data.surfaceScale / 4; | 152 | floatArguments.minusSurfaceScaleDividedByFour = -data.surfaceScale / 4; |
@@ -192,16 +196,18 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
192 | } | 196 | } |
193 | parallelJobs.execute(); | 197 | parallelJobs.execute(); |
194 | return; | 198 | return; |
195 | @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeo | 199 | @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS |
196 | } // namespace WebCore | 200 | } // namespace WebCore |
197 | 201 | ||
198 | #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) | 202 | #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) |
199 | - | 203 | - |
200 | -#endif // FELightingNEON_h | 204 | -#endif // FELightingNEON_h |
205 | diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h | ||
206 | index 70c6512f..b032c82e 100644 | ||
201 | --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h | 207 | --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h |
202 | +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h | 208 | +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h |
203 | @@ -25,6 +25,10 @@ | 209 | @@ -26,6 +26,10 @@ |
204 | #include "LightSource.h" | 210 | #include <wtf/ArgumentCoder.h> |
205 | #include <wtf/Ref.h> | 211 | #include <wtf/Ref.h> |
206 | 212 | ||
207 | +namespace WTF { | 213 | +namespace WTF { |
@@ -211,6 +217,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
211 | namespace WebCore { | 217 | namespace WebCore { |
212 | 218 | ||
213 | class DistantLightSource : public LightSource { | 219 | class DistantLightSource : public LightSource { |
220 | diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h | ||
221 | index 53beb596..e78a9354 100644 | ||
214 | --- a/Source/WebCore/platform/graphics/filters/FELighting.h | 222 | --- a/Source/WebCore/platform/graphics/filters/FELighting.h |
215 | +++ b/Source/WebCore/platform/graphics/filters/FELighting.h | 223 | +++ b/Source/WebCore/platform/graphics/filters/FELighting.h |
216 | @@ -35,8 +35,6 @@ | 224 | @@ -35,8 +35,6 @@ |
@@ -222,7 +230,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
222 | class FELighting : public FilterEffect { | 230 | class FELighting : public FilterEffect { |
223 | public: | 231 | public: |
224 | const Color& lightingColor() const { return m_lightingColor; } | 232 | const Color& lightingColor() const { return m_lightingColor; } |
225 | @@ -67,11 +65,6 @@ protected: | 233 | @@ -64,11 +62,6 @@ protected: |
226 | 234 | ||
227 | std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override; | 235 | std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override; |
228 | 236 | ||
@@ -234,6 +242,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
234 | Color m_lightingColor; | 242 | Color m_lightingColor; |
235 | float m_surfaceScale; | 243 | float m_surfaceScale; |
236 | float m_diffuseConstant; | 244 | float m_diffuseConstant; |
245 | diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h | ||
246 | index 3a5723f0..675d63f5 100644 | ||
237 | --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h | 247 | --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h |
238 | +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h | 248 | +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h |
239 | @@ -26,6 +26,10 @@ | 249 | @@ -26,6 +26,10 @@ |
@@ -247,6 +257,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
247 | namespace WebCore { | 257 | namespace WebCore { |
248 | 258 | ||
249 | class PointLightSource : public LightSource { | 259 | class PointLightSource : public LightSource { |
260 | diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h | ||
261 | index 684626f7..dea58389 100644 | ||
250 | --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h | 262 | --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h |
251 | +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h | 263 | +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h |
252 | @@ -26,6 +26,10 @@ | 264 | @@ -26,6 +26,10 @@ |
@@ -260,6 +272,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
260 | namespace WebCore { | 272 | namespace WebCore { |
261 | 273 | ||
262 | class SpotLightSource : public LightSource { | 274 | class SpotLightSource : public LightSource { |
275 | diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h | ||
276 | index c974d921..e2896660 100644 | ||
263 | --- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h | 277 | --- a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h |
264 | +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h | 278 | +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h |
265 | @@ -36,6 +36,7 @@ | 279 | @@ -36,6 +36,7 @@ |
diff --git a/meta/recipes-sato/webkit/webkitgtk/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch b/meta/recipes-sato/webkit/webkitgtk/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch new file mode 100644 index 0000000000..79da855ff4 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 4977290ab4ab35258a6da9b13795c9b0f7894bf4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Diego Pino Garcia <dpino@igalia.com> | ||
3 | Date: Mon, 22 May 2023 19:58:50 -0700 | ||
4 | Subject: [PATCH] [GLIB] Fix build error after 264196@main | ||
5 | https://bugs.webkit.org/show_bug.cgi?id=256917 | ||
6 | |||
7 | Reviewed by Michael Catanzaro. | ||
8 | |||
9 | Variable BWRAP_EXECUTABLE is only defined when BUBBLEWRAP_SANDBOX is | ||
10 | enabled. | ||
11 | |||
12 | * Source/WTF/wtf/glib/Sandbox.cpp: | ||
13 | (WTF::isInsideUnsupportedContainer): | ||
14 | |||
15 | Canonical link: https://commits.webkit.org/264395@main | ||
16 | Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/4977290ab4ab35258a6da9b13795c9b0f7894bf4] | ||
17 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
18 | --- | ||
19 | Source/WTF/wtf/glib/Sandbox.cpp | 2 ++ | ||
20 | 1 file changed, 2 insertions(+) | ||
21 | |||
22 | diff --git a/Source/WTF/wtf/glib/Sandbox.cpp b/Source/WTF/wtf/glib/Sandbox.cpp | ||
23 | index 7d84e830ab33e..9b07bb8cb5a9b 100644 | ||
24 | --- a/Source/WTF/wtf/glib/Sandbox.cpp | ||
25 | +++ b/Source/WTF/wtf/glib/Sandbox.cpp | ||
26 | @@ -36,6 +36,7 @@ bool isInsideFlatpak() | ||
27 | return returnValue; | ||
28 | } | ||
29 | |||
30 | +#if ENABLE(BUBBLEWRAP_SANDBOX) | ||
31 | bool isInsideUnsupportedContainer() | ||
32 | { | ||
33 | static bool inContainer = g_file_test("/run/.containerenv", G_FILE_TEST_EXISTS); | ||
34 | @@ -64,6 +65,7 @@ bool isInsideUnsupportedContainer() | ||
35 | |||
36 | return inContainer && !supportedContainer; | ||
37 | } | ||
38 | +#endif | ||
39 | |||
40 | bool isInsideSnap() | ||
41 | { | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk/93920b55f52ff8b883296f4845269e2ed746acb3.patch b/meta/recipes-sato/webkit/webkitgtk/93920b55f52ff8b883296f4845269e2ed746acb3.patch deleted file mode 100644 index 762de40995..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/93920b55f52ff8b883296f4845269e2ed746acb3.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 93920b55f52ff8b883296f4845269e2ed746acb3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Catanzaro <mcatanzaro@redhat.com> | ||
3 | Date: Fri, 31 Mar 2023 12:24:09 -0700 | ||
4 | Subject: [PATCH] Fix build of SourceBrush.cpp | ||
5 | https://bugs.webkit.org/show_bug.cgi?id=254821 | ||
6 | |||
7 | Unreviewed build fix. | ||
8 | |||
9 | * Source/WebCore/platform/graphics/SourceBrush.cpp: | ||
10 | (WebCore::SourceBrush::setGradient): | ||
11 | (WebCore::SourceBrush::setPattern): | ||
12 | |||
13 | Canonical link: https://commits.webkit.org/262434@main | ||
14 | |||
15 | Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/93920b55f52ff8b883296f4845269e2ed746acb3] | ||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | Source/WebCore/platform/graphics/SourceBrush.cpp | 4 ++-- | ||
19 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
20 | |||
21 | --- a/Source/WebCore/platform/graphics/SourceBrush.cpp | ||
22 | +++ b/Source/WebCore/platform/graphics/SourceBrush.cpp | ||
23 | @@ -65,12 +65,12 @@ Pattern* SourceBrush::pattern() const | ||
24 | |||
25 | void SourceBrush::setGradient(Ref<Gradient>&& gradient, const AffineTransform& spaceTransform) | ||
26 | { | ||
27 | - m_brush = { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } }; | ||
28 | + m_brush = Brush { Brush::LogicalGradient { { WTFMove(gradient) }, spaceTransform } }; | ||
29 | } | ||
30 | |||
31 | void SourceBrush::setPattern(Ref<Pattern>&& pattern) | ||
32 | { | ||
33 | - m_brush = { WTFMove(pattern) }; | ||
34 | + m_brush = Brush { WTFMove(pattern) }; | ||
35 | } | ||
36 | |||
37 | WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush) | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch b/meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch deleted file mode 100644 index 1ff9dcea7e..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From d318bb461f040b90453bc4e100dcf967243ecd98 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Catanzaro <mcatanzaro@redhat.com> | ||
3 | Date: Mon, 16 Jan 2023 16:55:26 -0800 | ||
4 | Subject: [PATCH] WebKitGTK 2.39.4 does not build due to missing #include in | ||
5 | ANGLE https://bugs.webkit.org/show_bug.cgi?id=250689 | ||
6 | |||
7 | Unreviewed build fix. | ||
8 | |||
9 | * Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h: | ||
10 | |||
11 | Canonical link: https://commits.webkit.org/258968@main | ||
12 | |||
13 | Upstream-Status: Backport [https://bugs.webkit.org/show_bug.cgi?id=250689] | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h | 1 + | ||
17 | 1 file changed, 1 insertion(+) | ||
18 | |||
19 | diff --git a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h | ||
20 | index 94cb93e01fc0..ec7bda372f30 100644 | ||
21 | --- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h | ||
22 | +++ b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h | ||
23 | @@ -12,6 +12,7 @@ | ||
24 | |||
25 | #include <algorithm> | ||
26 | #include <array> | ||
27 | +#include <cstdint> | ||
28 | #include <string> | ||
29 | #include <vector> | ||
30 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.38.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.40.2.bb index f7fa6dfb98..ac6681a0ce 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.38.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.40.2.bb | |||
@@ -13,10 +13,10 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | |||
13 | file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ | 13 | file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ |
14 | file://reproducibility.patch \ | 14 | file://reproducibility.patch \ |
15 | file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ | 15 | file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ |
16 | file://d318bb461f040b90453bc4e100dcf967243ecd98.patch \ | 16 | file://4977290ab4ab35258a6da9b13795c9b0f7894bf4.patch \ |
17 | file://93920b55f52ff8b883296f4845269e2ed746acb3.patch \ | 17 | file://0001-Source-JavaScriptCore-CMakeLists.txt-ensure-reproduc.patch \ |
18 | " | 18 | " |
19 | SRC_URI[sha256sum] = "40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7" | 19 | SRC_URI[sha256sum] = "96898870d994da406ee7a632816dcde9a3bb395ee5f344fcb3f3b8cc8a77e000" |
20 | 20 | ||
21 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen | 21 | inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen |
22 | 22 | ||
@@ -28,6 +28,7 @@ CVE_PRODUCT = "webkitgtk webkitgtk\+" | |||
28 | DEPENDS += " \ | 28 | DEPENDS += " \ |
29 | ruby-native \ | 29 | ruby-native \ |
30 | gperf-native \ | 30 | gperf-native \ |
31 | unifdef-native \ | ||
31 | cairo \ | 32 | cairo \ |
32 | harfbuzz \ | 33 | harfbuzz \ |
33 | jpeg \ | 34 | jpeg \ |
@@ -72,6 +73,8 @@ PACKAGECONFIG[lcms] = "-DUSE_LCMS=ON,-DUSE_LCMS=OFF,lcms" | |||
72 | PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3" | 73 | PACKAGECONFIG[soup2] = "-DUSE_SOUP2=ON,-DUSE_SOUP2=OFF,libsoup-2.4,,,soup3" |
73 | PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" | 74 | PACKAGECONFIG[soup3] = ",,libsoup,,,soup2" |
74 | PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" | 75 | PACKAGECONFIG[journald] = "-DENABLE_JOURNALD_LOG=ON,-DENABLE_JOURNALD_LOG=OFF,systemd" |
76 | PACKAGECONFIG[avif] = "-DUSE_AVIF_LOG=ON,-DUSE_AVIF=OFF,libavif" | ||
77 | PACKAGECONFIG[media-recorder] = "-DENABLE_MEDIA_RECORDER=ON,-DENABLE_MEDIA_RECORDER=OFF,gstreamer1.0-plugins-bad" | ||
75 | 78 | ||
76 | EXTRA_OECMAKE = " \ | 79 | EXTRA_OECMAKE = " \ |
77 | -DPORT=GTK \ | 80 | -DPORT=GTK \ |
@@ -137,6 +140,9 @@ ARM_INSTRUCTION_SET:armv7a = "thumb" | |||
137 | ARM_INSTRUCTION_SET:armv7r = "thumb" | 140 | ARM_INSTRUCTION_SET:armv7r = "thumb" |
138 | ARM_INSTRUCTION_SET:armv7ve = "thumb" | 141 | ARM_INSTRUCTION_SET:armv7ve = "thumb" |
139 | 142 | ||
143 | # ANGLE requires SSE support as of webkit 2.40.x on 32 bit x86 | ||
144 | COMPATIBLE_HOST:x86 = "${@bb.utils.contains_any('TUNE_FEATURES', 'core2 corei7', '.*', 'null', d)}" | ||
145 | |||
140 | # introspection inside qemu-arm hangs forever on musl/arm builds | 146 | # introspection inside qemu-arm hangs forever on musl/arm builds |
141 | # therefore disable GI_DATA | 147 | # therefore disable GI_DATA |
142 | GI_DATA_ENABLED:libc-musl:armv7a = "False" | 148 | GI_DATA_ENABLED:libc-musl:armv7a = "False" |
@@ -152,8 +158,8 @@ src_package_preprocess () { | |||
152 | ${B}/JavaScriptCore/DerivedSources/*.h \ | 158 | ${B}/JavaScriptCore/DerivedSources/*.h \ |
153 | ${B}/JavaScriptCore/DerivedSources/yarr/*.h \ | 159 | ${B}/JavaScriptCore/DerivedSources/yarr/*.h \ |
154 | ${B}/JavaScriptCore/PrivateHeaders/JavaScriptCore/*.h \ | 160 | ${B}/JavaScriptCore/PrivateHeaders/JavaScriptCore/*.h \ |
155 | ${B}/WebKit2Gtk/DerivedSources/webkit2/*.cpp \ | 161 | ${B}/WebCore/DerivedSources/*.cpp \ |
156 | ${B}/WebKit2Gtk/DerivedSources/webkit2/*.h | 162 | ${B}/WebKitGTK/DerivedSources/webkit/*.cpp |
157 | 163 | ||
158 | } | 164 | } |
159 | 165 | ||