gentoo auto-resync : 28:10:2024 - 03:04:40

5 files changed, 4 insertions, 54 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index ca78257cf2ba..d88c08569ba7 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,11 +1,10 @@
 AUX 2.44.1-non-unified-build-fixes.patch 11799 BLAKE2B 6928f61428c4bc6594a46f7427e644143b071c39cc7405b143d693f956631519860efd958dd928f55c1e6139334966fd6bb92e42594c7b7b9b11236d5b0154f2 SHA512 c3ee1b48bebe8c6e504b6d15277b67261cceffa9790a212972f2d0ffd32d68c60c96373a2fecc0af9c6400114ecc84130bb23d81d03e08473b60eaadc3df9802
-AUX 2.46.1-riscv-buildfix.patch 2144 BLAKE2B 27515b7497cb0ca0f04da4352fda97eb254643e1d2486603bb82aff32c96da2f0a08d0cb50b3ab124c83d249816310add54ca6b589372fd1756723ed6db6b4d8 SHA512 4020e64a11fc3df014deb568dcd6f8b07c9ebef53bd8b0dfaae94411b7bedbf14aeeb6d5eea893a4b45da41e29720b69f2d17c81f887ec3c23e6c84cca4d6a4f
 DIST webkitgtk-2.44.4.tar.xz 35858056 BLAKE2B 9e3d016bfb2b4e80d2ebeda95e75f8ec8b909b41b17a879d3e1119ed66e3bf4d590a22ed814bb1572dac8d8a8838bb37b5ab1372121b276e02ee8925f6c5b00c SHA512 037ef6a9faca68b68dc62927a475134450493129043ea6cc03595cd4a684d590f80a1e9c3ed40a9176874ba43fc9efbc5065a264dfe131ebd72e272756612db9
-DIST webkitgtk-2.46.1.tar.xz 42776840 BLAKE2B 784b4cc4d59da31000612955413608f7a39481c66711139a7c8bc4cf854a62801865a6b3455d6a05918297b2ff3c9ba38ea9046f338ea6060768192af6d67bcd SHA512 e1ac92305b1d1b034eea9be6aa22cfa260249562fa0af41f0ed5c76a36916bba432073e033f228978d84d0377f245642ff31cdec324565e83aa8c82d8ea0c1f5
+DIST webkitgtk-2.46.2.tar.xz 42803728 BLAKE2B 6d9104950fe289c75356576301817d005bed601837a4d8c5dfecdc11242cd6a82f31d7bfcd48d74420ecfaafce9bb7fc928228be273fef059c0291ef417dd268 SHA512 2031b61a776135279cc557d4fcf4115e14e0c84b638f04871c3f8fd790b5f587cf1774ed93f42c72d4f60f17bd0488d94e49a101e12cda20c91548b858c26b1a
 EBUILD webkit-gtk-2.44.4-r410.ebuild 7827 BLAKE2B 6fbd74d881fd0ed0823d8c29bfc64aa81081f2c833c7afee977a5c02e212c5ab360a0c3a1d37a4c5af8b28dab1a4b8d1f3468ffd59a33543d64a7b82a34e0c50 SHA512 3ca6747a1ede0e6fe04b315f5b894129d697fad8a76b505218db61d3e0ccd5aa3eccb74f27db446e1b5beb2d62db262dd6f1eb587c3aa647ff2abf7a91787f4a
 EBUILD webkit-gtk-2.44.4-r600.ebuild 8568 BLAKE2B d5dea51d7c11708158e15b81085e6b84a0845eefe08cba3b1daa5b9141f4105bcdb3dfffab0ab31917ab376c475c024f5c85eed54eb3334208136325fb8394a1 SHA512 1d47707e7788e7bf1e6b2a90c60c05945bb73b9a03930a88389111df5ecbaed3ceb858aab8a981f3c7e80325a9a9d41dc5b969b9a6a62cae94baf5a1ec87895f
 EBUILD webkit-gtk-2.44.4.ebuild 7675 BLAKE2B 6ee7b1be0d3c0b7627dace6d9a9bff4f649e3399b48aaf4ddab173e62166d0c359113168d900d34f2f49e23419867dbd833f53a2c86ce3e706a352b88a888c76 SHA512 942d298f3a489b9a3d1b339dd1bd8d7c5a9f730a245c9223e5517404df112479b49493aaa99d52488dac3a3b13c6ade9b80d5f4e6a73eca22c57323983ef0ca0
-EBUILD webkit-gtk-2.46.1-r410.ebuild 7919 BLAKE2B 53aaa0526bd07e9375d4bbdff0d986b5d398ca5e9db65fde2908d224c3a8a9d113cde940a8649fadb2ef1fcd43c7261abe3a34e0aa1aa0446f30e36d32fbbe09 SHA512 5c37d5230e9358734a69543ff73b4d1cfb6d110571a1711961dc0da752cb850a0f115bda56a1aede4fe503116f6e6c83cc09f29838f03611952b3f66262a41a2
-EBUILD webkit-gtk-2.46.1-r600.ebuild 8663 BLAKE2B 25c7a4b9fdeb6f8ddf1b905452932a5ad6a022bcfa9510d5e0d797ce79103cab8d97f5c4f64c8dd32bed216d2d79df3d26004f8e3a25d41681873dc092fbebc0 SHA512 d838fbcab29aadb0076681e239c6d8c151f6e082645aa8c43e7650a3a183785a5389ddf62db7e6130058e17cf13c3efc42ee761ca891406be9672d39af125c65
-EBUILD webkit-gtk-2.46.1.ebuild 7917 BLAKE2B fef623f3c402249c4d804e7ca4f47409c3b0ef3ace962d06f2550e9168b210f4af32089fdc4cc0ad8e0d7156a42dab092379d2ef426564ebe206395184d0f1f7 SHA512 8145b12ae9842e5da093443b7f6332a6367c8a377e61faa76a20b11b6705e1da0f4cad84d513cf29265ab22d0f10736bfbeabbf6ddb4d4d32ab7891ea2ddeaba
+EBUILD webkit-gtk-2.46.2-r410.ebuild 7868 BLAKE2B 5d83ac98f34444a5397fa1ddf7dd4cee69d50b68ea428541fbef061a25a38c62df05a8b71d6cfa360e39104fac2994b52205e32c5de71062c7c548c05ff6433a SHA512 f16d61b470233ab639ec9e73cc9f823eb90ca3fc2ecb59650a2e0b45e287d5befaccf11732bd714703106d1db571f78978ae718c11676e1af57a7ab94997157c
+EBUILD webkit-gtk-2.46.2-r600.ebuild 8612 BLAKE2B ef6fb803d0d66faf92d0bd6e4b909d757511a36d40c1ca5a974d91b9ec15a96bc54ca0ff37c1258dacca452f81f69cbb43529505fb22838fbceb951ff9b4793d SHA512 425a7c684d2e7da87a24303e73dd4b7d5fa5b5f44b0faf359d80cf9977c6786e25736f5adf13fee243d8d35604882e6490cfd37d80f60858f42e475dc26256cf
+EBUILD webkit-gtk-2.46.2.ebuild 7866 BLAKE2B c79c64bbbfdbfbea97f908d2fc6f67ea2e576d46967a4ce0a506a947049e80f9add2a292dfc9cf661e6777a530caac2fd1a98394ce8cd02a701ab22e411142ce SHA512 9aaebac4e591da05d360bfe1bfed845d92805edffcd2422b8712f2d828222b1e4cb32171058aa3e2a64a7099210f3f06935a9746488d2ca7a4205e08f10ffba4
 MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1
diff --git a/net-libs/webkit-gtk/files/2.46.1-riscv-buildfix.patch b/net-libs/webkit-gtk/files/2.46.1-riscv-buildfix.patch
deleted file mode 100644
index 7c9110280020..000000000000
--- a/net-libs/webkit-gtk/files/2.46.1-riscv-buildfix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2f69282c9271c76e8783412766a50477288e5888 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Thu, 3 Oct 2024 12:34:03 +0200
-Subject: [PATCH] JavaScriptCore/jit/GPRInfo.h: fix typo in RISCV64Registers
-
-RICSV64Registers -> RISCV64Registers
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
- Source/JavaScriptCore/jit/GPRInfo.h | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/Source/JavaScriptCore/jit/GPRInfo.h b/Source/JavaScriptCore/jit/GPRInfo.h
-index fa7bf0aac48de..df5871957b3f5 100644
---- a/Source/JavaScriptCore/jit/GPRInfo.h
-+++ b/Source/JavaScriptCore/jit/GPRInfo.h
-@@ -779,16 +779,16 @@ class GPRInfo {
-     static constexpr GPRReg wasmBaseMemoryPointer = regCS3;
-     static constexpr GPRReg wasmBoundsCheckingSizeRegister = regCS4;
- 
--    static constexpr GPRReg regWS0 = RICSV64Registers::x6;
--    static constexpr GPRReg regWS1 = RICSV64Registers::x7;
--    static constexpr GPRReg regWA0 = RICSV64Registers::x10;
--    static constexpr GPRReg regWA1 = RICSV64Registers::x11;
--    static constexpr GPRReg regWA2 = RICSV64Registers::x12;
--    static constexpr GPRReg regWA3 = RICSV64Registers::x13;
--    static constexpr GPRReg regWA4 = RICSV64Registers::x14;
--    static constexpr GPRReg regWA5 = RICSV64Registers::x15;
--    static constexpr GPRReg regWA6 = RICSV64Registers::x16;
--    static constexpr GPRReg regWA7 = RICSV64Registers::x17;
-+    static constexpr GPRReg regWS0 = RISCV64Registers::x6;
-+    static constexpr GPRReg regWS1 = RISCV64Registers::x7;
-+    static constexpr GPRReg regWA0 = RISCV64Registers::x10;
-+    static constexpr GPRReg regWA1 = RISCV64Registers::x11;
-+    static constexpr GPRReg regWA2 = RISCV64Registers::x12;
-+    static constexpr GPRReg regWA3 = RISCV64Registers::x13;
-+    static constexpr GPRReg regWA4 = RISCV64Registers::x14;
-+    static constexpr GPRReg regWA5 = RISCV64Registers::x15;
-+    static constexpr GPRReg regWA6 = RISCV64Registers::x16;
-+    static constexpr GPRReg regWA7 = RISCV64Registers::x17;
- 
-     static constexpr GPRReg patchpointScratchRegister = RISCV64Registers::x30; // Should match dataTempRegister
- 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.2-r410.ebuild
index d7ad93f005eb..2b20ac28e17d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.2-r410.ebuild
@@ -150,8 +150,6 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
-
-	eapply "${FILESDIR}/2.46.1-riscv-buildfix.patch"
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.2-r600.ebuild
index 8c4f3556c6b3..9943c5467da0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.2-r600.ebuild
@@ -161,8 +161,6 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
-
-	eapply "${FILESDIR}/2.46.1-riscv-buildfix.patch"
 }
 
 src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.2.ebuild
index ae809ea078f4..c7591b6bc2df 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.2.ebuild
@@ -150,8 +150,6 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 	gnome2_src_prepare
-
-	eapply "${FILESDIR}/2.46.1-riscv-buildfix.patch"
 }
 
 src_configure() {