2.36.6

3 files changed, 8 insertions, 92 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c8cea552c03..56741db3a601 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = webkit2gtk-imgpaste
 	pkgdesc = Web content engine for GTK
-	pkgver = 2.36.5
-	pkgrel = 3
+	pkgver = 2.36.6
+	pkgrel = 1
 	url = https://webkitgtk.org
 	arch = x86_64
 	license = custom
@@ -64,16 +64,14 @@ pkgbase = webkit2gtk-imgpaste
 	optdepends = gst-libav: nonfree media decoding
 	provides = webkit2gtk
 	conflicts = webkit2gtk
-	source = https://webkitgtk.org/releases/webkitgtk-2.36.5.tar.xz
-	source = https://webkitgtk.org/releases/webkitgtk-2.36.5.tar.xz.asc
-	source = https://github.com/WebKit/WebKit/commit/a6277d4834cce0dea2f999d4c06ffa57abfbb82d.patch
+	source = https://webkitgtk.org/releases/webkitgtk-2.36.6.tar.xz
+	source = https://webkitgtk.org/releases/webkitgtk-2.36.6.tar.xz.asc
 	source = PasteBoardGtk.patch
 	source = EnlargeObjectSize.patch
 	validpgpkeys = D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3
 	validpgpkeys = 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B
-	sha256sums = d5532fa884c943dc48f1911473dd663aba407a3b35caa7b04bac1419b41e5908
+	sha256sums = 1193bc821946336776f0dfa5e0dca5651f1e57157eda12da4721d2441f24a61a
 	sha256sums = SKIP
-	sha256sums = ef40fe4f989103d3e81b8a5885bcf78c7cabe7fab6160f2404aaae0daf6f7951
 	sha256sums = 909eb44783d093c89400494a8b57eee3a5b926e1a5b5f1e922e1dff1a6dc3c7b
 	sha256sums = a5d2149d55190a15bc806bfddd85f43b6c714722b04ce0c1e476f9cb58985bac
 
diff --git a/PKGBUILD b/PKGBUILD
index 64d82c5a5f00..c89b8ed8fb0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Eric Bélanger <eric@archlinux.org>
 
 pkgname=webkit2gtk-imgpaste
-pkgver=2.36.5
-pkgrel=3
+pkgver=2.36.6
+pkgrel=1
 pkgdesc="Web content engine for GTK"
 url="https://webkitgtk.org"
 arch=(x86_64)
@@ -24,12 +24,10 @@ optdepends=('geoclue: Geolocation support'
             'gst-plugins-bad: media decoding'
             'gst-libav: nonfree media decoding')
 source=($url/releases/webkitgtk-$pkgver.tar.xz{,.asc}
-	https://github.com/WebKit/WebKit/commit/a6277d4834cce0dea2f999d4c06ffa57abfbb82d.patch
         PasteBoardGtk.patch
         EnlargeObjectSize.patch)
-sha256sums=('d5532fa884c943dc48f1911473dd663aba407a3b35caa7b04bac1419b41e5908'
+sha256sums=('1193bc821946336776f0dfa5e0dca5651f1e57157eda12da4721d2441f24a61a'
             'SKIP'
-            'ef40fe4f989103d3e81b8a5885bcf78c7cabe7fab6160f2404aaae0daf6f7951'
             '909eb44783d093c89400494a8b57eee3a5b926e1a5b5f1e922e1dff1a6dc3c7b'
             'a5d2149d55190a15bc806bfddd85f43b6c714722b04ce0c1e476f9cb58985bac')
 validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3'  # Carlos Garcia Campos <cgarcia@igalia.com>
@@ -37,7 +35,6 @@ validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3'  # Carlos Garcia Campos
 
 prepare() {
   cd webkitgtk-$pkgver
-  patch --forward --strip=1 --input="${srcdir}/a6277d4834cce0dea2f999d4c06ffa57abfbb82d.patch"
   patch --forward --strip=0 --input="${srcdir}/PasteBoardGtk.patch"
   patch --forward --strip=0 --input="${srcdir}/EnlargeObjectSize.patch"
 }
diff --git a/a6277d4834cce0dea2f999d4c06ffa57abfbb82d.patch b/a6277d4834cce0dea2f999d4c06ffa57abfbb82d.patch
deleted file mode 100644
index 2dc2c89a06e7..000000000000
--- a/a6277d4834cce0dea2f999d4c06ffa57abfbb82d.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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