gentoo auto-resync : 26:04:2023 - 00:13:39

5 files changed, 44 insertions, 3 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 275ab9226c35..63451552e5a9 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,6 +1,7 @@
 AUX 2.38.3-gcc-13.patch 775 BLAKE2B 53d5c23f612ec6d9cb96f5c6d33e1a029120a2ca82d5e3833f910cf637cfe9cda0404f8bfd06601bbb04c36fefd77a1017ec764adba12b3fda0b3f6eed36168e SHA512 c83a769456c02991309c97cb9cb88e0e6335a22cf2c0fd30c3565740c9de316bb5c0e44768485193e28ec692ba3f0f0c0bb01c0e5ab62167a0540c8b1b1e8916
 AUX 2.38.5-gcc-13.patch 1128 BLAKE2B 1ca6050cda18720060a90eedba3561d12b4af9d19093effef469a20ecaa1040cd5634621b63962e8a430a02d18800913a3af35e51b424c37cc233640f306f6ed SHA512 f83c027e015888f7852e86f4266a8db9a7dc94cbda82c0ded1e38a0306a047e02a5a4993c9573e6e1617aaaebb3830206336b01863d726cfa685415e689f1104
 AUX 2.40.0-respect-RUBY.patch 1447 BLAKE2B 2212d15e50362004349245ee75285d96951d2ca8d15a30b8a4b6707bea93ea0e12a5993ec88848085e4ec71ac835b5d87a18f26240e014a4cf3812ef2c8096f9 SHA512 430bad9af15922cb9e4b879694a5759f8e30c56b75b7d90d91ef96dabb94ae023dd80a87d436bef3d13bb3a0c7b971af9639f654a587886413e4ed5f355ccb51
+AUX 2.40.1-Cherry-pick-262461-main-b36decf27ea9-.-https-bugs.we.patch 1140 BLAKE2B 55fcb2cbcad9fd62f77b5b00b1b85641fd3e99558d0729e3b42c2070d760db9ea5059d04303d8abfefdf2a9f554ca81ab9362c6f3a4a0730b1b1aeccfff468bc SHA512 02de018aed6fead34522febb04709aa347636c5cc7e344628249c4a9d81d9add49c6f844d0468a088781a9929adedd74cb1d0a921d01eb4f7841ad14994f7464
 AUX 2.40.1-gcc-13.patch 850 BLAKE2B fb972f818990265d8640d1c13b4bbb0eee10c81a023feb551e9bba40172564ee10167bec64b7684af564c96e43c5002d24ec3830717df7fd72532dd0d9bd65c5 SHA512 57f37285e295e0e74d7704564fc85e7b5857d938a88f5ab53742e818151125b60c4e76e0d2eae185294795de3b5e8a1c6af4606110bb4f1a3a726bf5ac1236db
 DIST webkitgtk-2.38.5.tar.xz 33011600 BLAKE2B 0dba732c18b7f21602b9f834866d137b6be582adc36f91775e838f99a6ee89216773ab641be62a0fd0834bac8adb45d315a2be9caf19551484a8b95c22797d46 SHA512 9038892910e95d3b7819396c9071b59ee51eadd6cad62130fdd4e02d3f5187b7a2986c5939a378190e14059149f2db0a0b57feb23ac44f5ea764c160e6181eef
 DIST webkitgtk-2.40.0.tar.xz 40042140 BLAKE2B 4f26d893da99c7aed18594a844b1f91e32178a1bdd236e0cdd21683ed095ab2196f37c13f749e69b22b72146b98fca2a27778948aabde336d17c4d40dcf0cdc1 SHA512 550dafb31d71edf984d6b7636366f839d31f6b244b87f83c6efe7af17efe3f2f63268d2c39a6a3c474afadf2b30df868efaefcf38197b30cc6b11c63de7d2ddc
@@ -11,7 +12,7 @@ EBUILD webkit-gtk-2.38.5.ebuild 8161 BLAKE2B c63161efe9f5fca1c49df82bd0ab91ff404
 EBUILD webkit-gtk-2.40.0-r410.ebuild 7968 BLAKE2B 7feabe7b47953451678265966b0a27ef9da976b63e4321fe8e03c29ea62f025dc2e87bd24f8d7585e825216b80b60147b9a5f53e2e09e7d9b40d5de0e234b59d SHA512 42a54770d9aa43fe6e95d065c3859f64e6a7248a49586a0a75adfe2ba933b954318b432087a204d00b1695ee3d4ad6d751facb9aa16a4a34d15122bc762b40fb
 EBUILD webkit-gtk-2.40.0-r600.ebuild 7847 BLAKE2B 9326ab947484e5ab88a732cd74ad550a46acee5e2502f3abba354bb2649409572249f577866f28433541e08f859643021f9ec6a7a5bac09ba1e2008e96aed360 SHA512 616d3cab637dca93b32d9a25eb6ed0c9e4fe3cc55125b620434d11230ae19e678c307f5e088f7908d1d311dea8a76115cc28a38879dff4a7a5ff4c32881523cd
 EBUILD webkit-gtk-2.40.0.ebuild 7694 BLAKE2B ad3fc0dce3a94a6915f5528f1a4dfedef23dd0ef289a6c6018026a163074db92eef94532a64a4e15921644ac4cb545bf055cf0f157bead62e13f52d1b042dca3 SHA512 f68e6499c666c90b268e875d03221d84deeaba118c177aebc3c7e9bd7486cea34eab872b00c6850f00140da94a26b676837e037c47c5d89d329254ec623a3bc5
-EBUILD webkit-gtk-2.40.1-r410.ebuild 7967 BLAKE2B ccc666de426bc9d15fdc8bc9e8f20afa5d8ce022fa11722b4939a5428f0e4fa287667d96a75db60e2c3bcfedf68e50f38f120aafb3d3f4464ad35b95165a6bbf SHA512 83b1b96647c1f3edd3f6db3abf28aa666ceb8cf7c67a29c141edd571063bfa011d9dbca021918b43983957207d4a1d2db784aedb4743d3b961ca7a2f3e2ea460
-EBUILD webkit-gtk-2.40.1-r600.ebuild 7846 BLAKE2B ed0dc07d43ba19631b4592da0074a45ea13868cd36415d6e4ced3daed227e0d0575022d55ccd93f2b74633ffcf7beef61b85b0d3c4ab9cf45f1cd040dedab2de SHA512 e289dda832b07394ce6124cc6e905a3f363c6110b43cf895300dd462d986e12171101e086d0938bb466278b4342ddce592e74682ca95086fd3dae70ba4ec1d2c
-EBUILD webkit-gtk-2.40.1.ebuild 7693 BLAKE2B 7df3fe50a7455535d60961ad3594ad8593b250fe6c65b08ab8555fdecfae3f2622a2b448ee291fd3b210c8d82edb21c94de329e8e9773f76ba10f1ab9aff2431 SHA512 44686fc985972b2e7da830862fd68976f094e2f233cb58a19c71a864187627ca91dfe36df41294c5dc3bef6dc7501c47ad757bbf26378026efbbfdbfc5efe7a8
+EBUILD webkit-gtk-2.40.1-r410.ebuild 8054 BLAKE2B e472663e34dd22160df81125bd92386f0df2136d5990bc68ac80abd3faacdb4ceba70a8c4bc827996d2923849810e22197db9d0465722706ac5a4879d33944b0 SHA512 9aa4ef02dea0210dfd3dced3a646a4bd728fd9f230c343b75656025799c03ff316a0ec1118046391a3b8771d0fca833ff60fce9a3ce312995b6f4b8452db5469
+EBUILD webkit-gtk-2.40.1-r600.ebuild 7933 BLAKE2B 5bbb0fe49568164e5daca614706a761374b79fdd17bef5ee40503bf1edb49738c74748d93c8f9d784e9dd668d94913d565d271dd1522a78b522c917fd904cf29 SHA512 365ee319580e8b9388225646b9e7cf88e28c648d38964468a25ddc8b3a6c246b4a4f79404d7720cd2efc1658a80323203b8183b36b15826d1abc21f7fa8c685c
+EBUILD webkit-gtk-2.40.1.ebuild 7780 BLAKE2B 266b883adf9080d8f3db5b34a5fae97c39e5d81d07b78ddc0b2a468aee0d7f71359aac51731e4abc3f222ee4507b35edc832c75148349199542d455ed449e52c SHA512 21c5e1b52527b70eb5bee06fa39b7024654159da07b53fd73675cdd28074e0a70fe8a0f0754e1fe56a8236f976f20accd0c48e96fdc0087c079a695c97d2d861
 MISC metadata.xml 756 BLAKE2B ac278b1ed9ad7d7dcce220e686ef4c67c79f7d4c25e43e0fedaad14925eb03c74140e49a4e86d2146d6d467f14a737fb2ff1e90b506ab4d43b79d3462d58cb24 SHA512 584ce6c8dc66e3e3b3677dbffe8b2a58bb81146f3dc8eaf830597781f03580e0b94620322834b6e558ac9fcb06b3eda02645803f63d78e88104ecc0950c6f369
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
 }