gentoo auto-resync : 04:01:2024 - 01:57:56

5 files changed, 66 insertions, 6 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 33738029a74a..1a4cd7d68686 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,10 +1,11 @@
 AUX 2.42.1-arm64-non-jumbo-fix.patch 1491 BLAKE2B 2902c8f26730fe92c3604ef264ed4bfc9b88d39fdc0f9babb9d48849840167b9d52eb45d20d8e4ea4a3363a8a3bb6b89a5a1ae32a24a0f9a0e86581c3c6d3d6e SHA512 f9be3b4bc29a8c7ae81e4cd5e817e52de409694db72303a255ee8660a1157b8392e3b9d8ff65a9ed84ee762b6b8b007aa2bf3811bba2276352182101097657d8
+AUX 2.42.4-wasm-assert-fix.patch 1631 BLAKE2B fe7272f849a816e85440ac3df0d33338ec1335e1b55508ea910be02ce103ea8907d401f8553761514d42164e1d771391abe7bcbcd18765358255569fd70e50f1 SHA512 83b1737e232d09128f18cc9662fc6d614bb1274f53d839fbf4048d5e4160b71a880229b46e6e99e914db93a936415d805821fbc82beb9b2ee54f6505a8ebe395
 DIST webkitgtk-2.42.3.tar.xz 32023120 BLAKE2B 8a132039895d859189b65a5fd09e35a99b5ce2ad0cf46c44a4ec9b6c499155c8dcc9d28d4add727f59078df99d03157f203fb12feed7e75f2e28fbebe9953850 SHA512 3ccd7245c656f2919357b8c0b867f47d223cac3cdca5e5a015bb3e6097051c87c8bd38db5fafea8801ca3f0d0d493d7f2f1079ff72fc2afc9cb7a281f4ae6839
 DIST webkitgtk-2.42.4.tar.xz 32059260 BLAKE2B 3a8cd0818e0d989ab778cda63dd873d7e185ec20fbfe609b9da70041fe38ac30351046516600cb8eb86089e43136487d81c922690468daa70ed2a436561c2401 SHA512 2019408b3b6b2354ea3da380abaad34d51fed6d5ce9d5a9ff9db6f911d235f8a9eb765ccf1e5608ddc49516cafee9921b4a0f9912b9ae5af56701f8fc0f45293
 EBUILD webkit-gtk-2.42.3-r410.ebuild 7959 BLAKE2B 20d3c04fd3e38baf7fc4cb58197a35602fca3461ba45eee167ac5db576744b9d420c5803f2bd29ddadb47e84c561048e63b190a3f856c2af01ff12a0ce14b77f SHA512 134a7cb44a1c485701f87b1f71a4a0fd589d6aaf1cc9b40671a15138c33a711e08f589aa11f3520b7201e1d2bd4f509a8ae41639c5897e1d0bc57e646cb78592
 EBUILD webkit-gtk-2.42.3-r600.ebuild 7856 BLAKE2B f382d54913428dd2d3493127714af06fa30c3e69aacd507fa45716281cc609f38055a98d3a66b18857e32441b282645134a106010f56de074d138947f918da87 SHA512 d10887e426344c796e1ad55642773e82f354e671a0d318f91aab8279194568fcc3c1e7751b88dfd133b908d005a5843255d2b0a761efb44bb7956cf418353bbe
 EBUILD webkit-gtk-2.42.3.ebuild 7685 BLAKE2B 063d5987d1aaa20a0193cd9400552af4f54c41836d37aa7d4e4fd4717e0f18fbca8f4aecb1a40f9e81a82ddb6812be3ab90de29efa3ada2ac840f4734ac7cb4d SHA512 177ccbda50b48b7c7e8a46d239331065732af42d01d5d2ad393ea84b17b26812f6b8e5d88936bb46f6fcd6e691a41c9bc5e28825f00eb9b54bf5150452ef6ba5
-EBUILD webkit-gtk-2.42.4-r410.ebuild 7969 BLAKE2B f1c6baee3a6317859e426eb049bf093bf3fbec1b7b25a5b51218d90308c71cbdd7a312fa9fb9bfea019b2aab9f7e30a0a440adccb943e156a66bc95fd24110a7 SHA512 6bb2c6af4605d055cad5c069d7eab78dede645859f551850e6d22a13ebdbd3b71fe5985dec2045ec5c7e45f224d7114a31820f0fa8c8330de8ecdcd6ebb7178f
-EBUILD webkit-gtk-2.42.4-r600.ebuild 7866 BLAKE2B 7c6798db9857cd7ce4efc56872eb58791ec9878c0b04f32e526cbd85ac87df00c6895d423b94cedde6bffabbba47e725e1d8227d4ed62a4caab9f51bb23e5aa8 SHA512 4bf6a9a3753fe4cb8614a9dee2e374ec91d70ba9f54b534a9974863f22db03065c0b94038199999b1baff88c1e92ae78c68042a44a5b70c603e57b1e7fad27ce
-EBUILD webkit-gtk-2.42.4.ebuild 7695 BLAKE2B 0930d1acc8386e826f575ab9d39334ed48cd2c6be26633b7d73d0a2a7f77bb536bbca8912e85b74c14b9c513dbfd76227248a4a9fb661929c8a40dd77548b231 SHA512 124a40656efb66d952e95bd0cd6b9ce7706ec01189a5219b4bade73d49bc669f1e4c241acf9ff232964000a2bec1700503cd62b53b7994ab2e8e0653644fc041
+EBUILD webkit-gtk-2.42.4-r410.ebuild 8072 BLAKE2B 4664bf8a8e08126d986274cd31ca2fd5053e7f5665f363c4e8778184d2c1a965a0c24fff0f9d18bf683faddc1128c342d4a2a8d2b4f83234c1bad900b0997ec3 SHA512 7c52fc6bb51ad69efc01f673fea3a3c4411926b2983ccf9943ddfa53f47ed7d966f6e51ab46f58748a310d607306c5908ee79ee378f272d0b05e82e7b8f647ed
+EBUILD webkit-gtk-2.42.4-r600.ebuild 7969 BLAKE2B 7db8d61c53aa45737fb674e6f1ee05c9ef58b6e24e5c1494750f111cc890559b0975e0d866af70b5bf82e3dcb4e4fb7e159a47a93d1d2d6eb71d82a8ca46d7fd SHA512 576708beefddb8bcd60f6bc7da56b9910089c6106a0bb372f654818c1cc9e1db94ef45ef61ea62d95317227334282bf189f580c5963363a3f87afb4d4c36a0cd
+EBUILD webkit-gtk-2.42.4.ebuild 7798 BLAKE2B 4a422440eae4c31f0b821d676d2f1d6ba6752fa1a5535e28f981c9b4d2735db779ddbb8debb10b7295657c5e9a512c0e3cc063e95f933c53cbbb545124fef27d SHA512 89248077e5b377f958f8ed380546e8a86954be825497e046dca8117e2d103988ed9b794a5ad718ef2db42aa145b023ba1d5479f03c81819281926370e44451e9
 MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1
diff --git a/net-libs/webkit-gtk/files/2.42.4-wasm-assert-fix.patch b/net-libs/webkit-gtk/files/2.42.4-wasm-assert-fix.patch
new file mode 100644
index 000000000000..da54b9b9a0e2
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.42.4-wasm-assert-fix.patch
@@ -0,0 +1,53 @@
+From 509b303bf5650710bee5e151decc1a723a54657f Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conikost@gentoo.org>
+Date: Tue, 2 Jan 2024 12:25:20 -0800
+Subject: [PATCH] Source/JavaScriptCore/wasm/generateWasm.py: return value in
+ int for memorybits
+
+https://bugs.webkit.org/show_bug.cgi?id=266942
+
+Reviewed by Justin Michaud.
+
+The assert function currently checks, if power number raised to the
+number fits memorybits. This seems not always work on every system,
+as it happens, that the float numbers are not correctly rounded.
+
+This patch adds an int, so its being rounded to a full number and works
+on my system, where otherwise the rounding would fail. The return method
+also returns the result as an int.
+
+Example:
+import math
+
+2 ** 3
+= 8
+
+2.0 ** 3.0
+= 7.999999999999999
+
+int(2.0) ** int(3.0)
+= 8
+
+2 ** int(3.0)
+= 8
+
+Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
+Canonical link: https://commits.webkit.org/272577@main
+---
+ Source/JavaScriptCore/wasm/generateWasm.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/wasm/generateWasm.py b/Source/JavaScriptCore/wasm/generateWasm.py
+index 434223d346a0..7a99210b60a2 100755
+--- a/Source/JavaScriptCore/wasm/generateWasm.py
++++ b/Source/JavaScriptCore/wasm/generateWasm.py
+@@ -136,5 +136,5 @@ def memoryLog2Alignment(op):
+         if not match:
+             print(op["name"])
+         memoryBits = int(match.group(2) if match.group(2) else match.group(1))
+-    assert 2 ** math.log(memoryBits, 2) == memoryBits
++    assert 2 ** int(math.log(memoryBits, 2)) == memoryBits
+     return str(int(math.log(memoryBits / 8, 2)))
+-- 
+2.43.0
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
index 21f9214fe9c3..c88fc397b1f9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -153,6 +153,8 @@ src_prepare() {
 
 	# Fix USE=-jumbo-build compilation on arm64
 	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	# Fix assert failure on some machines, bug #920704
+	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
index 642cfe89e038..599c268e4b4a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -154,6 +154,8 @@ src_prepare() {
 
 	# Fix USE=-jumbo-build compilation on arm64
 	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	# Fix assert failure on some machines, bug #920704
+	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
index ec5e2d42380d..b5ad3bd607ec 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -151,6 +151,8 @@ src_prepare() {
 
 	# Fix USE=-jumbo-build compilation on arm64
 	eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
+	# Fix assert failure on some machines, bug #920704
+	eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch
 }
 
 src_configure() {