From 4f68a94300425561095be0555ff65318ef8d4bf6 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Thu, 28 Mar 2024 18:42:08 +0300 Subject: [PATCH] import webkit2gtk3-2.42.5-1.el9 --- .gitignore | 2 +- .webkit2gtk3.metadata | 2 +- SOURCES/i686-build.patch | 16 +++++++++++++ SOURCES/webkitgtk-2.40.5.tar.xz.asc | 6 ----- SOURCES/webkitgtk-2.42.5.tar.xz.asc | 6 +++++ SPECS/webkit2gtk3.spec | 37 ++++++++++++++++++++++++++--- 6 files changed, 58 insertions(+), 11 deletions(-) create mode 100644 SOURCES/i686-build.patch delete mode 100644 SOURCES/webkitgtk-2.40.5.tar.xz.asc create mode 100644 SOURCES/webkitgtk-2.42.5.tar.xz.asc diff --git a/.gitignore b/.gitignore index 2a925d8..65e46c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/webkitgtk-2.40.5.tar.xz +SOURCES/webkitgtk-2.42.5.tar.xz SOURCES/webkitgtk-keys.gpg diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata index 6a421f0..69b99c4 100644 --- a/.webkit2gtk3.metadata +++ b/.webkit2gtk3.metadata @@ -1,2 +1,2 @@ -2f4d06b021115eb4106177f7d5f534f45b5d3b2e SOURCES/webkitgtk-2.40.5.tar.xz +c3ffb2beaac56f1089029f2254482f48d9e3db37 SOURCES/webkitgtk-2.42.5.tar.xz cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg diff --git a/SOURCES/i686-build.patch b/SOURCES/i686-build.patch new file mode 100644 index 0000000..1b5ec0d --- /dev/null +++ b/SOURCES/i686-build.patch @@ -0,0 +1,16 @@ +From: Alberto Garcia +Subject: Fix FTBFS in i386 +Bug: https://bugs.webkit.org/show_bug.cgi?id=268739 +Index: webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +=================================================================== +--- webkitgtk.orig/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpc + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) diff --git a/SOURCES/webkitgtk-2.40.5.tar.xz.asc b/SOURCES/webkitgtk-2.40.5.tar.xz.asc deleted file mode 100644 index 4dc018d..0000000 --- a/SOURCES/webkitgtk-2.40.5.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCZMjRYQAKCRDz0yLQ7EWC -wwPPAJ0XUmEmSr4IFQWpbDfPOR9keXY+lwCfVLyOFL8T55psriGN4vkxVZqq+EM= -=nGCs ------END PGP SIGNATURE----- diff --git a/SOURCES/webkitgtk-2.42.5.tar.xz.asc b/SOURCES/webkitgtk-2.42.5.tar.xz.asc new file mode 100644 index 0000000..86d9831 --- /dev/null +++ b/SOURCES/webkitgtk-2.42.5.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCZcCvFAAKCRDz0yLQ7EWC +w1FoAJ9+JY5XpvsElI4nSgXhLk3k6O7L5QCeNx1Hj5iFlSDQY17oYfa4FyMEI9I= +=NxQN +-----END PGP SIGNATURE----- diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec index 5f35456..44ebf00 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -11,7 +11,7 @@ %endif Name: webkit2gtk3 -Version: 2.40.5 +Version: 2.42.5 Release: 1%{?dist} Summary: GTK Web content engine library @@ -24,6 +24,9 @@ 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://bugs.webkit.org/show_bug.cgi?id=268739 +Patch: i686-build.patch + BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake @@ -51,12 +54,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) @@ -97,6 +99,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 @@ -214,6 +219,7 @@ rm -rf Source/ThirdParty/qunit/ -DUSE_AVIF=OFF \ -DENABLE_DOCUMENTATION=OFF \ -DUSE_GSTREAMER_TRANSCODER=OFF \ + -DUSE_JPEGXL=OFF \ %if !0%{?with_gamepad} -DENABLE_GAMEPAD=OFF \ %endif @@ -291,6 +297,31 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir %changelog +* Mon Feb 05 2024 Michael Catanzaro - 2.42.5-1 +- Update to 2.42.5 + Resolves: RHEL-3960 + +* Fri Dec 15 2023 Michael Catanzaro - 2.42.4-1 +- Update to 2.42.4 + Resolves: RHEL-3960 + Resolves: RHEL-19366 + +* Tue Dec 05 2023 Michael Catanzaro - 2.42.3-1 +- Update to 2.42.3 + Resolves: RHEL-3960 + +* Fri Nov 10 2023 Michael Catanzaro - 2.42.2-1 +- Update to 2.42.2 + Resolves: RHEL-3960 + +* Wed Sep 27 2023 Michael Catanzaro - 2.42.1-1 +- Update to 2.42.1 + Resolves: RHEL-3960 + +* Mon Sep 18 2023 Michael Catanzaro - 2.42.0-1 +- Upgrade to 2.42.0 + Resolves: RHEL-3960 + * Tue Aug 01 2023 Michael Catanzaro - 2.40.5-1 - Update to 2.40.5 Related: #2176270