From f8f66dd3fc22d09df4a323763392de25ac654ff5 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 05 2022 10:16:09 +0000
Subject: import webkit2gtk3-2.36.5-2.el8


---

diff --git a/.gitignore b/.gitignore
index b2ca0ea..827efa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/webkitgtk-2.36.3.tar.xz
+SOURCES/webkitgtk-2.36.5.tar.xz
 SOURCES/webkitgtk-keys.gpg
diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata
index 4808332..03ae6fb 100644
--- a/.webkit2gtk3.metadata
+++ b/.webkit2gtk3.metadata
@@ -1,2 +1,2 @@
-59ee6ee820be360ad57391870fa158064091c525 SOURCES/webkitgtk-2.36.3.tar.xz
+49ff8873500a2ce82bad8879095277bb4dfd21de SOURCES/webkitgtk-2.36.5.tar.xz
 cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg
diff --git a/SOURCES/is-main-thread.patch b/SOURCES/is-main-thread.patch
new file mode 100644
index 0000000..995ffe7
--- /dev/null
+++ b/SOURCES/is-main-thread.patch
@@ -0,0 +1,60 @@
+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.3.tar.xz.asc b/SOURCES/webkitgtk-2.36.3.tar.xz.asc
deleted file mode 100644
index 6dc431e..0000000
--- a/SOURCES/webkitgtk-2.36.3.tar.xz.asc
+++ /dev/null
@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYpHpvAAKCRCRxVnb5MkS
-O27PAJ9ptAQKzmWX16VWJ1yyn/CaHwKJ8QCfV5gesH/nXmV7IsZn5vv+jDixo58=
-=AWMS
------END PGP SIGNATURE-----
diff --git a/SOURCES/webkitgtk-2.36.5.tar.xz.asc b/SOURCES/webkitgtk-2.36.5.tar.xz.asc
new file mode 100644
index 0000000..d6310d2
--- /dev/null
+++ b/SOURCES/webkitgtk-2.36.5.tar.xz.asc
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYuKrZAAKCRCRxVnb5MkS
+O8WQAJ9AdXVqeTc2nhRin4nmVDPsaLOE6gCfZ1f4xERuOaoqnywbvcpcOaOu+Uo=
+=GsLz
+-----END PGP SIGNATURE-----
diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec
index e1c1580..fc11859 100644
--- a/SPECS/webkit2gtk3.spec
+++ b/SPECS/webkit2gtk3.spec
@@ -11,8 +11,8 @@
 %bcond_without docs
 
 Name:           webkit2gtk3
-Version:        2.36.3
-Release:        1%{?dist}
+Version:        2.36.5
+Release:        2%{?dist}
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
@@ -34,6 +34,9 @@ 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
@@ -45,9 +48,9 @@ BuildRequires:  gtk-doc
 BuildRequires:  hyphen-devel
 BuildRequires:  libatomic
 BuildRequires:  ninja-build
-BuildRequires:  perl-File-Copy-Recursive
-BuildRequires:  perl-JSON-PP
-BuildRequires:  perl-Switch
+BuildRequires:  perl(English)
+BuildRequires:  perl(FindBin)
+BuildRequires:  perl(JSON::PP)
 BuildRequires:  python3
 BuildRequires:  ruby
 BuildRequires:  rubygem-json
@@ -303,10 +306,23 @@ export NINJA_STATUS="[%f/%t][%e] "
 %endif
 
 %changelog
+* Tue Aug 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.5-2
+- Fix Eclipse after update to 2.36.5
+  Related: #2061994
+
+* Thu Jul 28 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.5-1
+- Update to 2.36.5
+  Related: #2061994
+  Resolves: #2099334
+
+* Tue Jul 05 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.4-1
+- Update to 2.36.4
+  Related: #2061994
+
 * Thu Jun 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.3-1
 - Update to 2.36.3
 - Related: #2061994
-- Resolves: #2075492
+- Resolves: #2092748
 
 * Wed May 18 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.2-1
 - Update to 2.36.2