Update to 2.40.3

Related: #2176270
This commit is contained in:
Michael Catanzaro 2023-06-28 10:15:01 -05:00
parent ae46f03de5
commit ddd8ababc8
4 changed files with 9 additions and 19 deletions

2
.gitignore vendored
View File

@ -119,3 +119,5 @@
/webkitgtk-2.40.1.tar.xz.asc
/webkitgtk-2.40.2.tar.xz
/webkitgtk-2.40.2.tar.xz.asc
/webkitgtk-2.40.3.tar.xz
/webkitgtk-2.40.3.tar.xz.asc

View File

@ -1,13 +0,0 @@
diff --git a/Source/WTF/wtf/glib/Sandbox.cpp b/Source/WTF/wtf/glib/Sandbox.cpp
index 9b07bb8cb5a9b..a8169511fe851 100644
--- a/Source/WTF/wtf/glib/Sandbox.cpp
+++ b/Source/WTF/wtf/glib/Sandbox.cpp
@@ -58,7 +58,7 @@ bool isInsideUnsupportedContainer()
int waitStatus = 0;
gboolean spawnSucceeded = g_spawn_sync(nullptr, const_cast<char**>(bwrapArgs), nullptr,
G_SPAWN_STDERR_TO_DEV_NULL, nullptr, nullptr, nullptr, nullptr, &waitStatus, nullptr);
- supportedContainer = spawnSucceeded && g_spawn_check_wait_status(waitStatus, nullptr);
+ supportedContainer = spawnSucceeded && g_spawn_check_exit_status(waitStatus, nullptr);
if (!supportedContainer)
WTFLogAlways("Bubblewrap does not work inside of this container, sandboxing will be disabled.");
}

View File

@ -1,2 +1,2 @@
SHA512 (webkitgtk-2.40.2.tar.xz) = 2fea73faffe171845f3710995bb27eb7350aa9ba7b513e7f0fc163c09fc63d73112a55dbc010af67e422c59baa9bfc85018f470a0255e43eb17aae465946eef7
SHA512 (webkitgtk-2.40.2.tar.xz.asc) = 44fbf8a08adf7de288ad344d4fb1eb4865e535666006f102ba20e43a0e7152d0a2bd2b62b05b39b3b819ea01864864e772c1d3417a11ecbd99840f7b6c7186a1
SHA512 (webkitgtk-2.40.3.tar.xz) = 2b10d36427c6cf44c66bb9ddb166363dfc34e23c9b6095eb457d61514298103487a7e80096ead9e653da1b4c0db42613c3a83aa28b19298ec62f50da289eb42e
SHA512 (webkitgtk-2.40.3.tar.xz.asc) = 13b0cd6e6fb9555e138d8933272557548438693ae2e4330510d90a69965c12c3d2ba630b913fd630d5fb7d563256fb9ba795c5ca1d82648a55592f7af23cd0ab

View File

@ -11,7 +11,7 @@
%endif
Name: webkit2gtk3
Version: 2.40.2
Version: 2.40.3
Release: 1%{?dist}
Summary: GTK Web content engine library
@ -24,9 +24,6 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
Source2: webkitgtk-keys.gpg
# https://github.com/WebKit/WebKit/pull/14498
Patch0: glib-dep.patch
BuildRequires: bison
BuildRequires: bubblewrap
BuildRequires: cmake
@ -293,6 +290,10 @@ export NINJA_STATUS="[%f/%t][%e] "
%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
%changelog
* Wed Jun 28 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.40.3-1
- Update to 2.40.3
Related: #2176270
* Tue May 30 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.40.2-1
- Update to 2.40.2
Related: #2176270