Update to 2.30.2

This reverts commit 3311b36386.

Looks like I cherry-picked the wrong commit.

.gitignore

@@ -33,3 +33,25 @@
 /webkitgtk-2.25.92.tar.xz
 /webkitgtk-2.26.0.tar.xz
 /webkitgtk-2.26.1.tar.xz
+/webkitgtk-2.26.2.tar.xz
+/webkitgtk-2.26.3.tar.xz
+/webkitgtk-2.26.4.tar.xz
+/webkitgtk-2.27.1.tar.xz
+/webkitgtk-2.27.2.tar.xz
+/webkitgtk-2.27.3.tar.xz
+/webkitgtk-2.27.4.tar.xz
+/webkitgtk-2.27.90.tar.xz
+/webkitgtk-2.27.91.tar.xz
+/webkitgtk-2.28.0.tar.xz
+/webkitgtk-2.28.1.tar.xz
+/webkitgtk-2.28.2.tar.xz
+/webkitgtk-2.28.3.tar.xz
+/webkitgtk-2.28.3.tar.xz.asc
+/webkitgtk-2.28.4.tar.xz
+/webkitgtk-2.28.4.tar.xz.asc
+/webkitgtk-2.30.0.tar.xz
+/webkitgtk-2.30.0.tar.xz.asc
+/webkitgtk-2.30.1.tar.xz
+/webkitgtk-2.30.1.tar.xz.asc
+/webkitgtk-2.30.2.tar.xz
+/webkitgtk-2.30.2.tar.xz.asc

no-env-shebang.patch

@@ -1,24 +0,0 @@
-From 494e4abb7a5130376d3cdb41a5e3963650b8659f Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Mon, 16 Jul 2018 06:34:53 +0200
-Subject: [PATCH] Fix the broken build due to python2
-
-/builddir/build/BUILD/webkitgtk-2.23.3/Tools/gtkdoc/generate-gtkdoc
-/usr/bin/env: 'python': No such file or directory
----
- Tools/gtk/generate-gtkdoc                                      | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Tools/gtk/generate-gtkdoc b/Tools/gtk/generate-gtkdoc
-index 45c23dfb..a3f82984 100755
---- a/Tools/gtkdoc/generate-gtkdoc
-+++ b/Tools/gtkdoc/generate-gtkdoc
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python3
- # Copyright (C) 2011 Igalia S.L.
- #
- # This library is free software; you can redistribute it and/or
--- 
-2.17.1
-

sources

@@ -1 +1,2 @@
-SHA512 (webkitgtk-2.26.1.tar.xz) = dd8ab515b3603c8fbb3fdf92b099801e8c560a6ccf759103adc7f94649f089d6c8707002facd7b91f86f9671ddd28488eb602233b7339e60287a0ec89f22aed7
+SHA512 (webkitgtk-2.30.2.tar.xz) = caecd765ce92942fc07d0d18b834b8f1acb13e6dc1e504ed9f104862285a6032a8824ab98a7439e6f8664d83dacb4ece2011f4ec822308e5b40d1f82ca601243
+SHA512 (webkitgtk-2.30.2.tar.xz.asc) = 1d4ddf2bd926f29b1f6d0f464b3e76774c111f2dc6480eb3f1f12efb10529071d29d9b1e7fd276898f29506a80b27133918d19919e2ef9c693661197072566d7

user-agent-branding.patch

@@ -1,13 +0,0 @@
-diff -up webkitglib-2.14.1/Source/WebCore/platform/glib/UserAgentGLib.cpp.orig webkitglib-2.14.1/Source/WebCore/platform/glib/UserAgentGLib.cpp
---- webkitglib-2.14.1/Source/WebCore/platform/glib/UserAgentGLib.cpp.orig	2016-10-12 07:59:25.670057792 +0200
-+++ webkitglib-2.14.1/Source/WebCore/platform/glib/UserAgentGLib.cpp	2016-10-12 08:01:06.251878684 +0200
-@@ -85,6 +85,9 @@ static String buildUserAgentString(const UserAgentQuirks& quirks)
-     else {
-         uaString.append(platformForUAString());
-         uaString.appendLiteral("; ");
-+#if defined(USER_AGENT_GTK_DISTRIBUTOR_NAME)
-+        uaString.appendLiteral(USER_AGENT_GTK_DISTRIBUTOR_NAME "; ");
-+#endif
-         uaString.append(platformVersionForUAString());
-     }
-

webkit-201979.patch

@@ -1,24 +0,0 @@
---- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp	
-+++ a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp	
-@@ -30,6 +30,12 @@ 
- #include <wtf/glib/GRefPtr.h>
- #include <wtf/glib/GUniquePtr.h>
- 
-+#if PLATFORM(GTK)
-+#define BASE_DIRECTORY "webkitgtk"
-+#elif PLATFORM(WPE)
-+#define BASE_DIRECTORY "wpe"
-+#endif
-+
- #if __has_include(<sys/memfd.h>)
- 
- #include <sys/memfd.h>
-@@ -129,7 +135,7 @@ public:
-         if (!dbusPath.get())
-             return;
- 
--        GUniquePtr<char> appRunDir(g_build_filename(g_get_user_runtime_dir(), g_get_prgname(), nullptr));
-+        GUniquePtr<char> appRunDir(g_build_filename(g_get_user_runtime_dir(), BASE_DIRECTORY, nullptr));
-         m_proxyPath = makeProxyPath(appRunDir.get()).get();
- 
-         m_socket = dbusAddress;

webkit2gtk3.spec

@@ -6,20 +6,16 @@
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkit2gtk3
-Version:        2.26.1
+Version:        2.30.2
 Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
 URL:            http://www.webkitgtk.org/
 Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-
-# https://bugs.webkit.org/show_bug.cgi?id=162611
-Patch0:     user-agent-branding.patch
-# Don't use the shebang, but point straight to python 3
-Patch1:     no-env-shebang.patch
-# https://bugs.webkit.org/show_bug.cgi?id=201979
-Patch2:     webkit-201979.patch
+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
 
 BuildRequires:  bison
 BuildRequires:  bubblewrap
@@ -28,6 +24,7 @@ BuildRequires:  flex
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  git
+BuildRequires:  gnupg2
 BuildRequires:  gperf
 BuildRequires:  gtk-doc
 BuildRequires:  hyphen-devel
@@ -38,6 +35,7 @@ BuildRequires:  perl-JSON-PP
 BuildRequires:  perl-Switch
 BuildRequires:  python3
 BuildRequires:  ruby
+BuildRequires:  rubygem-json
 BuildRequires:  rubygems
 BuildRequires:  xdg-dbus-proxy
 
@@ -67,6 +65,7 @@ BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libseccomp)
 BuildRequires:  pkgconfig(libsecret-1)
 BuildRequires:  pkgconfig(libsoup-2.4)
+BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libwebp)
 BuildRequires:  pkgconfig(libwoff2dec)
 BuildRequires:  pkgconfig(libxslt)
@@ -79,10 +78,18 @@ BuildRequires:  pkgconfig(wpe-1.0)
 BuildRequires:  pkgconfig(wpebackend-fdo-1.0)
 BuildRequires:  pkgconfig(xt)
 
+# These are hard requirements of WebKit's bubblewrap sandbox.
 Requires:       bubblewrap
-Requires:       geoclue2
 Requires:       xdg-dbus-proxy
 
+# If Geoclue is not running, the geolocation API will not work.
+Recommends:     geoclue2
+
+# 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.
+Recommends:     xdg-desktop-portal-gtk
+
 # Obsolete libwebkit2gtk from the webkitgtk3 package
 Obsoletes:      libwebkit2gtk < 2.5.0
 Provides:       libwebkit2gtk = %{version}-%{release}
@@ -152,7 +159,8 @@ The %{name}-jsc-devel package contains libraries, build data, and header
 files for developing applications that use JavaScript engine from %{name}.
 
 %prep
-%autosetup -p1 -n webkitgtk-%{version} -S git
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%autosetup -p1 -n webkitgtk-%{version}
 
 # Remove bundled libraries
 rm -rf Source/ThirdParty/gtest/
@@ -202,12 +210,10 @@ export NINJA_STATUS="[%f/%t][%e] "
 
 # Finally, copy over and rename various files for %%license inclusion
 %add_to_license_files Source/JavaScriptCore/COPYING.LIB
-%add_to_license_files Source/JavaScriptCore/icu/LICENSE
 %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/icu/LICENSE
 %add_to_license_files Source/WebCore/LICENSE-APPLE
 %add_to_license_files Source/WebCore/LICENSE-LGPL-2
 %add_to_license_files Source/WebCore/LICENSE-LGPL-2.1
@@ -266,6 +272,70 @@ export NINJA_STATUS="[%f/%t][%e] "
 %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
 
 %changelog
+* Mon Oct 26 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.2-1
+- Update to 2.30.2
+
+* Mon Sep 21 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.1-1
+- Update to 2.30.1
+
+* Fri Sep 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.0-1
+- Update to 2.30.0
+
+* Tue Jul 28 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.4-1
+- Update to 2.28.4
+
+* Tue Jul 14 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.3-2
+- Drop some Requires to Recommends
+
+* Thu Jul 09 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.3-1
+- Update to 2.28.3
+
+* Fri May 08 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.2-2
+- Fix garbage collection on ppc64le and s390x after upgrade to 2.28
+
+* Fri Apr 24 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.2-1
+- Update to 2.28.2
+
+* Fri Apr 17 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.1-3
+- Fix popup menus in X11.
+
+* Mon Apr 13 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.1-1
+- Update to 2.28.1
+
+* Thu Apr 09 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-9
+- Second attempt to fix ppc64le
+
+* Mon Mar 30 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-7
+- Fix crashes on ppc64le
+
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-6
+- BuildRequires: rubygem-json. Not plural. Sigh.
+
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-5
+- Remove BuildRequires: rubygems-json, should not have been added in F31
+
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-4
+- Attempt rebuild. Koji seems flaky today?
+
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-3
+- BuildRequires: rubygems-json
+
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-2
+- Rebuild with koji hopefully not broken this time?
+
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
+* Fri Feb 14 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.26.4-1
+- Update to 2.26.4
+- Add GPG verification of tarball
+
+* Thu Jan 23 2020 Eike Rathke <erack@redhat.com> - 2.26.3-1
+- Update to 2.26.3
+
+* Fri Nov 08 2019 Eike Rathke <erack@redhat.com> - 2.26.2-1
+- Update to 2.26.2
+
 * Thu Sep 26 2019 Eike Rathke <erack@redhat.com> - 2.26.1-1
 - Resolves: rhbz#1754472 Update to 2.26.1