Update sources

.gitignore

@@ -63,5 +63,21 @@
 /webkitgtk-2.30.3.tar.xz.asc
 /webkitgtk-2.30.4.tar.xz
 /webkitgtk-2.30.4.tar.xz.asc
+/webkitgtk-2.30.5.tar.xz
+/webkitgtk-2.30.5.tar.xz.asc
 /webkitgtk-2.31.1.tar.xz
 /webkitgtk-2.31.1.tar.xz.asc
+/webkitgtk-2.31.90.tar.xz.asc
+/webkitgtk-2.31.90.tar.xz
+/webkitgtk-2.31.91.tar.xz
+/webkitgtk-2.31.91.tar.xz.asc
+/webkitgtk-2.32.0.tar.xz
+/webkitgtk-2.32.0.tar.xz.asc
+/webkitgtk-2.32.1.tar.xz
+/webkitgtk-2.32.1.tar.xz.asc
+/webkitgtk-2.32.2.tar.xz
+/webkitgtk-2.32.2.tar.xz.asc
+/webkitgtk-2.32.3.tar.xz
+/webkitgtk-2.32.3.tar.xz.asc
+/webkitgtk-2.32.4.tar.xz
+/webkitgtk-2.32.4.tar.xz.asc

gir-multilib.patch

@@ -1,22 +0,0 @@
---- a/Source/JavaScriptCore/PlatformGTK.cmake	
-+++ a/Source/JavaScriptCore/PlatformGTK.cmake	
-@@ -79,6 +79,8 @@ if (ENABLE_INTROSPECTION)
-             --pkg-export=javascriptcoregtk-${WEBKITGTK_API_VERSION}
-             --output=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
-             --c-include="jsc/jsc.h"
-+            --sources-top-dirs=${CMAKE_BINARY_DIR}
-+            --sources-top-dirs=${CMAKE_SOURCE_DIR}
-             -DJSC_COMPILATION
-             -I${CMAKE_SOURCE_DIR}/Source
-             -I${JAVASCRIPTCORE_DIR}
---- a/Source/WebKit/PlatformGTK.cmake	
-+++ a/Source/WebKit/PlatformGTK.cmake	
-@@ -678,6 +678,8 @@ if (ENABLE_INTROSPECTION)
-             --pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
-             --output=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
-             --c-include="webkit2/webkit2.h"
-+            --sources-top-dirs=${CMAKE_BINARY_DIR}
-+            --sources-top-dirs=${CMAKE_SOURCE_DIR}
-             -DBUILDING_WEBKIT
-             -DWEBKIT2_COMPILATION
-             -I${CMAKE_SOURCE_DIR}/Source

sources

@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.31.1.tar.xz) = 23a3d28f7cd95281b2b1dbd75b5522f9fea735e883d8d080d572e9124e6711ee7704635fd4de337a1d8a51a0a61cc47f016a082bf15360e36655de3f97b127ea
-SHA512 (webkitgtk-2.31.1.tar.xz.asc) = 3f816714f08de59da9a9935771aaa2f9b892766397a60fe987e2382a11d32a4d5e6bda2d923bad347505b7998eaafe9fca76689e1556f524a60369337f8d4c98
+SHA512 (webkitgtk-2.34.1.tar.xz) = 13f42ecd474c013640233421abe63f55eefa7a5e62d080897197c4f1cde68a2584472586b41ba4d7a1d84a2e08311521c68d259daafcb9386b7164a49a7386ed
+SHA512 (webkitgtk-2.34.1.tar.xz.asc) = 6c89bbe389c7e951fe03c5995fff132986a2807db38a90f3d9463acffaa250d9deb906e72b60af48a4a49915e6c5393a0adaed3f170b203f993c15b353e52831

webkit2gtk3.spec

@@ -7,7 +7,7 @@
 
 # No libmanette in RHEL
 %if !0%{?rhel}
-%global with_gampad 1
+%global with_gamepad 1
 %endif
 
 # Build documentation by default (use `rpmbuild --without docs` to override it).
@@ -16,8 +16,8 @@
 %bcond_without docs
 
 Name:           webkit2gtk3
-Version:        2.31.1
-Release:        4%{?dist}
+Version:        2.34.1
+Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
@@ -27,9 +27,6 @@ Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
 # Created from http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322D0EC4582C3
 Source2:        https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg
 
-# https://bugs.webkit.org/show_bug.cgi?id=220636
-Patch0:         gir-multilib.patch
-
 BuildRequires:  bison
 BuildRequires:  bubblewrap
 BuildRequires:  cmake
@@ -71,6 +68,7 @@ BuildRequires:  pkgconfig(gstreamer-plugins-bad-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(harfbuzz)
 BuildRequires:  pkgconfig(icu-uc)
+BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libgcrypt)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libnotify)
@@ -215,6 +213,7 @@ rm -rf Source/ThirdParty/qunit/
   -DPORT=GTK \
   -DCMAKE_BUILD_TYPE=Release \
   -DENABLE_MINIBROWSER=ON \
+  -DUSE_SOUP2=ON \
 %if %{with docs}
   -DENABLE_GTKDOC=ON \
 %endif
@@ -309,17 +308,26 @@ export NINJA_STATUS="[%f/%t][%e] "
 %endif
 
 %changelog
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.31.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+* Thu Oct 21 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.1-1
+- Update to 2.34.1
 
-* Thu Jan 14 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.1-3
-- Fix multilib conflict in gir files
+* Fri Sep 17 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.4-1
+- Update to 2.32.4
 
-* Wed Jan 13 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.1-2
-- Disable gamepad support in RHEL
+* Fri Jul 23 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.3-1
+- Update to 2.32.3
 
-* Tue Jan 12 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.1-1
-- Update to 2.31.1
+* Tue Jul 13 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.2-1
+- Update to 2.32.2
+
+* Mon May 10 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.1-1
+- Update to 2.32.1
+
+* Fri Mar 26 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.0-1
+- Update to 2.32.0
+
+* Mon Feb 15 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.5-1
+- Update to 2.30.5
 
 * Tue Dec 15 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.4-1
 - Update to 2.30.4
@@ -327,9 +335,6 @@ export NINJA_STATUS="[%f/%t][%e] "
 * Tue Nov 24 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.3-1
 - Update to 2.30.3
 
-* Wed Nov 11 2020 Jeff Law <law@redhat.com> - 2.30.2-2
-- Fix bogus volatile caught by gcc-11
-
 * Mon Oct 26 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.2-1
 - Update to 2.30.2