Upgrade to 2.36.1

https://bugs.webkit.org/show_bug.cgi?id=235224
https://bugzilla.redhat.com/show_bug.cgi?id=2065464

.gitignore

@@ -65,3 +65,51 @@
 /webkitgtk-2.30.4.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
+/webkitgtk-2.33.1.tar.xz
+/webkitgtk-2.33.1.tar.xz.asc
+/webkitgtk-2.33.2.tar.xz
+/webkitgtk-2.33.2.tar.xz.asc
+/webkitgtk-2.33.3.tar.xz
+/webkitgtk-2.33.3.tar.xz.asc
+/webkitgtk-2.33.90.tar.xz
+/webkitgtk-2.33.90.tar.xz.asc
+/webkitgtk-2.33.91.tar.xz
+/webkitgtk-2.33.91.tar.xz.asc
+/webkitgtk-2.34.0.tar.xz
+/webkitgtk-2.34.0.tar.xz.asc
+/webkitgtk-2.34.1.tar.xz
+/webkitgtk-2.34.1.tar.xz.asc
+/webkitgtk-2.34.2.tar.xz
+/webkitgtk-2.34.2.tar.xz.asc
+/webkitgtk-2.34.4.tar.xz
+/webkitgtk-2.34.4.tar.xz.asc
+/webkitgtk-2.34.5.tar.xz
+/webkitgtk-2.34.5.tar.xz.asc
+/webkitgtk-2.34.6.tar.xz
+/webkitgtk-2.34.6.tar.xz.asc
+/webkitgtk-2.35.1.tar.xz
+/webkitgtk-2.35.1.tar.xz.asc
+/webkitgtk-2.35.2.tar.xz
+/webkitgtk-2.35.2.tar.xz.asc
+/webkitgtk-2.35.3.tar.xz
+/webkitgtk-2.35.3.tar.xz.asc
+/webkitgtk-2.35.90.tar.xz
+/webkitgtk-2.35.90.tar.xz.asc
+/webkitgtk-2.36.0.tar.xz
+/webkitgtk-2.36.0.tar.xz.asc
+/webkitgtk-2.36.1.tar.xz
+/webkitgtk-2.36.1.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.36.1.tar.xz) = c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4
+SHA512 (webkitgtk-2.36.1.tar.xz.asc) = b3c005aef5b5da0d381abb5af13aeb58bf66049021ea6740786b67f0bcabe4e1a516ac69235eafadbb75c5386ed0e7ab5d8a4f582233a28ec47b10da3ac934e0

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,19 +16,18 @@
 %bcond_without docs
 
 Name:           webkit2gtk3
-Version:        2.31.1
-Release:        4%{?dist}
+Version:        2.36.1
+Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
 URL:            https://www.webkitgtk.org/
 Source0:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 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
+# Use the keys from https://webkitgtk.org/verifying.html
+# $ gpg --import aperez.key carlosgc.key
+# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
+Source2:        webkitgtk-keys.gpg
 
 BuildRequires:  bison
 BuildRequires:  bubblewrap
@@ -71,6 +70,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)
@@ -103,6 +103,10 @@ Requires:       xdg-dbus-proxy
 # If Geoclue is not running, the geolocation API will not work.
 Recommends:     geoclue2
 
+# Needed for various GStreamer elements.
+Recommends:     gstreamer1-plugins-bad-free
+Recommends:     gstreamer1-plugins-good
+
 # If no xdg-desktop-portal backend is installed, many features will be broken
 # inside the sandbox. In particular, the -gtk backend has to be installed for
 # desktop settings access, including font settings.
@@ -203,11 +207,12 @@ rm -rf Source/ThirdParty/qunit/
 # is only needed for x86_64.
 %global _dwz_max_die_limit_x86_64 250000000
 
-# Decrease debuginfo even on ix86 because of:
-# https://bugs.webkit.org/show_bug.cgi?id=140176
+# Remove debuginfo to reduce memory consumption:            
+# https://bugs.webkit.org/show_bug.cgi?id=140176            
+# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/I6IVNA52TXTBRQLKW45CJ5K4RA4WNGMI/
 %ifarch s390x %{arm} %{ix86} %{power64} %{mips}
-# Decrease debuginfo verbosity to reduce memory consumption even more
-%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
+%global debug_package %{nil}            
+%global optflags %(echo %{optflags} | sed 's/-g /-g0 /')
 %endif
 
 %cmake \
@@ -215,6 +220,8 @@ rm -rf Source/ThirdParty/qunit/
   -DPORT=GTK \
   -DCMAKE_BUILD_TYPE=Release \
   -DENABLE_MINIBROWSER=ON \
+  -DUSE_SOUP2=ON \
+  -DUSE_LD_GOLD=OFF \
 %if %{with docs}
   -DENABLE_GTKDOC=ON \
 %endif
@@ -244,7 +251,6 @@ export NINJA_STATUS="[%f/%t][%e] "
 %add_to_license_files Source/JavaScriptCore/COPYING.LIB
 %add_to_license_files Source/ThirdParty/ANGLE/LICENSE
 %add_to_license_files Source/ThirdParty/ANGLE/src/common/third_party/smhasher/LICENSE
-%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/compiler/LICENSE
 %add_to_license_files Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/LICENSE
 %add_to_license_files Source/WebCore/LICENSE-APPLE
 %add_to_license_files Source/WebCore/LICENSE-LGPL-2
@@ -309,6 +315,54 @@ export NINJA_STATUS="[%f/%t][%e] "
 %endif
 
 %changelog
+* Thu Apr 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.1-1
+- Update to 2.36.1
+
+* Wed Apr 20 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.0-2
+- Add patch for #2065464
+
+* Mon Mar 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.0-1
+- Update to 2.36.0
+
+* Thu Feb 17 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.6-1
+- Update to 2.34.6
+
+* Tue Feb 08 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.5-1
+- Update to 2.34.5
+
+* Fri Jan 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.4-1
+- Update to 2.34.4
+
+* Wed Nov 24 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.2-1
+- Update to 2.34.2
+
+* Thu Oct 21 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.1-1
+- Update to 2.34.1
+
+* Fri Sep 17 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.4-1
+- Update to 2.32.4
+
+* Fri Jul 23 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.3-1
+- Update to 2.32.3
+
+* 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
+
+* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 2.32.0-2
+- Rebuilt for removed libstdc++ symbol (#1937698)
+
+* Fri Mar 26 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.0-1
+- Update to 2.32.0
+
+* Fri Mar 12 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.91-1
+- Update to 2.31.91
+
+* Tue Mar 02 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.90-1
+- Update to 2.31.90
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.31.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild