Update to 2.42.1

Resolves: RHEL-3960

.gitignore

@@ -127,3 +127,5 @@
 /webkitgtk-2.40.5.tar.xz.asc
 /webkitgtk-2.42.0.tar.xz
 /webkitgtk-2.42.0.tar.xz.asc
+/webkitgtk-2.42.1.tar.xz
+/webkitgtk-2.42.1.tar.xz.asc

eglnativepixmaptype.patch

@@ -1,13 +0,0 @@
-diff --git a/Source/WebCore/platform/graphics/egl/GLContextX11.cpp b/Source/WebCore/platform/graphics/egl/GLContextX11.cpp
-index 5caefa950dad..92e8ead31211 100644
---- a/Source/WebCore/platform/graphics/egl/GLContextX11.cpp
-+++ b/Source/WebCore/platform/graphics/egl/GLContextX11.cpp
-@@ -86,7 +86,7 @@ std::unique_ptr<GLContext> GLContext::createPixmapContext(PlatformDisplay& platf
-     // 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<EGLNativePixmapType>(pixmap.get()), 0);
-+    EGLSurface surface = eglCreatePixmapSurface(display, config, (EGLNativePixmapType)(pixmap.get()), 0);
-     if (surface == EGL_NO_SURFACE) {
-         eglDestroyContext(display, context);
-         return nullptr;

sources

@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.42.0.tar.xz) = f71627182707f4ab34483a16b74d1519d7234833151ced818e54749f8ecb1f2956cc5d76e09957d07b727155c023e7b75426ad38ee955928fcac9e68d6304e2b
-SHA512 (webkitgtk-2.42.0.tar.xz.asc) = 5442918fb976bc280237bdc2ae4c8ff809b7c238b1cd6c913c73afc35b49782b9e8d73098b6ed0f70a6fcd57fd33fa2bea15c2fb9b5553dc2796b13b4b511c61
+SHA512 (webkitgtk-2.42.1.tar.xz) = c7ff45e748a2a3d381db05c7f05b7515d8e4e771e703dab6d153cb32392ff64f63f7d4039701676180abb6fd718153e762ce8ca9aede2ecbe0dc4efde5ed660c
+SHA512 (webkitgtk-2.42.1.tar.xz.asc) = 4ef914ebeade2033e4021d37b2d233855470ab9748e3f2029c34e34b2ff486a7fe239224d49b53dec00a9a11c3053677666bab997a8d89160a108c55ffd661ed

webkit2gtk3.spec

@@ -11,7 +11,7 @@
 %endif
 
 Name:           webkit2gtk3
-Version:        2.42.0
+Version:        2.42.1
 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/17923
-Patch:          eglnativepixmaptype.patch
-
 BuildRequires:  bison
 BuildRequires:  bubblewrap
 BuildRequires:  cmake
@@ -54,12 +51,11 @@ BuildRequires:  pkgconfig(atspi-2)
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(egl)
 BuildRequires:  pkgconfig(enchant-2)
+BuildRequires:  pkgconfig(epoxy)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(gbm)
-BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(glesv2)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-bad-1.0)
@@ -100,6 +96,9 @@ BuildRequires:  pkgconfig(xt)
 Requires:       bubblewrap
 Requires:       xdg-dbus-proxy
 
+# libepoxy will crash when WebKit tries using GLES2 if it's not installed.
+Requires:       libGLES
+
 # If Geoclue is not running, the geolocation API will not work.
 Recommends:     geoclue2
 
@@ -295,6 +294,10 @@ export NINJA_STATUS="[%f/%t][%e] "
 %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
 
 %changelog
+* Wed Sep 27 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.1-1
+- Update to 2.42.1
+  Resolves: RHEL-3960
+
 * Mon Sep 18 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.0-1
 - Upgrade to 2.42.0
   Resolves: RHEL-3960