commit: 4e80633488edc854dd7c44bf7d3b3dd951d23805 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue Apr 25 21:37:44 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Apr 25 21:38:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e806334
net-libs/webkit-gtk: Add patch to fix build with USE=-gstreamer Closes: https://bugs.gentoo.org/904826 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> ...-262461-main-b36decf27ea9-.-https-bugs.we.patch | 37 ++++++++++++++++++++++ net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild | 1 + net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild | 1 + 4 files changed, 40 insertions(+) diff --git a/net-libs/webkit-gtk/files/2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch b/net-libs/webkit-gtk/files/2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch new file mode 100644 index 000000000000..feac03354071 --- /dev/null +++ b/net-libs/webkit-gtk/files/2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch @@ -0,0 +1,37 @@ +From cfa5e2a8dab746c14c2e5876a48ff0d66cdf7486 Mon Sep 17 00:00:00 2001 +From: Don Olmstead <don.olmst...@sony.com> +Date: Fri, 31 Mar 2023 19:46:07 -0700 +Subject: [PATCH] Cherry-pick 262461@main (b36decf27ea9). + https://bugs.webkit.org/show_bug.cgi?id=254852 + + Fix !ENABLE(WEB_AUDIO) build after 262451@main + https://bugs.webkit.org/show_bug.cgi?id=254852 + + Unreviewed build fix. + + Add !ENABLE(WEB_AUDIO) guard. + + * Source/WebCore/page/MemoryRelease.cpp: + + Canonical link: https://commits.webkit.org/262461@main +--- + Source/WebCore/page/MemoryRelease.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/WebCore/page/MemoryRelease.cpp b/Source/WebCore/page/MemoryRelease.cpp +index d2d5009785bc..aa0c8cff9571 100644 +--- a/Source/WebCore/page/MemoryRelease.cpp ++++ b/Source/WebCore/page/MemoryRelease.cpp +@@ -103,7 +103,9 @@ static void releaseCriticalMemory(Synchronous synchronous, MaintainBackForwardCa + } + + CSSValuePool::singleton().drain(); ++#if ENABLE(WEB_AUDIO) + HRTFElevation::clearCache(); ++#endif + + Page::forEachPage([](auto& page) { + page.cookieJar().clearCache(); +-- +2.39.2 + diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild index c76820e446b6..9e6da0c3793d 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r410.ebuild @@ -144,6 +144,7 @@ pkg_setup() { src_prepare() { cmake_src_prepare gnome2_src_prepare + eapply "${FILESDIR}/${PV}"-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch eapply "${FILESDIR}/${PV}"-gcc-13.patch eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch } diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild index 5d49417623dd..234c21d774d3 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1-r600.ebuild @@ -145,6 +145,7 @@ pkg_setup() { src_prepare() { cmake_src_prepare gnome2_src_prepare + eapply "${FILESDIR}/${PV}"-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch eapply "${FILESDIR}/${PV}"-gcc-13.patch eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch } diff --git a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild index 7cf6812b9cc8..9e732b26cc20 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.40.1.ebuild @@ -142,6 +142,7 @@ pkg_setup() { src_prepare() { cmake_src_prepare gnome2_src_prepare + eapply "${FILESDIR}/${PV}"-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch eapply "${FILESDIR}/${PV}"-gcc-13.patch eapply "${FILESDIR}"/2.40.0-respect-RUBY.patch }
