gentoo auto-resync : 03:08:2022 - 14:01:21

3 files changed, 86 insertions, 1 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 16ff2c80132e..cc1a1e2fd09b 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,7 +1,8 @@
+AUX 2.36.5-fix-crash.patch 2636 BLAKE2B faaec5dcd7731553754bcfa5aa785d0b5969f6347872c3074b3c592739ca473f0e5928f92910ff314a8e1c4e1f1e0dd70c628d9d672ed807dc5198d638b88c8b SHA512 ae1acb301a049bd540e4b134a9b8957452fe530213037c01e770285ce5e93eda0df972c3011b9398545295e89e3827971de7b037ef5e0dc2b79dec96b7795c3c
 DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc4146b5a964d9a44966ff7d40e67f8743420c87f3c001f9299b2449f492401d86c02e55395e2db8938ff0e3bbb08790cb SHA512 dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692
 DIST webkitgtk-2.36.4.tar.xz 26598964 BLAKE2B 7c79c394bca756b09324afae013775404f62543ed093314ebb82a10dbbc2c7a22277792349a0d24fd95077c770627d24ab73183ba4a97d168556f991d7a6a682 SHA512 c5365c682ba4e8e6ad891638b5a82e74e38fa0867ce6c8e4e08a9dc15b862a6d3edc096a049e0711306972d6162d79fe90a0e76d8b395001798005e4488467f2
 DIST webkitgtk-2.36.5.tar.xz 26602060 BLAKE2B 4a450356bb5e142f8c5c9d27433183532b7d3a2e451032cd837bf8a12ba58bd997eb4f2c6ff5ab37891af8485efb5d57aa02321448a93b0864c2a25b3b194cf8 SHA512 71be328aae93f1454d74371c3a614aab15190d2abc7dd7d7a003004c2f35a19d610d2613e64292f21e472d5112cba865ef019fecc2b4066eb87368c6d363b545
 EBUILD webkit-gtk-2.36.3.ebuild 7409 BLAKE2B e2f941a57bb827f86ae95e98af0187b0a4a301402470165be293e03efd9cd96834866bf7c69eefe3369d26a7926afb6b5b46061362b166652dcf29e581f120c5 SHA512 3d6226815a55d0b67550c6a0a405f7f4442715c528ed653858b6152f61ac36db6c080e9eb44fc504d61830a84da56a265e6f6dd2abb38227d9ff752393bd2cc8
 EBUILD webkit-gtk-2.36.4.ebuild 7427 BLAKE2B 7ae6ba5a5657542bd4aa9ee4a4346f7dda2ec1e0e370292a2826d976eab629d4d437ba231c7ec68fd397a2203ed4dd20824ab512ab361e6d232f61c6faf9b626 SHA512 9dce5c9d7009b097febf480d6c61c7b22ba406bf07bb07c0e74f51bc9adb4e8f0ed0d3ccd4dffea5d7a91740342ddba016c4a4d1fc3ad3275d4f5b208c849249
-EBUILD webkit-gtk-2.36.5.ebuild 7431 BLAKE2B 448433c468ab5cd2ed5d7f3e052f884096f68b467c1a715d7e76cd0bebb070360ea6f9b448de55d38ef4249809ff330e3dd84ed79fb0c60ff68453a1f0e7984c SHA512 94decf9608f83c87d3d46bcbbf06659089e3518325b36610c2ee42d172064a868b23e9f5a6aca9b0e6661b819238eae4e231e64c67b5541fdcb201fc2fa4d882
+EBUILD webkit-gtk-2.36.5-r1.ebuild 7476 BLAKE2B f25508d5f10a0e015f968103383f3c04fdeb5728a606986f593ae668f6e8d5890f7e989178454ab3ad27e4308a06a4faf4c13a4bc2e7a2a21755f8d976014a49 SHA512 3f800792ffdb7cd06be7048c6c55c29e0eed7bbf9b8a03504fa5a0eec0077edaf3672e869177bad80cdf79357703cf3a1a0134ab9f06bab28f1eece509dec2ac
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/files/2.36.5-fix-crash.patch b/net-libs/webkit-gtk/files/2.36.5-fix-crash.patch
new file mode 100644
index 000000000000..0f676a942d06
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.36.5-fix-crash.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/863008
+https://bugs.webkit.org/show_bug.cgi?id=243401
+
+From a6277d4834cce0dea2f999d4c06ffa57abfbb82d Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Mon, 1 Aug 2022 14:07:04 -0700
+Subject: [PATCH] REGRESSION(252485@main): [GTK]
+ webkit_web_context_get_default() crashes in Eclipse since webkit-gtk v2.36.5,
+ v2.36.4 was fine https://bugs.webkit.org/show_bug.cgi?id=243401
+
+Reviewed by Adrian Perez de Castro.
+
+Turns out WebKit's "main thread" may not actually be the real main
+thread. This is OK as long as it matches the GTK "main thread," and as
+long as the application is careful to iterate the default main context
+only on the WebKit/GTK "main thread," as as long as the application does
+not ever attempt to use these libraries on any other thread.
+
+The motivation to do this is if the programming language controls the
+real thread 1, as is the case with Java, where the Java main thread that
+applications can use to run GTK and WebKit is apparently not the same as
+the real main thread that's running the JVM. These applications have no
+control over what their "main thread" is, and it seems unkind to break
+them.
+
+I've checked in with the GTK developers, and consensus is that this
+is actually expected to work, so let's not break it.
+
+* Source/WTF/wtf/generic/MainThreadGeneric.cpp:
+(WTF::initializeMainThreadPlatform):
+(WTF::isMainThread):
+
+Canonical link: https://commits.webkit.org/253010@main
+---
+ Source/WTF/wtf/generic/MainThreadGeneric.cpp | 13 ++-----------
+ 1 file changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/Source/WTF/wtf/generic/MainThreadGeneric.cpp b/Source/WTF/wtf/generic/MainThreadGeneric.cpp
+index 3a9208b0f9ab..b51e2e456047 100644
+--- a/Source/WTF/wtf/generic/MainThreadGeneric.cpp
++++ b/Source/WTF/wtf/generic/MainThreadGeneric.cpp
+@@ -31,29 +31,22 @@
+  */
+ 
+ #include "config.h"
+-#if !OS(LINUX)
+ #include <pthread.h>
+-#endif
+ #if HAVE(PTHREAD_NP_H)
+ #include <pthread_np.h>
+ #endif
+-#if OS(LINUX)
+-#include <sys/syscall.h>
+-#include <sys/types.h>
+-#include <unistd.h>
+-#endif
+ 
+ #include <wtf/RunLoop.h>
+ 
+ namespace WTF {
+ 
+-#if !HAVE(PTHREAD_MAIN_NP) && !OS(LINUX)
++#if !HAVE(PTHREAD_MAIN_NP)
+ static pthread_t mainThread;
+ #endif
+ 
+ void initializeMainThreadPlatform()
+ {
+-#if !HAVE(PTHREAD_MAIN_NP) && !OS(LINUX)
++#if !HAVE(PTHREAD_MAIN_NP)
+     mainThread = pthread_self();
+ #endif
+ }
+@@ -62,8 +55,6 @@ bool isMainThread()
+ {
+ #if HAVE(PTHREAD_MAIN_NP)
+     return pthread_main_np();
+-#elif OS(LINUX)
+-    return getpid() == static_cast<pid_t>(syscall(SYS_gettid));
+ #else
+     return pthread_equal(pthread_self(), mainThread);
+ #endif
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild
index ac5ee1a431b0..ad7b4de216cf 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.36.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.5-r1.ebuild
@@ -153,6 +153,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	eapply "${FILESDIR}"/${PV}-fix-crash.patch
+
 	cmake_src_prepare
 	gnome2_src_prepare
 }