Update to 2.30.6

This is needed for the bubblewrap sandbox.

.gitignore

@@ -40,3 +40,23 @@
 /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
+/webkitgtk-2.30.3.tar.xz
+/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.30.6.tar.xz
+/webkitgtk-2.30.6.tar.xz.asc

fix-ppc64le.patch

@@ -1,14 +0,0 @@
-diff --git a/Source/JavaScriptCore/runtime/JSCConfig.h b/Source/JavaScriptCore/runtime/JSCConfig.h
-index ea2446f4..fa010be9 100644
---- a/Source/JavaScriptCore/runtime/JSCConfig.h
-+++ b/Source/JavaScriptCore/runtime/JSCConfig.h
-@@ -37,7 +37,7 @@ class VM;
- #if CPU(ARM64) || PLATFORM(WATCHOS)
- constexpr size_t PageSize = 16 * KB;
- #else
--constexpr size_t PageSize = 4 * KB;
-+constexpr size_t PageSize = 64 * KB;
- #endif
- 
- constexpr size_t ConfigSizeToProtect = PageSize;
-

fix-wayland-compositor.patch

@@ -1,26 +0,0 @@
---- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
-+++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
-@@ -30,6 +30,10 @@
- #include <wtf/glib/GRefPtr.h>
- #include <wtf/glib/GUniquePtr.h>
- 
-+#if PLATFORM(GTK)
-+#include "WaylandCompositor.h"
-+#endif
-+
- #if PLATFORM(GTK)
- #define BASE_DIRECTORY "webkitgtk"
- #elif PLATFORM(WPE)
-@@ -330,6 +334,12 @@ static void bindWayland(Vector<CString>& args)
-     const char* runtimeDir = g_get_user_runtime_dir();
-     GUniquePtr<char> waylandRuntimeFile(g_build_filename(runtimeDir, display, nullptr));
-     bindIfExists(args, waylandRuntimeFile.get(), BindFlags::ReadWrite);
-+
-+#if PLATFORM(GTK) && !USE(WPE_RENDERER)
-+    String displayName = WaylandCompositor::singleton().displayName();
-+    waylandRuntimeFile.reset(g_build_filename(runtimeDir, displayName.utf8().data(), nullptr));
-+    bindIfExists(args, waylandRuntimeFile.get(), BindFlags::ReadWrite);
-+#endif
- }
- #endif
- 

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.28.0.tar.xz) = ce6b770e99741be6d353716d1e7bccba1372ed4667baeec41428d73c3502b0baa1cb8932f6bcede9c87d9b7f54b57a5a85a056c9882d4c5b34f9c70e6a2124dd
+SHA512 (webkitgtk-2.30.6.tar.xz) = fe2de42ea66162cf28002bd2bd83890c8f8f6336fea873f769a57bae4d6cb8fd6c41af224e320608bcb47c8f0f41d150ac47004e9ef52127d208c01ae6dcf47f
+SHA512 (webkitgtk-2.30.6.tar.xz.asc) = bd2853c42a2a014093c43736bdde64bbfa21423dee0cc8c6dd8294eaee6fa5014b2b6e8c544b9291560e68df570708836520d19b887a0ca63c64ff277aff3855

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());
-     }
-

webkit2gtk3.spec

@@ -6,8 +6,8 @@
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkit2gtk3
-Version:        2.28.0
-Release:        8%{?dist}
+Version:        2.30.6
+Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
@@ -17,15 +17,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=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=209236
-Patch2:     fix-ppc64le.patch
-# https://bugs.webkit.org/show_bug.cgi?id=209106
-Patch3:     fix-wayland-compositor.patch
-
 BuildRequires:  bison
 BuildRequires:  bubblewrap
 BuildRequires:  cmake
@@ -68,6 +59,7 @@ BuildRequires:  pkgconfig(gstreamer-plugins-bad-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(harfbuzz)
 BuildRequires:  pkgconfig(icu-uc)
+BuildRequires:  pkgconfig(libgcrypt)
 BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(libopenjp2)
@@ -76,6 +68,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)
@@ -84,15 +77,22 @@ BuildRequires:  pkgconfig(upower-glib)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-server)
-# WPE renderer disabled due to https://bugs.webkit.org/show_bug.cgi?id=209118
-#BuildRequires:  pkgconfig(wpe-1.0)
-#BuildRequires:  pkgconfig(wpebackend-fdo-1.0)
+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}
@@ -163,7 +163,7 @@ files for developing applications that use JavaScript engine from %{name}.
 
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup -p1 -n webkitgtk-%{version} -S git
+%autosetup -p1 -n webkitgtk-%{version}
 
 # Remove bundled libraries
 rm -rf Source/ThirdParty/gtest/
@@ -192,7 +192,6 @@ rm -rf Source/ThirdParty/qunit/
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-# WPE renderer disabled due to https://bugs.webkit.org/show_bug.cgi?id=209118
 %cmake \
   -GNinja \
   -DPORT=GTK \
@@ -200,7 +199,6 @@ pushd %{_target_platform}
   -DENABLE_GTKDOC=ON \
   -DENABLE_MINIBROWSER=ON \
   -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
-  -DUSE_WPE_RENDERER=OFF \
   ..
 popd
 
@@ -215,12 +213,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
@@ -282,6 +278,58 @@ export NINJA_STATUS="[%f/%t][%e] "
 %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
 
 %changelog
+* Fri Mar 26 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.6-1
+- Update to 2.30.6
+
+* 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
+
+* Tue Nov 24 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.3-1
+- Update to 2.30.3
+
+* 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-4
+- Actually reenable WPE renderer.
+
+* Fri Apr 17 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.1-3
+- Fix and reenable WPE renderer. Fix popup menus in X11.
+
+* Wed Apr 15 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.1-2
+- Disable WPE renderer again.
+
+* 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
+- Reenable WPE renderer, seems to have mysteriously fixed itself.
+- Second attempt to fix ppc64le.
+
 * Tue Mar 24 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-8
 - Fix accelerated compositing mode with bubblewrap sandbox enabled
 - Fix JavaScriptCore on ppc64le

webkitgtk-2.28.0.tar.xz.asc

@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCXmd12wAKCRDz0yLQ7EWC
-w1FpAJ9xYuc79pO8nM0kqJf1sBLHpMS4zQCcCvEbt50LhA5JKo4AZTIJ796U5t0=
-=3NOZ
------END PGP SIGNATURE-----