[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
Date: Tue, 25 Apr 2023 21:38:07 +0000 (UTC)	[thread overview]
Message-ID: <1682458683.4e80633488edc854dd7c44bf7d3b3dd951d23805.mattst88@gentoo> (raw)

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.olmstead@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
 }

next             reply	other threads:[~2023-04-25 21:38 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-25 21:38 Matt Turner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-06 11:18 [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/ Sam James
2024-10-09 15:09 Michael Orlitzky
2024-06-25 16:45 Jakov Smolić
2024-04-20 11:42 Mart Raudsepp
2024-02-23 19:07 Sam James
2023-08-09 18:07 Matt Turner
2023-07-16 14:38 Matt Turner
2023-04-22  3:08 Matt Turner
2023-01-30  4:01 Sam James
2022-08-02 20:17 Matt Turner
2022-05-13 12:27 Matt Turner
2022-01-18 21:39 Mart Raudsepp
2022-01-05 16:22 Mart Raudsepp
2022-01-02 22:46 Mart Raudsepp
2021-05-31  2:00 Matt Turner
2021-05-12 22:00 Matt Turner
2020-11-27 20:54 Mart Raudsepp
2020-07-29 14:09 Mart Raudsepp
2020-07-19  6:00 Mart Raudsepp
2020-07-11 13:34 Mart Raudsepp
2020-01-31 19:19 Mart Raudsepp
2020-01-19 18:49 Mart Raudsepp
2019-11-23 19:28 Matt Turner
2019-10-29 22:22 Andreas Sturmlechner
2018-07-25 16:47 Mart Raudsepp
2017-10-29 22:11 Mart Raudsepp
2017-04-17  8:10 Mart Raudsepp
2016-08-27 20:20 Sergei Trofimovich
2015-08-25  0:45 Alexandre Rostovtsev

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:feac0335407 dfblob:c76820e446b dfblob:9e6da0c3793
dfblob:5d49417623d dfblob:234c21d774d dfblob:7cf6812b9cc
dfblob:9e732b26cc2 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/" )
	(help)

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=1682458683.4e80633488edc854dd7c44bf7d3b3dd951d23805.mattst88@gentoo \
    --to=mattst88@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