From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3B869158041 for ; Thu, 21 Mar 2024 02:45:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DC58E29C2; Thu, 21 Mar 2024 02:45:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7EB79E29C2 for ; Thu, 21 Mar 2024 02:45:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87E5B335D21 for ; Thu, 21 Mar 2024 02:45:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 266D01596 for ; Thu, 21 Mar 2024 02:45:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1710989109.387a58172e3864aa412bd5bf8d108da784817255.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild X-VCS-Directories: net-libs/webkit-gtk/ net-libs/webkit-gtk/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 387a58172e3864aa412bd5bf8d108da784817255 X-VCS-Branch: master Date: Thu, 21 Mar 2024 02:45:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6387eb77-d382-4c9b-9eae-cf052ed4a2dd X-Archives-Hash: 6649f66e2b3d6fb6a4c483bc7913babb commit: 387a58172e3864aa412bd5bf8d108da784817255 Author: Branko Grubic gmail com> AuthorDate: Tue Mar 5 18:06:51 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Mar 21 02:45:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=387a5817 net-libs/webkit-gtk: Fixes ARM64 non-jumbo build Closes: https://bugs.gentoo.org/925621 Signed-off-by: Branko Grubic gmail.com> Closes: https://github.com/gentoo/gentoo/pull/35633 Signed-off-by: Sam James gentoo.org> .../files/2.42.3-arm64-non-jumbo-fix-925621.patch | 29 ++++++++++++++++++++++ net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild | 1 + 10 files changed, 38 insertions(+) diff --git a/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch b/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch new file mode 100644 index 000000000000..51fc45fa32c4 --- /dev/null +++ b/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch @@ -0,0 +1,29 @@ +From 56001e951362a5064027b1af81283e523e35559b Mon Sep 17 00:00:00 2001 +From: Dennis Camera +Date: Mon, 4 Mar 2024 09:27:54 -0800 +Subject: [PATCH] [JSC] A64DOpcode include + https://bugs.webkit.org/show_bug.cgi?id=270394 + +Reviewed by Michael Catanzaro. + +When UNIFIED_BUILDS are disabled, the build fails due to missing std::call_once. + +* Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h: include . + +Canonical link: https://commits.webkit.org/275630@main +--- + Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h b/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h +index 0392bcb6e20a0..202aa4d1d81de 100644 +--- a/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h ++++ b/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h +@@ -25,6 +25,7 @@ + + #pragma once + ++#include + #include + #include + #include diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild index 67a6f3ef6fd2..e42873a09ccd 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild @@ -153,6 +153,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild index 55fb6a6fc4ca..8e47bab09487 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild @@ -154,6 +154,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild index c2dbd794b679..947457b3bc6d 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild @@ -151,6 +151,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch } src_configure() { 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 68f473b5cc83..39b921345132 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 @@ -155,6 +155,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch # Fix assert failure on some machines, bug #920704 eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch } 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 2d58a29cbfa2..71847398694a 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 @@ -156,6 +156,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch # Fix assert failure on some machines, bug #920704 eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch } 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 aa578715e450..0bd69d249c30 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild @@ -153,6 +153,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch # Fix assert failure on some machines, bug #920704 eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch } 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 0f1a6bea0d66..38d773a9d41c 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 @@ -155,6 +155,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch # Fix assert failure on some machines, bug #920704 eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch # Fix compilation on x86, bug #924873 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 be33daab50ba..78f3686ffd25 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 @@ -156,6 +156,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch # Fix assert failure on some machines, bug #920704 eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch # Fix compilation on x86, bug #924873 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 002acc94dddf..b2b5f75bcd7c 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild @@ -153,6 +153,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch # Fix assert failure on some machines, bug #920704 eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch # Fix compilation on x86, bug #924873