From 399a8034693ec5045c7abc7595831d4a96c243d2 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 11 2022 18:17:46 +0000
Subject: import webkit2gtk3-2.36.6-1.el8


---

diff --git a/.gitignore b/.gitignore
index 827efa4..8d10beb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/webkitgtk-2.36.5.tar.xz
+SOURCES/webkitgtk-2.36.6.tar.xz
 SOURCES/webkitgtk-keys.gpg
diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata
index 03ae6fb..42d0f1f 100644
--- a/.webkit2gtk3.metadata
+++ b/.webkit2gtk3.metadata
@@ -1,2 +1,2 @@
-49ff8873500a2ce82bad8879095277bb4dfd21de SOURCES/webkitgtk-2.36.5.tar.xz
+e4237eba5a7c6ca1da8aca9f2cd9576b9d8d1817 SOURCES/webkitgtk-2.36.6.tar.xz
 cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg
diff --git a/SOURCES/is-main-thread.patch b/SOURCES/is-main-thread.patch
deleted file mode 100644
index 995ffe7..0000000
--- a/SOURCES/is-main-thread.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 336ebea6d24e8ddda8c33a91c8cd039a7ae8326f Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@redhat.com>
-Date: Mon, 1 Aug 2022 11:45:42 -0500
-Subject: [PATCH] Revert changes to isMainThread
-
-This introduced a regression:
-
-https://bugs.webkit.org/show_bug.cgi?id=243401
----
- 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
--- 
-2.36.1
-
diff --git a/SOURCES/webkitgtk-2.36.5.tar.xz.asc b/SOURCES/webkitgtk-2.36.5.tar.xz.asc
deleted file mode 100644
index d6310d2..0000000
--- a/SOURCES/webkitgtk-2.36.5.tar.xz.asc
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYuKrZAAKCRCRxVnb5MkS
-O8WQAJ9AdXVqeTc2nhRin4nmVDPsaLOE6gCfZ1f4xERuOaoqnywbvcpcOaOu+Uo=
-=GsLz
------END PGP SIGNATURE-----
diff --git a/SOURCES/webkitgtk-2.36.6.tar.xz.asc b/SOURCES/webkitgtk-2.36.6.tar.xz.asc
new file mode 100644
index 0000000..b9f3efb
--- /dev/null
+++ b/SOURCES/webkitgtk-2.36.6.tar.xz.asc
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYu+UEAAKCRCRxVnb5MkS
+O8OXAJ4wjsTvAGeQAMhYrs2wHddyGaEwpwCfQaQ9ed2XNz5U0aJYigHl7RdaVsM=
+=OtFA
+-----END PGP SIGNATURE-----
diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec
index fc11859..37ae213 100644
--- a/SPECS/webkit2gtk3.spec
+++ b/SPECS/webkit2gtk3.spec
@@ -11,8 +11,8 @@
 %bcond_without docs
 
 Name:           webkit2gtk3
-Version:        2.36.5
-Release:        2%{?dist}
+Version:        2.36.6
+Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
@@ -34,9 +34,6 @@ Patch1:         aarch64-page-size.patch
 # https://bugs.webkit.org/show_bug.cgi?id=235367
 Patch2:         icu60.patch
 
-# https://bugs.webkit.org/show_bug.cgi?id=243401bxb
-Patch3:         is-main-thread.patch
-
 BuildRequires:  bison
 BuildRequires:  cmake
 BuildRequires:  flex
@@ -306,6 +303,10 @@ export NINJA_STATUS="[%f/%t][%e] "
 %endif
 
 %changelog
+* Tue Aug 09 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.6-1
+- Update to 2.36.6
+  Related: #2061994
+
 * Tue Aug 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.5-2
 - Fix Eclipse after update to 2.36.5
   Related: #2061994