From 8a550e596cf7df735383fc2a2c3b79c51ac0a589 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Feb 2024 23:40:53 +0000 Subject: gentoo auto-resync : 23:02:2024 - 23:40:53 --- net-libs/webkit-gtk/Manifest | 7 +++-- .../webkit-gtk/files/2.42.5-x86-build-fix.patch | 33 ++++++++++++++++++++++ net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild | 2 ++ net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild | 2 ++ net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild | 2 ++ 5 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 net-libs/webkit-gtk/files/2.42.5-x86-build-fix.patch (limited to 'net-libs/webkit-gtk') diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index f9749a42af42..1fa2937bf741 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,5 +1,6 @@ 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 +AUX 2.42.5-x86-build-fix.patch 1375 BLAKE2B 0ce7224b81fbcf6602845cc5ba454c6e2c86301fb9b075c435308e420c42ed907fec18ef8e0c4e00f2b78cf3776531d9092f6c62fa176f149d21713da6fc52ee SHA512 aad29eecab37d12a983aa5748c08761458769643d1c9cd87c017c58a4ac00c0c6f3cf7f04d0b30e846485def9414a75a46f29256ca7a7dec89aa25b081b6f1dd DIST webkitgtk-2.42.3.tar.xz 32023120 BLAKE2B 8a132039895d859189b65a5fd09e35a99b5ce2ad0cf46c44a4ec9b6c499155c8dcc9d28d4add727f59078df99d03157f203fb12feed7e75f2e28fbebe9953850 SHA512 3ccd7245c656f2919357b8c0b867f47d223cac3cdca5e5a015bb3e6097051c87c8bd38db5fafea8801ca3f0d0d493d7f2f1079ff72fc2afc9cb7a281f4ae6839 DIST webkitgtk-2.42.4.tar.xz 32059260 BLAKE2B 3a8cd0818e0d989ab778cda63dd873d7e185ec20fbfe609b9da70041fe38ac30351046516600cb8eb86089e43136487d81c922690468daa70ed2a436561c2401 SHA512 2019408b3b6b2354ea3da380abaad34d51fed6d5ce9d5a9ff9db6f911d235f8a9eb765ccf1e5608ddc49516cafee9921b4a0f9912b9ae5af56701f8fc0f45293 DIST webkitgtk-2.42.5.tar.xz 34651836 BLAKE2B 4b772d91d3e2c3fc3a48455f43016d2cc1699b18fcc78253d1527eecabbfc1f47cd3bf3c512508fd683d29de68f980511d2057e4c65979bab38083a2da5cb516 SHA512 9b992b1156a87b503deec4640ee9383227c7341910f1b33b7cba03d32194b36aa61de6ae3e8a58c23adcab74e71b78d1c8d4124f32bffc4dd58d93931fb94ef0 @@ -9,7 +10,7 @@ EBUILD webkit-gtk-2.42.3.ebuild 7778 BLAKE2B 140fbf250e32d892dd7b60f749296b5db94 EBUILD webkit-gtk-2.42.4-r410.ebuild 8206 BLAKE2B 652d0d03eafdbe65099216fb83900b9c24abad6817c6065734269bb4f0d5b06502e06a38602dfa5a30721dd1c26403bd0930b46cf2ac72b4142fe686770dbcb3 SHA512 a37c9bb7a5e1583332fb04dc43a00670390857e19a0b516a1618efc720dd192840cb8054c0f2487f246e1d751e9b3dbb141937b02d964df11fb6fc4fa41d7a92 EBUILD webkit-gtk-2.42.4-r600.ebuild 8103 BLAKE2B 3ab76ad51b938f618d3012398cbafa12fd595cfec29493550f504cf79126f26e934876de80a136a5e2ef50701b88e3957d3eac69fb88dba0798bc8fdc881cee2 SHA512 97eec9186c4d15c0dff8aeb122346c8a9de4f7baf25f00803cd3c185fd168fa978736275698e5d17fbdaa8297d45d604af0c90ee4c5aea893c36da1043e3a342 EBUILD webkit-gtk-2.42.4.ebuild 7932 BLAKE2B ee9487f32d0e624293558d5d61bd010acfd4323dbe059f1b9d7640573d84e1ec5e538b9d90e5cd0465aa39a88f409c90390cb2f66101d21c072a2079a5b42309 SHA512 2757f09c57ff3f235c63d252d2e6fa9ab2c6058f42aab90a1917e458e091d4f77fe920324ad886b97b71c244e09b97045fc250de966bd383883f9ee940f22304 -EBUILD webkit-gtk-2.42.5-r410.ebuild 8210 BLAKE2B 0df637a8748e37945e8c2ffc6056228e0adc6fb072d41c4eb9acc21b5ba8adef8ba0c09a2da48f93820a1327da908a27d2cd9a75b28e2bd9b91f90ff0cf02c84 SHA512 5741b339da119957764da2846961d74a4949dfda79aa621a3a668fd09ec8da40abab48e8ba24f6659b288b14416de225f805c651f1004eef61e5065017326f1e -EBUILD webkit-gtk-2.42.5-r600.ebuild 8107 BLAKE2B 1dbd2d519046bae4bca2e2decca661b122b4829075222b9556094a14189f29c1934fdd0b796b1b59098b7b654be9d390c0851ed644cc31c53bff71470bfe3c11 SHA512 ec79adddde8a21f47a36bc14b22ba05c98425e6d4ffc4bcdf6f95b8bc7a4eb16f625ba7b05eeacb522b63ab40381c3ebe4b19e8f2660d7f2887ac3ca77dfa27d -EBUILD webkit-gtk-2.42.5.ebuild 7936 BLAKE2B 0c1dcc003e9e3dbcb7ad03f6ae4b58abd40444adcade8a2c444dfb1e088e0d6e1e12e1e78ca8aa1d14fe9f8b40752976f849ea09b74234c2a4feba88527fdefc SHA512 8d02365520a3c056b667c9203a3075f42f279c147654ccfd41e7a9ff9ea558e878ef4a612269338f75b044fba8d2d012e22f80b48ba2de86b198d6e105e0aae4 +EBUILD webkit-gtk-2.42.5-r410.ebuild 8298 BLAKE2B 4b581b88d9525baf956895924a52888bbf3de65d47fc511d2e686fe46d1dfc0710c7eda42d3cf176131d17a71b948cf5dde861bdd03a61691e7baabb4696d371 SHA512 f50606bcc68bfe82ab19e3146b57a4cec1883da2e9e4053ea7af358197bf7ce4c36463a1b1f9b0c44e043ba6a8a6110c8e083310cab088c3e20775a48e1e5e82 +EBUILD webkit-gtk-2.42.5-r600.ebuild 8195 BLAKE2B bb73004d2834761a573ccac0160c4e888776918f6eacbd193d27ec50810a27315c3fb5e02965783e97094ad4e39cddc68c72091864304c1bbe01d7958bd643ed SHA512 f9b5d46c5720ac0a5a6f1d6160e5ac9f10ab4523940e70275ff27045d3f0e5d7f087f2c8cc954b4b0edc2192f5d5a3971d0fcfdd95a526bd9bf919c9540bfb65 +EBUILD webkit-gtk-2.42.5.ebuild 8024 BLAKE2B d8c3c372e3d11afc4f6ad989675f70dc6342e16152f4b21b765679d6021ad7ce188ef446ba7a4257ddf7ba68642cf66ede81dcd0adf93440aac5ab6d305e0dd2 SHA512 5bd05f97328d60569af7a21dfd8499f8ecb7b2c28895441c6931137436d4dcbeaf8a2ac40e4f495422b93b8a66d7461f5b07cf9bba13e16ef9c8c12e7372a64a MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1 diff --git a/net-libs/webkit-gtk/files/2.42.5-x86-build-fix.patch b/net-libs/webkit-gtk/files/2.42.5-x86-build-fix.patch new file mode 100644 index 000000000000..f5f4120f06cc --- /dev/null +++ b/net-libs/webkit-gtk/files/2.42.5-x86-build-fix.patch @@ -0,0 +1,33 @@ +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= + =?UTF-8?q?=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 5064ead6cd2e..9a2e2653b121 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild index 54bf8cd4e088..0f1a6bea0d66 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild @@ -157,6 +157,8 @@ src_prepare() { 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 + # Fix compilation on x86, bug #924873 + eapply "${FILESDIR}"/2.42.5-x86-build-fix.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild index e50d46619df2..be33daab50ba 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild @@ -158,6 +158,8 @@ src_prepare() { 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 + # Fix compilation on x86, bug #924873 + eapply "${FILESDIR}"/2.42.5-x86-build-fix.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild index d4913a9eb4f8..002acc94dddf 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild @@ -155,6 +155,8 @@ src_prepare() { 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 + # Fix compilation on x86, bug #924873 + eapply "${FILESDIR}"/2.42.5-x86-build-fix.patch } src_configure() { -- cgit v1.2.3