summaryrefslogtreecommitdiff
path: root/net-libs/webkit-gtk
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs/webkit-gtk')
-rw-r--r--net-libs/webkit-gtk/Manifest14
-rw-r--r--net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch29
-rw-r--r--net-libs/webkit-gtk/files/2.44.1-branch-patchset.patch262
-rw-r--r--net-libs/webkit-gtk/files/2.44.1-riscv.patch62
-rw-r--r--net-libs/webkit-gtk/files/2.44.2-excessive-cpu-usage.patch53
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild251
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild265
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild249
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild2
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild2
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild2
11 files changed, 6 insertions, 1185 deletions
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 31d193237366..ca78257cf2ba 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,18 +1,10 @@
-AUX 2.42.3-arm64-non-jumbo-fix-925621.patch 1025 BLAKE2B 6a9641b4c05b62c143b2be5ed1d2d8563839466d56831b4dcba503c8892848155f753b0c892407882e41d9cdebd418eff68b94918ed098526813feb1cb87c435 SHA512 238531fe2cc6dff154527abafb8d9c3f0586a82122675d763a440d8dd58162840ebd0539b2ca5c797b203707b4b4470207e509f050220881bc5474660b057ab7
-AUX 2.44.1-branch-patchset.patch 11288 BLAKE2B 0966d524063bc6137464eca431d161ac3b8ec0687f5cb2fa318d95734ceebd6bf9a4bef8db39b135f02a5e64ab453a9e74b3484db1411cf8ad85292d9d4cf034 SHA512 7f2420e49e085fecd630a62866ba2df0470e89f5bf92251436e9aca55200a158b96e866bf15bef283abf4b81d484d9747368fcd3ed2c58d0650aee1df9d9cd52
AUX 2.44.1-non-unified-build-fixes.patch 11799 BLAKE2B 6928f61428c4bc6594a46f7427e644143b071c39cc7405b143d693f956631519860efd958dd928f55c1e6139334966fd6bb92e42594c7b7b9b11236d5b0154f2 SHA512 c3ee1b48bebe8c6e504b6d15277b67261cceffa9790a212972f2d0ffd32d68c60c96373a2fecc0af9c6400114ecc84130bb23d81d03e08473b60eaadc3df9802
-AUX 2.44.1-riscv.patch 2977 BLAKE2B 37a6e22cea8f621e1857141a77b886d82afca1bec70d56b5ecce4b5f89eefc1c0c311f11521840872314a1372ef4666b71000ed14eec787a26c4dc694a1168b3 SHA512 ee5ecbc98c0a40d41477975adc9d4d093cecb9dfe26901f6a5eed510bcefb505885fd7dc99cccc20a79661df900a70a985d2cf740f51481037a8888961488cda
-AUX 2.44.2-excessive-cpu-usage.patch 2972 BLAKE2B 2d01af909030900b4c2de7e441b4c667cdd739d3856ee21a2ec1f49ea74430159b1e66b7dd2cefbf6be6c4684a6ea70b39b7064d751076e2d409cff40e7a7521 SHA512 6a0b65e7c70d5d7ad1c80ca4441a3442dcfb399f55dd1c3c1771f710e20da45bb92490967e9efe8943b89b0c298812a65112100bdb0fcacefc24cb695b1bb61c
AUX 2.46.1-riscv-buildfix.patch 2144 BLAKE2B 27515b7497cb0ca0f04da4352fda97eb254643e1d2486603bb82aff32c96da2f0a08d0cb50b3ab124c83d249816310add54ca6b589372fd1756723ed6db6b4d8 SHA512 4020e64a11fc3df014deb568dcd6f8b07c9ebef53bd8b0dfaae94411b7bedbf14aeeb6d5eea893a4b45da41e29720b69f2d17c81f887ec3c23e6c84cca4d6a4f
-DIST webkitgtk-2.44.1.tar.xz 36280696 BLAKE2B a5fff4c4fe90bcd0ea098930e51a36ea60152da47fd06e78abbc10f146437838aa19fed15cf58732b538046e1f42d8461cd5c0e0859096506932c9fae150cc16 SHA512 b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169
DIST webkitgtk-2.44.4.tar.xz 35858056 BLAKE2B 9e3d016bfb2b4e80d2ebeda95e75f8ec8b909b41b17a879d3e1119ed66e3bf4d590a22ed814bb1572dac8d8a8838bb37b5ab1372121b276e02ee8925f6c5b00c SHA512 037ef6a9faca68b68dc62927a475134450493129043ea6cc03595cd4a684d590f80a1e9c3ed40a9176874ba43fc9efbc5065a264dfe131ebd72e272756612db9
DIST webkitgtk-2.46.1.tar.xz 42776840 BLAKE2B 784b4cc4d59da31000612955413608f7a39481c66711139a7c8bc4cf854a62801865a6b3455d6a05918297b2ff3c9ba38ea9046f338ea6060768192af6d67bcd SHA512 e1ac92305b1d1b034eea9be6aa22cfa260249562fa0af41f0ed5c76a36916bba432073e033f228978d84d0377f245642ff31cdec324565e83aa8c82d8ea0c1f5
-EBUILD webkit-gtk-2.44.1-r410.ebuild 7961 BLAKE2B 442435051d98fbe4171bbddf7b65535d97ad33bb2b76ece855d2ca1a02fb423efb112a239c2c2ced7174c950e78d2347237be2dbf72392694b4fbdb618e98de6 SHA512 025bc8d14cc3459ba2a0fbcc1e3de32eae18394b3a43b0c1acea8ff68e601217364dea8eac862aff441ccf397f7f73c77750f09bf074b7887b5ab34692be8a23
-EBUILD webkit-gtk-2.44.1-r600.ebuild 8731 BLAKE2B cfe0215bd43e15124abf32ba0779441b3e48bd395479da706064cad2f0fd8ffd1eec6122d83ed6032d024997c3487f4175c0c16769696d14f45a05d1ec2f4d56 SHA512 ccfdd83983bf4ef3673a4e81459515f43e619e512694487fbdd345c6aaafb9c12fc4b28f98de4f50b262f8e984d07abda0e63511bff73f66ab51d3ad795aeb82
-EBUILD webkit-gtk-2.44.1.ebuild 7809 BLAKE2B f8eebb5a781e511fa7119c56f80e885c3af9af5ad58bcad6e3f53f903ea2777849f35167d1b2fece8f91ea2a7cba4795d1b978de7048aed8d59ebad053c64f39 SHA512 3dda8a65331b87ae3d7699757908623792b20d161e94391277cd82a81516c71dea7222d6d88b13a48464dfb8634278062d558901ec43e339b2ec53f40b03193d
-EBUILD webkit-gtk-2.44.4-r410.ebuild 7829 BLAKE2B c53726dabb79b327be04b7468d3de56f89533820ccabb5aaa1a7380bbe4eb984832c8a20dc4a9a07e8d7e522345ec6339d9f8ab05e900a0579c88911c9c1fbb5 SHA512 7798a5b06216aa056d8096aed2ffbf140c6d0dcb774a49f62fc5a0eac2f5ed710c006772b53d4ba2fccb04c08b841f97d95da3667a1560d5d9c141f8a88ec5a0
-EBUILD webkit-gtk-2.44.4-r600.ebuild 8570 BLAKE2B 490a86855a0f0f27c0ae43858f46f2e48a93a901ac4ef91b10eac426c5287514ede3cc29bde7d8f9d0aea17c53cf90e3d52219ce2463338caea5f8abce679ba8 SHA512 94a59ed3537b79d3750f742b1d42bd09704a31e122e5b3b48790311275195b0636c7ea90d9eb85dd58a898600ae90a1b7494ceb3d8a190e8b922242017642071
-EBUILD webkit-gtk-2.44.4.ebuild 7677 BLAKE2B 42d8395c7c59e2478905f794dcdd791e965bd42ed19eca8c47545359c888d49839766adf969a90edc8fa0b214e2cafd868dc40123684cfd234223d110309ae82 SHA512 fd0d908d4edbdd47b24a1f0fa8696a69f098a581af7f4d261edd398c0cd59c098ca31d9163b47873f2cae336865dea5089adc71c169f9fe43c952f87fc26304e
+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
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
deleted file mode 100644
index 51fc45fa32c4..000000000000
--- a/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/files/2.44.1-branch-patchset.patch b/net-libs/webkit-gtk/files/2.44.1-branch-patchset.patch
deleted file mode 100644
index 869c85e84a6e..000000000000
--- a/net-libs/webkit-gtk/files/2.44.1-branch-patchset.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From 53ca279739365f9a604fba0a673f0539dfd67c55 Mon Sep 17 00:00:00 2001
-From: Patrick Griffis <pgriffis@igalia.com>
-Date: Mon, 8 Apr 2024 10:21:34 -0700
-Subject: [PATCH 1/6] Cherry-pick 277203@main (bd1249cc9c4f).
- https://bugs.webkit.org/show_bug.cgi?id=272309
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
- Workaround restrict error in GCC 12
- https://bugs.webkit.org/show_bug.cgi?id=272309
-
- Reviewed by Darin Adler.
-
- In GCC 12.3.0:
-
- In static member function ‘static constexpr std::char_traits<char>::char_type* std::char_traits<char>::copy(char_type*, const char_type*, std::size_t)’,
- inlined from ‘static constexpr void std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::_S_copy(_CharT*, const _CharT*, size_type) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.h:431:21,
- inlined from ‘constexpr std::__cxx11::basic_string<_CharT, _Traits, _Allocator>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::_M_replace(size_type, size_type, const _CharT*, size_type) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.tcc:532:22,
- inlined from ‘constexpr std::__cxx11::basic_string<_CharT, _Traits, _Alloc>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::replace(size_type, size_type, const _CharT*, size_type) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.h:2179:19,
- inlined from ‘constexpr std::__cxx11::basic_string<_CharT, _Traits, _Alloc>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::insert(size_type, const _CharT*) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]’ at /usr/include/c++/12/bits/basic_string.h:1936:22,
- inlined from ‘std::ostream& WTF::operator<<(std::ostream&, Int128Impl)’ at /host/home/tingping/Projects/WebKit/Source/WTF/wtf/Int128.cpp:268:17:
- /usr/include/c++/12/bits/char_traits.h:435:56: error: ‘void* __builtin_memcpy(void*, const void*, long unsigned int)’ accessing 9223372036854775810 or more bytes at offsets [2, 9223372036854775807] and 1 may overlap up to 9223372036854775813 bytes at offset -3 [-Werror=restrict]
- 435 | return static_cast<char_type*>(__builtin_memcpy(__s1, __s2, __n));
- | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~
-
- * Source/WTF/wtf/Int128.cpp:
- (WTF::operator<<):
-
- Canonical link: https://commits.webkit.org/277203@main
-
-Canonical link: https://commits.webkit.org/274313.129@webkitglib/2.44
----
- Source/WTF/wtf/Int128.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WTF/wtf/Int128.cpp b/Source/WTF/wtf/Int128.cpp
-index 3962059d0cb9..c04f6d74543a 100644
---- a/Source/WTF/wtf/Int128.cpp
-+++ b/Source/WTF/wtf/Int128.cpp
-@@ -265,9 +265,9 @@ std::ostream& operator<<(std::ostream& os, Int128Impl v) {
- (flags & std::ios::basefield) == std::ios_base::fmtflags();
- if (print_as_decimal) {
- if (Int128High64(v) < 0) {
-- rep = "-";
-+ rep.append("-");
- } else if (flags & std::ios::showpos) {
-- rep = "+";
-+ rep.append("+");
- }
- }
-
---
-2.43.0
-
-
-From 8ce83c4bf224122e0062248752a3ed014efc67e5 Mon Sep 17 00:00:00 2001
-From: Tim Nguyen <ntim@apple.com>
-Date: Wed, 3 Apr 2024 09:22:37 -0700
-Subject: [PATCH 4/6] Cherry-pick 277007@main (1870b119a450).
- https://bugs.webkit.org/show_bug.cgi?id=272044
-
- CrashTracer: com.apple.WebKit.WebContent at WebCore: WebCore::ValidatedFormListedElement::updateValidity
- https://bugs.webkit.org/show_bug.cgi?id=272044
- rdar://117727866
-
- Reviewed by Ryosuke Niwa.
-
- It speculatively fixes a bug that RadioButtonGroup::m_members may contain a nullptr WeakRef.
-
- * Source/WebCore/dom/RadioButtonGroups.cpp:
- (WebCore::RadioButtonGroup::isEmpty const):
- (WebCore::RadioButtonGroup::remove):
- (WebCore::RadioButtonGroup::setNeedsStyleRecalcForAllButtons):
- (WebCore::RadioButtonGroup::updateValidityForAllButtons):
-
- Canonical link: https://commits.webkit.org/277007@main
-
-Canonical link: https://commits.webkit.org/274313.132@webkitglib/2.44
----
- Source/WebCore/dom/RadioButtonGroups.cpp | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Source/WebCore/dom/RadioButtonGroups.cpp b/Source/WebCore/dom/RadioButtonGroups.cpp
-index ba07a3fbdf09..4bbae6cbb72f 100644
---- a/Source/WebCore/dom/RadioButtonGroups.cpp
-+++ b/Source/WebCore/dom/RadioButtonGroups.cpp
-@@ -31,7 +31,7 @@ namespace WebCore {
- class RadioButtonGroup {
- WTF_MAKE_FAST_ALLOCATED;
- public:
-- bool isEmpty() const { return m_members.isEmpty(); }
-+ bool isEmpty() const { return m_members.isEmptyIgnoringNullReferences(); }
- bool isRequired() const { return m_requiredCount; }
- RefPtr<HTMLInputElement> checkedButton() const { return m_checkedButton.get(); }
- void add(HTMLInputElement&);
-@@ -47,7 +47,7 @@ private:
- bool isValid() const;
- void setCheckedButton(HTMLInputElement*);
-
-- HashSet<WeakRef<HTMLInputElement, WeakPtrImplWithEventTargetData>> m_members;
-+ WeakHashSet<HTMLInputElement, WeakPtrImplWithEventTargetData> m_members;
- WeakPtr<HTMLInputElement, WeakPtrImplWithEventTargetData> m_checkedButton;
- size_t m_requiredCount { 0 };
- };
-@@ -60,7 +60,7 @@ inline bool RadioButtonGroup::isValid() const
- Vector<Ref<HTMLInputElement>> RadioButtonGroup::members() const
- {
- auto sortedMembers = WTF::map(m_members, [](auto& element) -> Ref<HTMLInputElement> {
-- return element.get();
-+ return element;
- });
- std::sort(sortedMembers.begin(), sortedMembers.end(), [](auto& a, auto& b) {
- return is_lt(treeOrder<ComposedTree>(a, b));
-@@ -155,7 +155,7 @@ void RadioButtonGroup::remove(HTMLInputElement& button)
- }
- }
-
-- if (m_members.isEmpty()) {
-+ if (m_members.isEmptyIgnoringNullReferences()) {
- ASSERT(!m_requiredCount);
- ASSERT(!m_checkedButton);
- } else if (wasValid != isValid())
-@@ -170,7 +170,7 @@ void RadioButtonGroup::remove(HTMLInputElement& button)
- void RadioButtonGroup::setNeedsStyleRecalcForAllButtons()
- {
- for (auto& checkedButton : m_members) {
-- Ref button = checkedButton.get();
-+ Ref button = checkedButton;
- ASSERT(button->isRadioButton());
- button->invalidateStyleForSubtree();
- }
-@@ -179,7 +179,7 @@ void RadioButtonGroup::setNeedsStyleRecalcForAllButtons()
- void RadioButtonGroup::updateValidityForAllButtons()
- {
- for (auto& checkedButton : m_members) {
-- Ref button = checkedButton.get();
-+ Ref button = checkedButton;
- ASSERT(button->isRadioButton());
- button->updateValidity();
- }
---
-2.43.0
-
-
-From 93bde17ed761f5de54726de83ced4959303794c6 Mon Sep 17 00:00:00 2001
-From: Abrar Rahman Protyasha <a_protyasha@apple.com>
-Date: Mon, 1 Apr 2024 22:42:12 -0700
-Subject: [PATCH 5/6] Cherry-pick 276925@main (59cedf7135bc).
- https://bugs.webkit.org/show_bug.cgi?id=271962
-
- Linker error when logging ViewportConfiguration to TextStream in Release configuration
- https://bugs.webkit.org/show_bug.cgi?id=271962
- rdar://125713559
-
- Reviewed by Sihui Liu.
-
- WebCore::operator<<(WTF::TextStream&, WebCore::ViewConfiguration const&)
- is defined behind !LOG_DISABLED, which means in Release configuration,
- the linker cannot find this definition.
-
- This patch fixes the linker error by removing the relevant !LOG_DISABLED
- checks around both the operator<< overload definition and the
- description()/dump() declarations, since said methods are referenced by
- the operator<< overload.
-
- * Source/WebCore/page/ViewportConfiguration.cpp:
- (WebCore::ViewportConfiguration::setIsKnownToLayOutWiderThanViewport):
- (WebCore::ViewportConfiguration::dump const):
- * Source/WebCore/page/ViewportConfiguration.h:
-
- Canonical link: https://commits.webkit.org/276925@main
-
-Canonical link: https://commits.webkit.org/274313.133@webkitglib/2.44
----
- Source/WebCore/page/ViewportConfiguration.cpp | 4 ++--
- Source/WebCore/page/ViewportConfiguration.h | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Source/WebCore/page/ViewportConfiguration.cpp b/Source/WebCore/page/ViewportConfiguration.cpp
-index 51abb1154515..c58bc368cd6c 100644
---- a/Source/WebCore/page/ViewportConfiguration.cpp
-+++ b/Source/WebCore/page/ViewportConfiguration.cpp
-@@ -674,8 +674,6 @@ bool ViewportConfiguration::setIsKnownToLayOutWiderThanViewport(bool value)
- return true;
- }
-
--#if !LOG_DISABLED
--
- TextStream& operator<<(TextStream& ts, const ViewportConfiguration::Parameters& parameters)
- {
- ts.startGroup();
-@@ -747,6 +745,8 @@ String ViewportConfiguration::description() const
- return ts.release();
- }
-
-+#if !LOG_DISABLED
-+
- void ViewportConfiguration::dump() const
- {
- WTFLogAlways("%s", description().utf8().data());
-diff --git a/Source/WebCore/page/ViewportConfiguration.h b/Source/WebCore/page/ViewportConfiguration.h
-index acd5a92ae089..1a7c27225a4b 100644
---- a/Source/WebCore/page/ViewportConfiguration.h
-+++ b/Source/WebCore/page/ViewportConfiguration.h
-@@ -148,9 +148,9 @@ public:
- WEBCORE_EXPORT static Parameters imageDocumentParameters();
- WEBCORE_EXPORT static Parameters xhtmlMobileParameters();
- WEBCORE_EXPORT static Parameters testingParameters();
--
--#if !LOG_DISABLED
-+
- String description() const;
-+#if !LOG_DISABLED
- WEBCORE_EXPORT void dump() const;
- #endif
-
---
-2.43.0
-
-
-From aff53249f2d491d082094a2aa57008c46e55d278 Mon Sep 17 00:00:00 2001
-From: Erica Li <lerica@apple.com>
-Date: Tue, 19 Mar 2024 18:27:04 -0700
-Subject: [PATCH 6/6] Cherry-pick 276379@main (d036679431a5).
- https://bugs.webkit.org/show_bug.cgi?id=271028
-
- ASAN_SEGV | WebCore::LocalFrame::injectUserScripts.
- rdar://124432384
- https://bugs.webkit.org/show_bug.cgi?id=271028
-
- Reviewed by Ryosuke Niwa.
-
- Frame might be detached early, null checking before injectUserScripts from image document.
-
- * Source/WebCore/html/ImageDocument.cpp:
- (WebCore::ImageDocument::createDocumentStructure):
-
- Canonical link: https://commits.webkit.org/276379@main
-
-Canonical link: https://commits.webkit.org/274313.134@webkitglib/2.44
----
- Source/WebCore/html/ImageDocument.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Source/WebCore/html/ImageDocument.cpp b/Source/WebCore/html/ImageDocument.cpp
-index f91478f138fe..67d3ed0d09af 100644
---- a/Source/WebCore/html/ImageDocument.cpp
-+++ b/Source/WebCore/html/ImageDocument.cpp
-@@ -230,7 +230,8 @@ void ImageDocument::createDocumentStructure()
- rootElement->insertedByParser();
- rootElement->setInlineStyleProperty(CSSPropertyHeight, 100, CSSUnitType::CSS_PERCENTAGE);
-
-- frame()->injectUserScripts(UserScriptInjectionTime::DocumentStart);
-+ if (RefPtr localFrame = frame())
-+ localFrame->injectUserScripts(UserScriptInjectionTime::DocumentStart);
-
- // We need a <head> so that the call to setTitle() later on actually has an <head> to append to <title> to.
- auto head = HTMLHeadElement::create(*this);
---
-2.43.0
-
diff --git a/net-libs/webkit-gtk/files/2.44.1-riscv.patch b/net-libs/webkit-gtk/files/2.44.1-riscv.patch
deleted file mode 100644
index fce0cec50113..000000000000
--- a/net-libs/webkit-gtk/files/2.44.1-riscv.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 30e1d5e22213fdaca2a29ec3400c927d710a37a8 Mon Sep 17 00:00:00 2001
-From: Thomas Devoogdt <thomas.devoogdt@barco.com>
-Date: Mon, 16 Jan 2023 17:03:30 +0100
-Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix
- !ENABLE(WEBASSEMBLY_B3JIT)
-
-https://bugs.webkit.org/show_bug.cgi?id=250681
-
-Reviewed by NOBODY (OOPS!).
-
-WasmTypeDefinition.h isn't included if not ENABLE(WEBASSEMBLY_B3JIT).
-Also, toB3Type and simdScalarType are not defined if it is included.
-
-Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
----
- Source/JavaScriptCore/b3/B3Validate.cpp | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/Source/JavaScriptCore/b3/B3Validate.cpp b/Source/JavaScriptCore/b3/B3Validate.cpp
-index d06a76023392..53bf8b16ed86 100644
---- a/Source/JavaScriptCore/b3/B3Validate.cpp
-+++ b/Source/JavaScriptCore/b3/B3Validate.cpp
-@@ -47,6 +47,12 @@
- #include <wtf/StringPrintStream.h>
- #include <wtf/text/CString.h>
-
-+#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_B3JIT)
-+#define simdScalarTypeToB3Type(type) toB3Type(Wasm::simdScalarType(type))
-+#else
-+#define simdScalarTypeToB3Type(type) B3::Type()
-+#endif
-+
- namespace JSC { namespace B3 {
-
- namespace {
-@@ -452,7 +458,7 @@ class Validater {
- case VectorExtractLane:
- VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
- VALIDATE(value->numChildren() == 1, ("At ", *value));
-- VALIDATE(value->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
-+ VALIDATE(value->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
- VALIDATE(value->child(0)->type() == V128, ("At ", *value));
- break;
- case VectorReplaceLane:
-@@ -460,7 +466,7 @@ class Validater {
- VALIDATE(value->numChildren() == 2, ("At ", *value));
- VALIDATE(value->type() == V128, ("At ", *value));
- VALIDATE(value->child(0)->type() == V128, ("At ", *value));
-- VALIDATE(value->child(1)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
-+ VALIDATE(value->child(1)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
- break;
- case VectorNot:
- case VectorAbs:
-@@ -475,7 +481,7 @@ class Validater {
- VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
- VALIDATE(value->numChildren() == 1, ("At ", *value));
- VALIDATE(value->type() == V128, ("At ", *value));
-- VALIDATE(value->child(0)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
-+ VALIDATE(value->child(0)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
- break;
-
- case VectorPopcnt:
diff --git a/net-libs/webkit-gtk/files/2.44.2-excessive-cpu-usage.patch b/net-libs/webkit-gtk/files/2.44.2-excessive-cpu-usage.patch
deleted file mode 100644
index 215e92e532c9..000000000000
--- a/net-libs/webkit-gtk/files/2.44.2-excessive-cpu-usage.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From c6f625d1c91df9986d79a928b01399dce4beb1cc Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@redhat.com>
-Date: Sat, 18 May 2024 08:25:37 -0500
-Subject: [PATCH] Revert "Cherry-pick 276798@main (f91aeb92bd8e).
- https://bugs.webkit.org/show_bug.cgi?id=260455"
-
-Unreviewed. This reverts commit 30ad9a720e6b12a6c958fcef0d7dd3f52da485bd.
-
-See: https://bugs.webkit.org/show_bug.cgi?id=274261
-Canonical link: https://commits.webkit.org/274313.257@webkitglib/2.44
----
- ...e-muted-scroll-and-seek-crash-expected.txt | 4 --
- ...ia-source-muted-scroll-and-seek-crash.html | 65 -------------------
- .../gstreamer/MediaPlayerPrivateGStreamer.cpp | 14 +---
- 3 files changed, 3 insertions(+), 80 deletions(-)
- delete mode 100644 LayoutTests/media/media-source/media-source-muted-scroll-and-seek-crash-expected.txt
- delete mode 100644 LayoutTests/media/media-source/media-source-muted-scroll-and-seek-crash.html
-
-diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
-index 7b28083fae71..a5fb5d679153 100644
---- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
-+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
-@@ -328,8 +328,8 @@ void MediaPlayerPrivateGStreamer::load(const String& urlString)
- m_fillTimer.stop();
-
- ASSERT(m_pipeline);
-- setPlaybinURL(url);
- setVisibleInViewport(player->isVisibleInViewport());
-+ setPlaybinURL(url);
-
- GST_DEBUG_OBJECT(pipeline(), "preload: %s", convertEnumerationToString(m_preload).utf8().data());
- if (m_preload == MediaPlayer::Preload::None && !isMediaSource()) {
-@@ -4027,18 +4027,10 @@ void MediaPlayerPrivateGStreamer::setVisibleInViewport(bool isVisible)
- if (!isVisible) {
- GstState currentState;
- gst_element_get_state(m_pipeline.get(), &currentState, nullptr, 0);
-- // WebKitMediaSrc cannot properly handle PAUSED -> READY -> PAUSED currently, so we have to avoid transitioning
-- // back to READY when the player becomes visible.
-- GstState minimumState = isMediaSource() ? GST_STATE_PAUSED : GST_STATE_READY;
-- if (currentState >= minimumState)
-+ if (currentState > GST_STATE_NULL)
- m_invisiblePlayerState = currentState;
- m_isVisibleInViewport = false;
-- // Avoid setting the pipeline to PAUSED unless the playbin URL has already been set,
-- // otherwise it will fail, and may leave the pipeline stuck on READY with PAUSE pending.
-- if (!m_url.isValid())
-- return;
-- [[maybe_unused]] auto setStateResult = gst_element_set_state(m_pipeline.get(), GST_STATE_PAUSED);
-- ASSERT(setStateResult != GST_STATE_CHANGE_FAILURE);
-+ gst_element_set_state(m_pipeline.get(), GST_STATE_PAUSED);
- } else {
- m_isVisibleInViewport = true;
- if (m_invisiblePlayerState != GST_STATE_VOID_PENDING)
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
deleted file mode 100644
index 211d06e5e00f..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r410.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby31 ruby32 ruby33"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
-# media-libs/mesa dep is for libgbm
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-# with GLX set, but that's a bit automagic too to fix
-# Softblocking webkit-gtk-2.38:4 as at that time WebKitWebDriver migrated to SLOT=4.1; currently it is found in SLOT=6
-RDEPEND="
- >=x11-libs/cairo-1.16.0[X?]
- >=media-libs/fontconfig-2.13.0:1.0
- >=media-libs/freetype-2.9.0:2
- >=dev-libs/libgcrypt-1.7.0:0=
- dev-libs/libtasn1:=
- >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
- >=media-libs/harfbuzz-1.4.2:=[icu(+)]
- >=dev-libs/icu-61.2:=
- media-libs/libjpeg-turbo:0=
- >=media-libs/libepoxy-1.5.4[egl(+)]
- >=net-libs/libsoup-3.0.8:3.0[introspection?]
- >=dev-libs/libxml2-2.8.0:2
- >=media-libs/libpng-1.4:0=
- dev-db/sqlite:3
- sys-libs/zlib:0
- media-libs/libwebp:=
- >=app-accessibility/at-spi2-core-2.46.0:2
-
- >=dev-libs/glib-2.70.0:2
- >=dev-libs/libxslt-1.1.7
- media-libs/woff2
- keyring? ( app-crypt/libsecret )
- introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
- x11-libs/libdrm
- media-libs/mesa
- spell? ( >=app-text/enchant-0.22:2 )
- gstreamer? (
- >=media-libs/gstreamer-1.20:1.0
- >=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
- media-libs/gst-plugins-base:1.0[opengl]
- >=media-plugins/gst-plugins-opus-1.20:1.0
- >=media-libs/gst-plugins-bad-1.20:1.0
- )
-
- X? ( x11-libs/libX11 )
-
- dev-libs/hyphen
- jpegxl? ( >=media-libs/libjxl-0.7.0:= )
- avif? ( >=media-libs/libavif-0.9.0:= )
- lcms? ( media-libs/lcms:2 )
-
- media-libs/libglvnd
- wayland? (
- >=dev-libs/wayland-1.20
- >=dev-libs/wayland-protocols-1.24
- )
-
- seccomp? (
- >=sys-apps/bubblewrap-0.3.1
- sys-libs/libseccomp
- sys-apps/xdg-dbus-proxy
- )
-
- systemd? ( sys-apps/systemd:= )
- gamepad? ( >=dev-libs/libmanette-0.2.4 )
- !<net-libs/webkit-gtk-2.38:4
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
- ${PYTHON_DEPS}
- ${RUBY_DEPS}
- >=app-accessibility/at-spi2-core-2.5.3
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=dev-util/gperf-3.0.1
- dev-util/unifdef
- >=sys-devel/bison-2.4.3
- || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
- sys-devel/gettext
- virtual/pkgconfig
-
- >=dev-lang/perl-5.10
- virtual/perl-Data-Dumper
- virtual/perl-Carp
- virtual/perl-JSON-PP
-
- wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] ; then
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
- check-reqs_pkg_pretend
- fi
-
- if ! test-flag-CXX -std=c++17 ; then
- die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
- fi
- fi
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- check-reqs_pkg_setup
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- gnome2_src_prepare
-
- # Upstream 2.44 branch commits up to aff53249f2d491d, includes a linking and GCC 12 fix
- eapply "${FILESDIR}"/${PV}-branch-patchset.patch
- # Fix USE=-jumbo-build compilation on arm64
- eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
- # Fix USE=-jumbo-build on all arches
- eapply "${FILESDIR}"/${PV}-non-unified-build-fixes.patch
-}
-
-src_configure() {
- # Respect CC, otherwise fails on prefix #395875
- tc-export CC
-
- # ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
- filter-lto
-
- # It does not compile on alpha without this in LDFLAGS
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Sigbuses on SPARC with mcpu and co., bug #???
- use sparc && filter-flags "-mvis"
-
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
- use ppc64 && append-flags "-mminimal-toc"
-
- # Try to use less memory, bug #469942 (see Fedora .spec for reference)
- append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-
- # Ruby situation is a bit complicated. See bug 513888
- local rubyimpl
- local ruby_interpreter=""
- local RUBY
- for rubyimpl in ${USE_RUBY}; do
- if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
- RUBY="$(type -P ${rubyimpl})"
- ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
- fi
- done
- # This will rarely occur. Only a couple of corner cases could lead us to
- # that failure. See bug 513888
- [[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
- # JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
- # so it doesn't respect RUBY_EXECUTABLE, bug #771744.
- sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
- # TODO: Check Web Audio support
- # should somehow let user select between them?
-
- local mycmakeargs=(
- -DPython_EXECUTABLE="${PYTHON}"
- ${ruby_interpreter}
- # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
- -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
- -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
- -DPORT=GTK
- # Source/cmake/WebKitFeatures.cmake
- -DENABLE_API_TESTS=OFF
- -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
- -DENABLE_GAMEPAD=$(usex gamepad)
- -DENABLE_MINIBROWSER=$(usex examples)
- -DENABLE_PDFJS=$(usex pdf)
- -DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
- -DENABLE_SPELLCHECK=$(usex spell)
- -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
- -DENABLE_VIDEO=$(usex gstreamer)
- -DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
- -DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
- -DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
- -DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one
- -DENABLE_WEBGL=ON
- -DENABLE_WEB_AUDIO=$(usex gstreamer)
- -DUSE_AVIF=$(usex avif)
- # Source/cmake/OptionsGTK.cmake
- -DENABLE_DOCUMENTATION=OFF
- -DENABLE_INTROSPECTION=$(usex introspection)
- -DENABLE_JOURNALD_LOG=$(usex systemd)
- -DENABLE_QUARTZ_TARGET=$(usex aqua)
- -DENABLE_WAYLAND_TARGET=$(usex wayland)
- -DENABLE_X11_TARGET=$(usex X)
- -DUSE_GBM=ON
- -DUSE_GTK4=OFF
- -DUSE_JPEGXL=$(usex jpegxl)
- -DUSE_LCMS=$(usex lcms)
- -DUSE_LIBBACKTRACE=OFF
- -DUSE_LIBDRM=ON
- -DUSE_LIBHYPHEN=ON
- -DUSE_LIBSECRET=$(usex keyring)
- -DUSE_SOUP2=OFF
- -DUSE_WOFF2=ON
- )
-
- # https://bugs.gentoo.org/761238
- append-cppflags -DNDEBUG
-
- WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
- optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
- optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
- optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
- optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
- optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
deleted file mode 100644
index a9d9664cd9d2..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1-r600.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby31 ruby32 ruby33"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
-# media-libs/mesa dep is for libgbm
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-# with GLX set, but that's a bit automagic too to fix
-# Softblocking <webkit-gtk-2.38:4 and <webkit-gtk-2.44:4.1 as since 2.44 this SLOT ships the WebKitWebDriver binary;
-# WebKitWebDriver is an automation tool for web developers, which lets one control the browser via WebDriver API - only one SLOT can ship it
-# TODO: There is build-time conditional depend on gtk-4.13.4 for using more efficient DmaBuf buffer type instead of EglImage, and gtk-4.13.7 for a11y support - ensure it at some point with a min dep
-# TODO: at-spi2-core (atspi-2.pc) is checked at build time, but not linked to in the gtk4 SLOT - is it an upstream check bug and only gtk-4.14 a11y support is used?
-RDEPEND="
- >=x11-libs/cairo-1.16.0[X?]
- >=media-libs/fontconfig-2.13.0:1.0
- >=media-libs/freetype-2.9.0:2
- >=dev-libs/libgcrypt-1.7.0:0=
- dev-libs/libtasn1:=
- >=gui-libs/gtk-4.6.0:4[aqua?,introspection?,wayland?,X?]
- >=media-libs/harfbuzz-1.4.2:=[icu(+)]
- >=dev-libs/icu-61.2:=
- media-libs/libjpeg-turbo:0=
- >=media-libs/libepoxy-1.5.4[egl(+)]
- >=net-libs/libsoup-3.0.8:3.0[introspection?]
- >=dev-libs/libxml2-2.8.0:2
- >=media-libs/libpng-1.4:0=
- dev-db/sqlite:3
- sys-libs/zlib:0
- media-libs/libwebp:=
- >=app-accessibility/at-spi2-core-2.46.0:2
-
- >=dev-libs/glib-2.70.0:2
- >=dev-libs/libxslt-1.1.7
- media-libs/woff2
- keyring? ( app-crypt/libsecret )
- introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
- x11-libs/libdrm
- media-libs/mesa
- spell? ( >=app-text/enchant-0.22:2 )
- gstreamer? (
- >=media-libs/gstreamer-1.20:1.0
- >=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
- media-libs/gst-plugins-base:1.0[opengl]
- >=media-plugins/gst-plugins-opus-1.20:1.0
- >=media-libs/gst-plugins-bad-1.20:1.0
- )
-
- X? ( x11-libs/libX11 )
-
- dev-libs/hyphen
- jpegxl? ( >=media-libs/libjxl-0.7.0:= )
- avif? ( >=media-libs/libavif-0.9.0:= )
- lcms? ( media-libs/lcms:2 )
-
- media-libs/libglvnd
- wayland? (
- >=dev-libs/wayland-1.20
- >=dev-libs/wayland-protocols-1.24
- )
-
- seccomp? (
- >=sys-apps/bubblewrap-0.3.1
- sys-libs/libseccomp
- sys-apps/xdg-dbus-proxy
- )
-
- systemd? ( sys-apps/systemd:= )
- gamepad? ( >=dev-libs/libmanette-0.2.4 )
- !<net-libs/webkit-gtk-2.38:4
- !<net-libs/webkit-gtk-2.44:4.1
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
- ${PYTHON_DEPS}
- ${RUBY_DEPS}
- >=app-accessibility/at-spi2-core-2.5.3
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=dev-util/gperf-3.0.1
- dev-util/unifdef
- >=sys-devel/bison-2.4.3
- || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
- sys-devel/gettext
- virtual/pkgconfig
-
- >=dev-lang/perl-5.10
- virtual/perl-Data-Dumper
- virtual/perl-Carp
- virtual/perl-JSON-PP
-
- wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] ; then
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
- check-reqs_pkg_pretend
- fi
-
- if ! test-flag-CXX -std=c++17 ; then
- die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
- fi
- fi
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- check-reqs_pkg_setup
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- gnome2_src_prepare
-
- # Upstream 2.44 branch commits up to aff53249f2d491d, includes a linking and GCC 12 fix
- eapply "${FILESDIR}"/${PV}-branch-patchset.patch
- # Fix USE=-jumbo-build compilation on arm64
- eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
- # Fix USE=-jumbo-build on all arches
- eapply "${FILESDIR}"/${PV}-non-unified-build-fixes.patch
- # Fix building on riscv, bug 933675
- eapply "${FILESDIR}"/${PV}-riscv.patch
-}
-
-src_configure() {
- # Respect CC, otherwise fails on prefix #395875
- tc-export CC
-
- # ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
- filter-lto
-
- # It does not compile on alpha without this in LDFLAGS
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Sigbuses on SPARC with mcpu and co., bug #???
- use sparc && filter-flags "-mvis"
-
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
- use ppc64 && append-flags "-mminimal-toc"
-
- # Try to use less memory, bug #469942 (see Fedora .spec for reference)
- append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-
- # Ruby situation is a bit complicated. See bug 513888
- local rubyimpl
- local ruby_interpreter=""
- local RUBY
- for rubyimpl in ${USE_RUBY}; do
- if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
- RUBY="$(type -P ${rubyimpl})"
- ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
- fi
- done
- # This will rarely occur. Only a couple of corner cases could lead us to
- # that failure. See bug 513888
- [[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
- # JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
- # so it doesn't respect RUBY_EXECUTABLE, bug #771744.
- sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
- # TODO: Check Web Audio support
- # should somehow let user select between them?
-
- local mycmakeargs=(
- -DPython_EXECUTABLE="${PYTHON}"
- ${ruby_interpreter}
- # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
- -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
- -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
- -DPORT=GTK
- # Source/cmake/WebKitFeatures.cmake
- -DENABLE_API_TESTS=OFF
- -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
- -DENABLE_GAMEPAD=$(usex gamepad)
- -DENABLE_MINIBROWSER=$(usex examples)
- -DENABLE_PDFJS=$(usex pdf)
- -DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
- -DENABLE_SPELLCHECK=$(usex spell)
- -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
- -DENABLE_VIDEO=$(usex gstreamer)
- -DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
- -DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
- -DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
- -DENABLE_WEBDRIVER=ON
- -DENABLE_WEBGL=ON
- -DENABLE_WEB_AUDIO=$(usex gstreamer)
- -DUSE_AVIF=$(usex avif)
- # Source/cmake/OptionsGTK.cmake
- -DENABLE_DOCUMENTATION=OFF
- -DENABLE_INTROSPECTION=$(usex introspection)
- -DENABLE_JOURNALD_LOG=$(usex systemd)
- -DENABLE_QUARTZ_TARGET=$(usex aqua)
- -DENABLE_WAYLAND_TARGET=$(usex wayland)
- -DENABLE_X11_TARGET=$(usex X)
- -DUSE_GBM=ON
- -DUSE_GTK4=ON # webkit2gtk-6.0
- -DUSE_JPEGXL=$(usex jpegxl)
- -DUSE_LCMS=$(usex lcms)
- -DUSE_LIBBACKTRACE=OFF
- -DUSE_LIBDRM=ON
- -DUSE_LIBHYPHEN=ON
- -DUSE_LIBSECRET=$(usex keyring)
- -DUSE_SOUP2=OFF
- -DUSE_WOFF2=ON
- )
-
- # https://bugs.gentoo.org/761238
- append-cppflags -DNDEBUG
-
- WK_USE_CCACHE=NO cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- insinto /usr/share/gtk-doc/html
- # This will install API docs specific to webkit2gtk-6.0
- doins -r "${S}"/Documentation/{jsc-glib,webkitgtk,webkitgtk-web-process-extension}-6.0
-}
-
-pkg_postinst() {
- optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
- optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
- optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
- optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
- optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
deleted file mode 100644
index 9ab93285e5cd..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{10..12} )
-USE_RUBY="ruby31 ruby32 ruby33"
-
-inherit check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="https://www.webkitgtk.org"
-SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-# Tests do not run when built from tarballs
-# https://bugs.webkit.org/show_bug.cgi?id=215986
-RESTRICT="test"
-
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Missing WebRTC support, but ENABLE_WEB_RTC is experimental upstream
-# media-libs/mesa dep is for libgbm
-# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
-# TODO: gst-plugins-base[X] is only needed when build configuration ends up
-# with GLX set, but that's a bit automagic too to fix
-RDEPEND="
- >=x11-libs/cairo-1.16.0[X?]
- >=media-libs/fontconfig-2.13.0:1.0
- >=media-libs/freetype-2.9.0:2
- >=dev-libs/libgcrypt-1.7.0:0=
- dev-libs/libtasn1:=
- >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
- >=media-libs/harfbuzz-1.4.2:=[icu(+)]
- >=dev-libs/icu-61.2:=
- media-libs/libjpeg-turbo:0=
- >=media-libs/libepoxy-1.5.4[egl(+)]
- >=net-libs/libsoup-2.54:2.4[introspection?]
- >=dev-libs/libxml2-2.8.0:2
- >=media-libs/libpng-1.4:0=
- dev-db/sqlite:3
- sys-libs/zlib:0
- media-libs/libwebp:=
- >=app-accessibility/at-spi2-core-2.46.0:2
-
- >=dev-libs/glib-2.70.0:2
- >=dev-libs/libxslt-1.1.7
- media-libs/woff2
- keyring? ( app-crypt/libsecret )
- introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
- x11-libs/libdrm
- media-libs/mesa
- spell? ( >=app-text/enchant-0.22:2 )
- gstreamer? (
- >=media-libs/gstreamer-1.20:1.0
- >=media-libs/gst-plugins-base-1.20:1.0[egl,X?]
- media-libs/gst-plugins-base:1.0[opengl]
- >=media-plugins/gst-plugins-opus-1.20:1.0
- >=media-libs/gst-plugins-bad-1.20:1.0
- )
-
- X? ( x11-libs/libX11 )
-
- dev-libs/hyphen
- jpegxl? ( >=media-libs/libjxl-0.7.0:= )
- avif? ( >=media-libs/libavif-0.9.0:= )
- lcms? ( media-libs/lcms:2 )
-
- media-libs/libglvnd
- wayland? (
- >=dev-libs/wayland-1.20
- >=dev-libs/wayland-protocols-1.24
- )
-
- seccomp? (
- >=sys-apps/bubblewrap-0.3.1
- sys-libs/libseccomp
- sys-apps/xdg-dbus-proxy
- )
-
- systemd? ( sys-apps/systemd:= )
- gamepad? ( >=dev-libs/libmanette-0.2.4 )
-"
-DEPEND="${RDEPEND}"
-# Need real bison, not yacc
-BDEPEND="
- ${PYTHON_DEPS}
- ${RUBY_DEPS}
- >=app-accessibility/at-spi2-core-2.5.3
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=dev-util/gperf-3.0.1
- dev-util/unifdef
- >=sys-devel/bison-2.4.3
- || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
- sys-devel/gettext
- virtual/pkgconfig
-
- >=dev-lang/perl-5.10
- virtual/perl-Data-Dumper
- virtual/perl-Carp
- virtual/perl-JSON-PP
-
- wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-# We cannot use PATCHES because src_prepare() calls cmake_src_prepare and
-# gnome2_src_prepare, and both apply ${PATCHES[@]}
-PATCHES=()
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] ; then
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
- check-reqs_pkg_pretend
- fi
-
- if ! test-flag-CXX -std=c++17 ; then
- die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
- fi
- fi
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- check-reqs_pkg_setup
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- gnome2_src_prepare
-
- # Upstream 2.44 branch commits up to aff53249f2d491d, includes a linking and GCC 12 fix
- eapply "${FILESDIR}"/${PV}-branch-patchset.patch
- # Fix USE=-jumbo-build compilation on arm64
- eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch
- # Fix USE=-jumbo-build on all arches
- eapply "${FILESDIR}"/${PV}-non-unified-build-fixes.patch
-}
-
-src_configure() {
- # Respect CC, otherwise fails on prefix #395875
- tc-export CC
-
- # ODR violations (bug #915230, https://bugs.webkit.org/show_bug.cgi?id=233007)
- filter-lto
-
- # It does not compile on alpha without this in LDFLAGS
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Sigbuses on SPARC with mcpu and co., bug #???
- use sparc && filter-flags "-mvis"
-
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
- use ppc64 && append-flags "-mminimal-toc"
-
- # Try to use less memory, bug #469942 (see Fedora .spec for reference)
- append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
-
- # Ruby situation is a bit complicated. See bug 513888
- local rubyimpl
- local ruby_interpreter=""
- local RUBY
- for rubyimpl in ${USE_RUBY}; do
- if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}(-)]"; then
- RUBY="$(type -P ${rubyimpl})"
- ruby_interpreter="-DRUBY_EXECUTABLE=${RUBY}"
- fi
- done
- # This will rarely occur. Only a couple of corner cases could lead us to
- # that failure. See bug 513888
- [[ -z ${ruby_interpreter} ]] && die "No suitable ruby interpreter found"
- # JavaScriptCore/Scripts/postprocess-asm invokes another Ruby script directly
- # so it doesn't respect RUBY_EXECUTABLE, bug #771744.
- sed -i -e "s:#!/usr/bin/env ruby:#!${RUBY}:" $(grep -rl "/usr/bin/env ruby" Source/JavaScriptCore || die) || die
-
- # TODO: Check Web Audio support
- # should somehow let user select between them?
-
- local mycmakeargs=(
- -DPython_EXECUTABLE="${PYTHON}"
- ${ruby_interpreter}
- # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
- -DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap
- -DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
- -DPORT=GTK
- # Source/cmake/WebKitFeatures.cmake
- -DENABLE_API_TESTS=OFF
- -DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
- -DENABLE_GAMEPAD=$(usex gamepad)
- -DENABLE_MINIBROWSER=$(usex examples)
- -DENABLE_PDFJS=$(usex pdf)
- -DENABLE_GEOLOCATION=ON # Runtime optional (talks over dbus service)
- -DENABLE_SPELLCHECK=$(usex spell)
- -DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
- -DENABLE_VIDEO=$(usex gstreamer)
- -DUSE_GSTREAMER_WEBRTC=$(usex gstreamer)
- -DUSE_GSTREAMER_TRANSCODER=$(usex gstreamer)
- -DENABLE_WEB_CODECS=$(usex gstreamer) # https://bugs.webkit.org/show_bug.cgi?id=269147
- -DENABLE_WEBDRIVER=OFF # Disable WebDriver for webkit2gtk-4.1 and use the webkit2gtk-6.0 one
- -DENABLE_WEBGL=ON
- -DENABLE_WEB_AUDIO=$(usex gstreamer)
- -DUSE_AVIF=$(usex avif)
- # Source/cmake/OptionsGTK.cmake
- -DENABLE_DOCUMENTATION=OFF
- -DENABLE_INTROSPECTION=$(usex introspection)
- -DENABLE_JOURNALD_LOG=$(usex systemd)
- -DENABLE_QUARTZ_TARGET=$(usex aqua)
- -DENABLE_WAYLAND_TARGET=$(usex wayland)
- -DENABLE_X11_TARGET=$(usex X)
- -DUSE_GBM=ON
- -DUSE_GTK4=OFF
- -DUSE_JPEGXL=$(usex jpegxl)
- -DUSE_LCMS=$(usex lcms)
- -DUSE_LIBBACKTRACE=OFF
- -DUSE_LIBDRM=ON
- -DUSE_LIBHYPHEN=ON
- -DUSE_LIBSECRET=$(usex keyring)
- -DUSE_SOUP2=ON
- -DUSE_WOFF2=ON
- )
-
- # https://bugs.gentoo.org/761238
- append-cppflags -DNDEBUG
-
- WK_USE_CCACHE=NO cmake_src_configure
-}
-
-pkg_postinst() {
- optfeature "geolocation service (used at runtime if available)" "app-misc/geoclue"
- optfeature "Common Multimedia codecs" "media-plugins/gst-plugins-meta"
- optfeature "VAAPI encoding support" "media-libs/gst-plugins-bad[vaapi]"
- optfeature "MPEG-DASH support" "media-plugins/gst-plugins-dash"
- optfeature "HTTP live streaming (HLS) support" "media-plugins/gst-plugins-hls"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild
index 7430151ef077..77ed6220696d 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r410.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2+ BSD"
SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild
index 253092a76ba6..97b056b6ff61 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4-r600.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2+ BSD"
SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild
index 6481f9002b02..bf59ee2d2456 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.44.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
REQUIRED_USE="|| ( aqua wayland X )"
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-21 20:52:03 +0000