Auto sync2gitlab import of webkit2gtk3-2.36.6-1.el8.src.rpm

This commit is contained in:
CentOS Sources 2022-08-11 18:17:59 +00:00
parent fa02d2d9b9
commit 63ad78ca19
6 changed files with 14 additions and 72 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/webkitgtk-2.36.1.tar.xz
/webkitgtk-2.36.3.tar.xz
/webkitgtk-2.36.5.tar.xz
/webkitgtk-2.36.6.tar.xz

View File

@ -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

View File

@ -1,2 +1,2 @@
SHA512 (webkitgtk-2.36.5.tar.xz) = 71be328aae93f1454d74371c3a614aab15190d2abc7dd7d7a003004c2f35a19d610d2613e64292f21e472d5112cba865ef019fecc2b4066eb87368c6d363b545
SHA512 (webkitgtk-2.36.6.tar.xz) = 21e91d7b9a4af3b6c7eb7a8dd9fbbbd82c14d01a5cd6734c9476bcc6b81007dc622867f3c6cb1e5531a16c5abfe208f8540ca0a182fa02e274b46ebc4f9dd0d0
SHA512 (webkitgtk-keys.gpg) = 0270af23e1b5a9c1d86899e7feed18481e0fa4a481abd076eae96b800492a84db2dfc0905f8b9b48a419c6f387c60f23caa497a410a041c13015f6275fe68785

View File

@ -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

View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYuKrZAAKCRCRxVnb5MkS
O8WQAJ9AdXVqeTc2nhRin4nmVDPsaLOE6gCfZ1f4xERuOaoqnywbvcpcOaOu+Uo=
=GsLz
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYu+UEAAKCRCRxVnb5MkS
O8OXAJ4wjsTvAGeQAMhYrs2wHddyGaEwpwCfQaQ9ed2XNz5U0aJYigHl7RdaVsM=
=OtFA
-----END PGP SIGNATURE-----