Fix ppc64le page size patch

Fix JavaScriptCore on ppc64le

.gitignore

@@ -35,3 +35,8 @@
 /webkitgtk-2.26.1.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

fix-ppc64le.patch

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,26 @@
+--- 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
+ 

sources

@@ -1 +1 @@
-SHA512 (webkitgtk-2.27.2.tar.xz) = f535102ea81db463bcabd5ae8c1911aedba26a6db218cd7ac258433e6053210bdcf3a305d5e47e702d54281bdf22e5ff52c6337e68c72adf1baf928dc1fecbc7
+SHA512 (webkitgtk-2.28.0.tar.xz) = ce6b770e99741be6d353716d1e7bccba1372ed4667baeec41428d73c3502b0baa1cb8932f6bcede9c87d9b7f54b57a5a85a056c9882d4c5b34f9c70e6a2124dd

webkit2gtk3.spec

@@ -6,18 +6,25 @@
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkit2gtk3
-Version:        2.27.2
-Release:        1%{?dist}
+Version:        2.28.0
+Release:        8%{?dist}
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
-URL:            http://www.webkitgtk.org/
-Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
+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=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
@@ -26,17 +33,21 @@ BuildRequires:  flex
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  git
+BuildRequires:  gnupg2
 BuildRequires:  gperf
 BuildRequires:  gtk-doc
 BuildRequires:  hyphen-devel
 BuildRequires:  libatomic
 BuildRequires:  ninja-build
-BuildRequires:  perl-File-Copy-Recursive
-BuildRequires:  perl-JSON-PP
-BuildRequires:  perl-Switch
+BuildRequires:  perl(English)
+BuildRequires:  perl(File::Copy::Recursive)
+BuildRequires:  perl(FindBin)
+BuildRequires:  perl(JSON::PP)
+BuildRequires:  perl(Switch)
 BuildRequires:  python3
 BuildRequires:  ruby
 BuildRequires:  rubygems
+BuildRequires:  rubygem-json
 BuildRequires:  xdg-dbus-proxy
 
 BuildRequires:  pkgconfig(atspi-2)
@@ -73,8 +84,9 @@ 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)
+# 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(xt)
 
 Requires:       bubblewrap
@@ -150,6 +162,7 @@ The %{name}-jsc-devel package contains libraries, build data, and header
 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
 
 # Remove bundled libraries
@@ -179,6 +192,7 @@ 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 \
@@ -186,6 +200,7 @@ pushd %{_target_platform}
   -DENABLE_GTKDOC=ON \
   -DENABLE_MINIBROWSER=ON \
   -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
+  -DUSE_WPE_RENDERER=OFF \
   ..
 popd
 
@@ -228,12 +243,14 @@ export NINJA_STATUS="[%f/%t][%e] "
 %{_libdir}/webkit2gtk-4.0/
 %{_libexecdir}/webkit2gtk-4.0/
 %exclude %{_libexecdir}/webkit2gtk-4.0/MiniBrowser
+%exclude %{_libexecdir}/webkit2gtk-4.0/jsc
 %{_bindir}/WebKitWebDriver
 
 %files devel
 %{_libexecdir}/webkit2gtk-4.0/MiniBrowser
 %{_includedir}/webkitgtk-4.0/
 %exclude %{_includedir}/webkitgtk-4.0/JavaScriptCore
+%exclude %{_includedir}/webkitgtk-4.0/jsc
 %{_libdir}/libwebkit2gtk-4.0.so
 %{_libdir}/pkgconfig/webkit2gtk-4.0.pc
 %{_libdir}/pkgconfig/webkit2gtk-web-extension-4.0.pc
@@ -251,6 +268,7 @@ export NINJA_STATUS="[%f/%t][%e] "
 %{_libexecdir}/webkit2gtk-4.0/jsc
 %dir %{_includedir}/webkitgtk-4.0
 %{_includedir}/webkitgtk-4.0/JavaScriptCore/
+%{_includedir}/webkitgtk-4.0/jsc/
 %{_libdir}/libjavascriptcoregtk-4.0.so
 %{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc
 %dir %{_datadir}/gir-1.0
@@ -264,6 +282,52 @@ export NINJA_STATUS="[%f/%t][%e] "
 %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
 
 %changelog
+* 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
+
+* Mon Mar 16 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-7
+- Disable WPE renderer since it's busted, rhbz#1813993.
+- Use perl() syntax to denote perl dependencies.
+- Bump revision to maintain upgrade path
+
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-3
+- BuildRequires: perl-English
+
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-2
+- Rebuild with koji hopefully not broken this time?
+- Add perl-FindBin BuildRequires
+
+* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-1
+- Update to 2.28.0
+
+* Thu Feb 27 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.27.91-1
+- Update to 2.27.91
+
+* Mon Feb 10 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.27.90-2
+- Add GPG verification during prep
+
+* Mon Feb 10 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.27.90-1
+- Update to 2.27.90
+
+* Mon Feb 10 2020 Eike Rathke <erack@redhat.com> - 2.27.4-3
+- Resolves: rhbz#1800249 Fix FTBFS
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.27.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jan 10 2020 Eike Rathke <erack@redhat.com> - 2.27.4-1
+- Update to 2.27.4
+
+* Wed Dec 04 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 2.27.3-2
+- Fix minor file and directory ownership issues, rhbz#1779754 and rhbz#1779772
+
+* Tue Nov 26 2019 Eike Rathke <erack@redhat.com> - 2.27.3-1
+- Resolves: rhbz#1776825 Update to 2.27.3
+
+* Sat Nov 02 2019 Pete Walter <pwalter@fedoraproject.org> - 2.27.2-2
+- Rebuild for ICU 65
+
 * Tue Oct 22 2019 Eike Rathke <erack@redhat.com> - 2.27.2-1
 - Resolves: rhbz#1764135 Update to 2.27.2
 

webkitgtk-2.28.0.tar.xz.asc

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