From 236afd45443e8328ab3b723922fe921078f9bc82 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Tue, 9 Aug 2022 09:37:00 -0500
Subject: [PATCH] Update to 2.36.6

  Related: #2061996
---
 .gitignore           |  2 ++
 is-main-thread.patch | 60 --------------------------------------------
 sources              |  4 +--
 webkit2gtk3.spec     | 11 ++++----
 4 files changed, 10 insertions(+), 67 deletions(-)
 delete mode 100644 is-main-thread.patch

diff --git a/.gitignore b/.gitignore
index 6b28bf7..7c6941b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,5 @@
 /webkitgtk-2.36.4.tar.xz.asc
 /webkitgtk-2.36.5.tar.xz
 /webkitgtk-2.36.5.tar.xz.asc
+/webkitgtk-2.36.6.tar.xz
+/webkitgtk-2.36.6.tar.xz.asc
diff --git a/is-main-thread.patch b/is-main-thread.patch
deleted file mode 100644
index 995ffe7..0000000
--- a/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 b/sources
index 36ddd32..24b40d0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.36.5.tar.xz) = 71be328aae93f1454d74371c3a614aab15190d2abc7dd7d7a003004c2f35a19d610d2613e64292f21e472d5112cba865ef019fecc2b4066eb87368c6d363b545
-SHA512 (webkitgtk-2.36.5.tar.xz.asc) = 7566fdfa20b31c2462f715a250fe0e9792ec6156a2373aa5710198661bc1ca51c8fbb48ee51019bca7c37e9a59949661a9ad8c6c3c22e71dd20b22929c836de3
+SHA512 (webkitgtk-2.36.6.tar.xz) = 21e91d7b9a4af3b6c7eb7a8dd9fbbbd82c14d01a5cd6734c9476bcc6b81007dc622867f3c6cb1e5531a16c5abfe208f8540ca0a182fa02e274b46ebc4f9dd0d0
+SHA512 (webkitgtk-2.36.6.tar.xz.asc) = 61e6c71034a62b1db74309a58b5cc1c62d4fe7a67b7e0140bfee6a9d57165aa7dc2ed43db0dcada25a33a1e2c3db723f3ab6ffc150bc2cddb8a2e8a365f15f52
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index a2650e3..bae2c2c 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -16,8 +16,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
@@ -35,9 +35,6 @@ Source2:        webkitgtk-keys.gpg
 Patch0:         aarch64-page-size.patch
 %endif
 
-# https://bugs.webkit.org/show_bug.cgi?id=243401
-Patch1:         is-main-thread.patch
-
 BuildRequires:  bison
 BuildRequires:  bubblewrap
 BuildRequires:  cmake
@@ -323,6 +320,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: #2061996
+
 * Tue Aug 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.5-2
 - Fix Eclipse after update to 2.36.5
   Related: #2061996