gentoo auto-resync : 26:06:2024 - 00:12:24

3 files changed, 66 insertions, 1 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 89fc10d96e97..ab38cb452a39 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,8 +1,9 @@
 AUX 2.42.3-arm64-non-jumbo-fix-925621.patch 1025 BLAKE2B 6a9641b4c05b62c143b2be5ed1d2d8563839466d56831b4dcba503c8892848155f753b0c892407882e41d9cdebd418eff68b94918ed098526813feb1cb87c435 SHA512 238531fe2cc6dff154527abafb8d9c3f0586a82122675d763a440d8dd58162840ebd0539b2ca5c797b203707b4b4470207e509f050220881bc5474660b057ab7
 AUX 2.44.1-branch-patchset.patch 11288 BLAKE2B 0966d524063bc6137464eca431d161ac3b8ec0687f5cb2fa318d95734ceebd6bf9a4bef8db39b135f02a5e64ab453a9e74b3484db1411cf8ad85292d9d4cf034 SHA512 7f2420e49e085fecd630a62866ba2df0470e89f5bf92251436e9aca55200a158b96e866bf15bef283abf4b81d484d9747368fcd3ed2c58d0650aee1df9d9cd52
 AUX 2.44.1-non-unified-build-fixes.patch 11799 BLAKE2B 6928f61428c4bc6594a46f7427e644143b071c39cc7405b143d693f956631519860efd958dd928f55c1e6139334966fd6bb92e42594c7b7b9b11236d5b0154f2 SHA512 c3ee1b48bebe8c6e504b6d15277b67261cceffa9790a212972f2d0ffd32d68c60c96373a2fecc0af9c6400114ecc84130bb23d81d03e08473b60eaadc3df9802
+AUX 2.44.1-riscv.patch 2977 BLAKE2B 37a6e22cea8f621e1857141a77b886d82afca1bec70d56b5ecce4b5f89eefc1c0c311f11521840872314a1372ef4666b71000ed14eec787a26c4dc694a1168b3 SHA512 ee5ecbc98c0a40d41477975adc9d4d093cecb9dfe26901f6a5eed510bcefb505885fd7dc99cccc20a79661df900a70a985d2cf740f51481037a8888961488cda
 DIST webkitgtk-2.44.1.tar.xz 36280696 BLAKE2B a5fff4c4fe90bcd0ea098930e51a36ea60152da47fd06e78abbc10f146437838aa19fed15cf58732b538046e1f42d8461cd5c0e0859096506932c9fae150cc16 SHA512 b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169
 EBUILD webkit-gtk-2.44.1-r410.ebuild 8153 BLAKE2B 06c69a117128b5489925c4ee7d373d4152679155a30b83472e3c382be96fda4ec19322f3b73ce7a9524f5be61db71b6fe126876817777be22ba9844de84d2854 SHA512 1af3eabd3e18786bc027eb72168b03ccacec24daddfc9eeaf886d97bbf6ab29d7a5039e191d5ebf9fe156cc069ca9c57b09f58f3955f5b8905ffe2f1188ddb58
-EBUILD webkit-gtk-2.44.1-r600.ebuild 8846 BLAKE2B e95a70b739d0df8e85414c8ed3c16d70cb40fe6bddb8f41bc4322f02ac9f8d88197d8687ba555b1d071e44851c85545e75d898d865361ea74e55375eac498d4d SHA512 287c81e077b8ad094823fa4a8cbaad7a8d3b6fbbf3d6bfe62c05a9509502abebdf1421b1e31427a6a959a5d3e6bcb5ff9292b773b7aa3b05c7e7d5b1f3151060
+EBUILD webkit-gtk-2.44.1-r600.ebuild 8923 BLAKE2B 060e3e00a95a062cea4710d2d1e47cf77dae266aa978dd1883cfb37f07f835048494b18b936c3aa262fa8f4e5aa519559704bb657e0d6ceeb1afcd0b060c3b99 SHA512 35edaf1c7839d3f5f522ebc5e02c6d2f6f1fd57a6a963c120a62ecac8cefc21da5e027501acad4342aaa2d7b43f475ff39a92372ddbfa20c2899ce711cc93578
 EBUILD webkit-gtk-2.44.1.ebuild 8001 BLAKE2B 1ecfff526fca6a304d9334a095f031a59d619645b5dcd6fdc8b2f9024af99e82e0a0fbd790b702894780fad3612971dad37257cd10dcd2ceb1ef75fb010723fc SHA512 9a08a2ff8248c40751d7ff5b6bee72d214ed86cbf7c6c00cac87b24d184dba07d618f329efd31026a2291ae9cb29393eb0f078f875b54dd381e2d061c5ff6df1
 MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1
diff --git a/net-libs/webkit-gtk/files/2.44.1-riscv.patch b/net-libs/webkit-gtk/files/2.44.1-riscv.patch
new file mode 100644
index 000000000000..fce0cec50113
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.44.1-riscv.patch
@@ -0,0 +1,62 @@
+From 30e1d5e22213fdaca2a29ec3400c927d710a37a8 Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <thomas.devoogdt@barco.com>
+Date: Mon, 16 Jan 2023 17:03:30 +0100
+Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix
+ !ENABLE(WEBASSEMBLY_B3JIT)
+
+https://bugs.webkit.org/show_bug.cgi?id=250681
+
+Reviewed by NOBODY (OOPS!).
+
+WasmTypeDefinition.h isn't included if not ENABLE(WEBASSEMBLY_B3JIT).
+Also, toB3Type and simdScalarType are not defined if it is included.
+
+Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
+---
+ Source/JavaScriptCore/b3/B3Validate.cpp | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/Source/JavaScriptCore/b3/B3Validate.cpp b/Source/JavaScriptCore/b3/B3Validate.cpp
+index d06a76023392..53bf8b16ed86 100644
+--- a/Source/JavaScriptCore/b3/B3Validate.cpp
++++ b/Source/JavaScriptCore/b3/B3Validate.cpp
+@@ -47,6 +47,12 @@
+ #include <wtf/StringPrintStream.h>
+ #include <wtf/text/CString.h>
+ 
++#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_B3JIT)
++#define simdScalarTypeToB3Type(type) toB3Type(Wasm::simdScalarType(type))
++#else
++#define simdScalarTypeToB3Type(type) B3::Type()
++#endif
++
+ namespace JSC { namespace B3 {
+ 
+ namespace {
+@@ -452,7 +458,7 @@ class Validater {
+             case VectorExtractLane:
+                 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
+                 VALIDATE(value->numChildren() == 1, ("At ", *value));
+-                VALIDATE(value->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
++                VALIDATE(value->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
+                 VALIDATE(value->child(0)->type() == V128, ("At ", *value));
+                 break;
+             case VectorReplaceLane:
+@@ -460,7 +466,7 @@ class Validater {
+                 VALIDATE(value->numChildren() == 2, ("At ", *value));
+                 VALIDATE(value->type() == V128, ("At ", *value));
+                 VALIDATE(value->child(0)->type() == V128, ("At ", *value));
+-                VALIDATE(value->child(1)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
++                VALIDATE(value->child(1)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
+                 break;
+             case VectorNot:
+             case VectorAbs:
+@@ -475,7 +481,7 @@ class Validater {
+                 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
+                 VALIDATE(value->numChildren() == 1, ("At ", *value));
+                 VALIDATE(value->type() == V128, ("At ", *value));
+-                VALIDATE(value->child(0)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
++                VALIDATE(value->child(0)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
+                 break;
+ 
+             case VectorPopcnt:
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
index dca160b9f744..2c87e2a468dc 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
@@ -155,6 +155,8 @@ src_prepare() {
 	eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
 	# Fix USE=-jumbo-build on all arches
 	eapply "${FILESDIR}"/${PV}-non-unified-build-fixes.patch
+	# Fix building on riscv, bug 933675
+	eapply "${FILESDIR}"/${PV}-riscv.patch
 }
 
 src_configure() {