Fix garbage collection on ppc64le and s390x after upgrade to 2.28

Add GPG verification

.gitignore

@@ -26,10 +26,18 @@
 /webkitgtk-2.24.0.tar.xz
 /webkitgtk-2.24.1.tar.xz
 /webkitgtk-2.24.2.tar.xz
-/webkitgtk-2.25.1.tar.xz
-/webkitgtk-2.25.2.tar.xz
-/webkitgtk-2.25.3.tar.xz
-/webkitgtk-2.25.4.tar.xz
-/webkitgtk-2.25.92.tar.xz
-/webkitgtk-2.26.0.tar.xz
+/webkitgtk-2.24.3.tar.xz
+/webkitgtk-2.24.4.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

fix-ppc64le-s390x.patch

@@ -0,0 +1,25 @@
+Index: /Source/JavaScriptCore/heap/GCMemoryOperations.h
+===================================================================
+--- /Source/JavaScriptCore/heap/GCMemoryOperations.h	(revision 261325)
++++ /Source/JavaScriptCore/heap/GCMemoryOperations.h	(revision 261326)
+@@ -54,5 +54,5 @@
+     };
+ 
+-#if COMPILER(GCC_COMPATIBLE) && USE(JSVALUE64)
++#if COMPILER(GCC_COMPATIBLE) && (CPU(X86_64) || CPU(ARM64))
+     if (bytes <= smallCutoff)
+         slowPathForwardMemcpy();
+@@ -122,6 +122,4 @@
+             : "d0", "d1", "memory"
+         );
+-#else
+-    slowPathForwardMemcpy();
+ #endif // CPU(X86_64)
+     } else {
+@@ -140,5 +138,5 @@
+ #else
+     slowPathForwardMemcpy();
+-#endif // COMPILER(GCC_COMPATIBLE)
++#endif // COMPILER(GCC_COMPATIBLE) && (CPU(X86_64) || CPU(ARM64))
+ #else
+     memcpy(dst, src, bytes);

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 @@
-SHA512 (webkitgtk-2.26.1.tar.xz) = dd8ab515b3603c8fbb3fdf92b099801e8c560a6ccf759103adc7f94649f089d6c8707002facd7b91f86f9671ddd28488eb602233b7339e60287a0ec89f22aed7
+SHA512 (webkitgtk-2.28.2.tar.xz) = c7c0c55b1ebc61c0ec9cd9af96a12058a96ba9b011330b12c7c2776685736e0edf604f5eee639637cb50b2967d77c2db4dea15050a575fd34a1f6f0a8b8c56f8

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;

webkit-process.patch

@@ -0,0 +1,16 @@
+diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
+index da25d96e35b5..242ce8c00eeb 100644
+--- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
++++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
+@@ -381,6 +381,11 @@ static void webkitWebContextConstructed(GObject* object)
+         const char* useSingleWebProcess = getenv("WEBKIT_USE_SINGLE_WEB_PROCESS");
+         if (useSingleWebProcess && strcmp(useSingleWebProcess, "0"))
+             configuration.setUsesSingleWebProcess(true);
++        else {
++            const char* prgname = g_get_prgname();
++            if (!g_strcmp0(prgname, "evolution") || !g_strcmp0(prgname, "geary"))
++                configuration.setUsesSingleWebProcess(true);
++        }
+     }
+ #endif
+

webkit2gtk3.spec

@@ -6,20 +6,23 @@
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkit2gtk3
-Version:        2.26.1
-Release:        1%{?dist}
+Version:        2.28.2
+Release:        2%{?dist}
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
 URL:            http://www.webkitgtk.org/
 Source0:        http://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=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
+# https://mail.gnome.org/archives/distributor-list/2019-October/msg00000.html
+Patch1:     webkit-process.patch
+# https://bugs.webkit.org/show_bug.cgi?id=210685
+Patch2:     fix-ppc64le-s390x.patch
 
 BuildRequires:  bison
 BuildRequires:  bubblewrap
@@ -28,6 +31,7 @@ BuildRequires:  flex
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  git
+BuildRequires:  gnupg2
 BuildRequires:  gperf
 BuildRequires:  gtk-doc
 BuildRequires:  hyphen-devel
@@ -38,6 +42,7 @@ BuildRequires:  perl-JSON-PP
 BuildRequires:  perl-Switch
 BuildRequires:  python3
 BuildRequires:  ruby
+BuildRequires:  rubygem-json
 BuildRequires:  rubygems
 BuildRequires:  xdg-dbus-proxy
 
@@ -75,8 +80,6 @@ BuildRequires:  pkgconfig(upower-glib)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-server)
-BuildRequires:  pkgconfig(wpe-1.0)
-BuildRequires:  pkgconfig(wpebackend-fdo-1.0)
 BuildRequires:  pkgconfig(xt)
 
 Requires:       bubblewrap
@@ -152,7 +155,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/
@@ -187,6 +191,7 @@ pushd %{_target_platform}
   -DCMAKE_BUILD_TYPE=Release \
   -DENABLE_GTKDOC=ON \
   -DENABLE_MINIBROWSER=ON \
+  -DUSE_WPE_RENDERER=OFF \
   -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
   ..
 popd
@@ -266,46 +271,65 @@ export NINJA_STATUS="[%f/%t][%e] "
 %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
 
 %changelog
-* Thu Sep 26 2019 Eike Rathke <erack@redhat.com> - 2.26.1-1
-- Resolves: rhbz#1754472 Update to 2.26.1
+* 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
 
-* Thu Sep 19 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 2.26.0-3
-- Enable WPE renderer, resolves rhbz#1753730
+* Fri Apr 24 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.2-1
+- Update to 2.28.2
 
-* Tue Sep 17 2019 Tomas Popela <tpopela@redhat.com> - 2.26.0-2
-- Backport fix for a crash when closing the view and HW acceleration is enabled
-- Resolves: rhbz#1750345
-- Backport fix for EGL_BAD_ALLOC
-- Resolves: rhbz#1751936
+* Fri Apr 17 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.1-3
+- Fix popup menus in X11.
 
-* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 2.26.0-1
-- Update to 2.26.0
+* Mon Apr 13 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.1-1
+- Update to 2.28.1. Reenable PSON.
 
-* Wed Sep 04 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 2.25.92-2
-- Add patch to fix startup in X11 when not using gdm
+* Thu Apr 09 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-9.1
+- Fix attempt to disable PSON (WebKit #210287)
 
-* Tue Sep 03 2019 Eike Rathke <erack@redhat.com> - 2.25.92-1
-- Resolves: rhbz#1748305 Update to 2.25.92
+* Thu Apr 09 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-9
+- Second attempt to fix ppc64le
+- Forcibly disable PSON (WebKit #210287)
 
-* Fri Aug 02 2019 Eike Rathke <erack@redhat.com> - 2.25.4-1
-- Update to 2.25.4
+* Mon Mar 30 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-6
+- Fix crashes on ppc64le
 
-* Fri Jul 26 2019 Tomas Popela <tpopela@redhat.com> - 2.25.3-2
-- Follow-up fixes for the GTK2 plugins support removal
-- Fixes: rhbz#1733436
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-5
+- BuildRequires: rubygem-json. Not plural. Sigh.
 
-* Tue Jul 23 2019 Eike Rathke <erack@redhat.com> - 2.25.3-1
-- Update to 2.25.3
-- This removes support for GTK 2 based NPAPI plugins (such as Adobe Flash)
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-4
+- Remove BuildRequires: rubygems-json, should not have been added in F31
 
-* Wed Jul 17 2019 Adam Williamson <awilliam@redhat.com> - 2.25.2-2
-- Backport fix for crasher that affects Evolution (bwo#199621)
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-3
+- BuildRequires: rubygems-json
+- Refresh webkit-process.patch
 
-* Mon Jun 24 2019 Eike Rathke <erack@redhat.com> - 2.25.2-1
-- Update to 2.25.2
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-2
+- Rebuild with koji hopefully not broken this time?
 
-* Thu Jun 06 2019 Eike Rathke <erack@redhat.com> - 2.25.1-1
-- Update to 2.25.1
+* 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
+
+* Mon Oct 28 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 2.26.1-3
+- Disable broken WPE renderer
+
+* Wed Oct 23 2019 Eike Rathke <erack@redhat.com> - 2.26.1-2
+- Rebase to 2.26.1
+
+* Wed Aug 28 2019 Tomas Popela <tpopela@redhat.com> - 2.24.4-1
+- Update to 2.24.4
+
+* Tue Jul 02 2019 Tomas Popela <tpopela@redhat.com> - 2.24.3-1
+- Update to 2.24.3
 
 * Fri May 17 2019 Eike Rathke <erack@redhat.com> - 2.24.2-1
 - Update to 2.24.2

webkitgtk-2.28.2.tar.xz.asc

@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCXqK4bQAKCRDz0yLQ7EWC
+wyc4AKDvvzbZygtiXvWU7VESwg7E79oLMACeOKkEjYKgiaxA/OAGQ3TzF8vazT0=
+=jnoc
+-----END PGP SIGNATURE-----