diff --git a/.gitignore b/.gitignore index f738076..4d9bf91 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,5 @@ /webkitgtk-2.40.0.tar.xz.asc /webkitgtk-2.40.1.tar.xz /webkitgtk-2.40.1.tar.xz.asc +/webkitgtk-2.40.2.tar.xz +/webkitgtk-2.40.2.tar.xz.asc diff --git a/egl-cast.patch b/egl-cast.patch deleted file mode 100644 index fa2f4e3..0000000 --- a/egl-cast.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/WebCore/platform/graphics/egl/GLContextEGLX11.cpp b/Source/WebCore/platform/graphics/egl/GLContextEGLX11.cpp -index 7a7018390a11..dddea337ebff 100644 ---- a/Source/WebCore/platform/graphics/egl/GLContextEGLX11.cpp -+++ b/Source/WebCore/platform/graphics/egl/GLContextEGLX11.cpp -@@ -91,7 +91,7 @@ std::unique_ptr GLContextEGL::createPixmapContext(PlatformDisplay& - // swap buffers. So, we use a custom XError handler here that ignores BadDrawable errors and only warns about any other - // errors without aborting in any case. - XErrorTrapper trapper(x11Display, XErrorTrapper::Policy::Warn, { BadDrawable }); -- EGLSurface surface = eglCreatePixmapSurface(display, config, reinterpret_cast(pixmap.get()), 0); -+ EGLSurface surface = eglCreatePixmapSurface(display, config, (EGLNativePixmapType)pixmap.get(), 0); - if (surface == EGL_NO_SURFACE) { - eglDestroyContext(display, context); - return nullptr; diff --git a/glib-dep.patch b/glib-dep.patch new file mode 100644 index 0000000..dbc0ab6 --- /dev/null +++ b/glib-dep.patch @@ -0,0 +1,13 @@ +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(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."); + } diff --git a/sources b/sources index c3002eb..f8fd33a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (webkitgtk-2.40.1.tar.xz) = e94b9a651b3c120e3dc918831c8a7fcfbd35f6760a53b7b39a07c7d792ddf99082030bf8b44a522001df4a7368c2b9145606f7a1cc8e0ed60498a0b78325bc5c -SHA512 (webkitgtk-2.40.1.tar.xz.asc) = 105496359f3fdb2e4ab97696c5db8efcf55d17a4d560fa62f59febd62e1bba5094ad700e837a19ead15e5654e7ffbc4275761c70983d8cd81f8175bd5a446252 +SHA512 (webkitgtk-2.40.2.tar.xz) = 2fea73faffe171845f3710995bb27eb7350aa9ba7b513e7f0fc163c09fc63d73112a55dbc010af67e422c59baa9bfc85018f470a0255e43eb17aae465946eef7 +SHA512 (webkitgtk-2.40.2.tar.xz.asc) = 44fbf8a08adf7de288ad344d4fb1eb4865e535666006f102ba20e43a0e7152d0a2bd2b62b05b39b3b819ea01864864e772c1d3417a11ecbd99840f7b6c7186a1 diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 6d49cf7..58caed1 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -11,7 +11,7 @@ %endif Name: webkit2gtk3 -Version: 2.40.1 +Version: 2.40.2 Release: 1%{?dist} Summary: GTK Web content engine library @@ -24,8 +24,8 @@ 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/13083 -Patch0: egl-cast.patch +# https://github.com/WebKit/WebKit/pull/14498 +Patch0: glib-dep.patch BuildRequires: bison BuildRequires: bubblewrap @@ -293,6 +293,10 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir %changelog +* Tue May 30 2023 Michael Catanzaro - 2.40.2-1 +- Update to 2.40.2 + Related: #2176270 + * Thu May 04 2023 Michael Catanzaro - 2.40.1-1 - Upgrade to 2.40.1 Resolves: #2176270