From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/
Date: Thu, 21 Mar 2024 02:45:49 +0000 (UTC) [thread overview]
Message-ID: <1710989109.387a58172e3864aa412bd5bf8d108da784817255.sam@gentoo> (raw)
commit: 387a58172e3864aa412bd5bf8d108da784817255
Author: Branko Grubic <bitlord0xff <AT> gmail <DOT> com>
AuthorDate: Tue Mar 5 18:06:51 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <bitlord0xff <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35633
Signed-off-by: Sam James <sam <AT> 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 <dennis.camera+webkit@riiengineering.ch>
+Date: Mon, 4 Mar 2024 09:27:54 -0800
+Subject: [PATCH] [JSC] A64DOpcode include <mutex>
+ 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 <mutex>.
+
+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 <mutex>
+ #include <stdint.h>
+ #include <wtf/Assertions.h>
+ #include <wtf/DataLog.h>
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
next reply other threads:[~2024-03-21 2:45 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-21 2:45 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-11 23:33 [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ Sam James
2024-10-27 12:47 Michael Orlitzky
2024-07-21 8:19 Pacho Ramos
2024-01-03 21:59 Mart Raudsepp
2023-12-24 15:54 Mart Raudsepp
2023-10-18 20:19 Mart Raudsepp
2023-05-30 17:16 Matt Turner
2023-05-18 14:41 Matt Turner
2023-04-05 23:21 Sam James
2023-04-02 0:57 Matt Turner
2023-03-30 16:38 Sam James
2022-12-04 19:42 Matt Turner
2022-09-13 17:56 Matt Turner
2022-04-20 2:33 Matt Turner
2022-01-10 23:48 Mart Raudsepp
2022-01-02 22:46 Mart Raudsepp
2021-08-04 22:36 Matt Turner
2021-02-20 9:44 Mart Raudsepp
2020-07-30 21:18 Mart Raudsepp
2020-05-12 15:53 Mart Raudsepp
2020-05-09 20:40 Mart Raudsepp
2020-02-17 21:54 Mart Raudsepp
2020-02-05 13:06 Mart Raudsepp
2020-01-02 16:47 Mart Raudsepp
2018-08-16 21:33 Mart Raudsepp
2017-06-01 13:30 Mart Raudsepp
2017-05-10 10:40 Mart Raudsepp
2017-04-08 22:00 Mart Raudsepp
2016-07-03 15:38 Pacho Ramos
2016-05-29 10:06 Pacho Ramos
2015-11-15 21:03 Pacho Ramos
2015-11-07 11:12 Pacho Ramos
2015-11-07 11:07 Pacho Ramos
2015-08-24 5:59 Jeroen Roovers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1710989109.387a58172e3864aa412bd5bf8d108da784817255.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox