Accepting request 794010 from GNOME:Next

New upstream release, not buildtested

OBS-URL: https://build.opensuse.org/request/show/794010
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=253

webkit-process.patch

@@ -1,29 +1,22 @@
-From: Mike Gorse <mgorse@suse.com>
+diff -urp webkitgtk-2.28.0.orig/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp webkitgtk-2.28.0/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
-Date: Thu 19 Dec 2019 10:33:14 AM EST
+--- webkitgtk-2.28.0.orig/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp	2020-02-04 04:30:36.000000000 -0600
-Subject: [patch] Use single web process for evolution and geary.
++++ webkitgtk-2.28.0/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp	2020-03-19 14:16:07.742318092 -0500
-
+@@ -379,8 +379,16 @@ static void webkitWebContextConstructed(
-https://mail.gnome.org/archives/distributor-list/2019-October/msg00000.html
+     configuration.setProcessSwapsOnNavigation(priv->psonEnabled);
-
+     if (!priv->psonEnabled) {
-Index: webkitgtk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
+         const char* useSingleWebProcess = getenv("WEBKIT_USE_SINGLE_WEB_PROCESS");
-===================================================================
+-        if (useSingleWebProcess && strcmp(useSingleWebProcess, "0"))
---- webkitgtk.orig/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
+-            configuration.setUsesSingleWebProcess(true);
-+++ webkitgtk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
++        if (useSingleWebProcess) {
-@@ -348,8 +348,16 @@ ALLOW_DEPRECATED_DECLARATIONS_END
++            if (strcmp(useSingleWebProcess, "0")) {
-         configuration.setLocalStorageDirectory(FileSystem::stringFromFileSystemRepresentation(priv->localStorageDirectory.data()));
++                configuration.setUsesSingleWebProcess(true);
- 
++            }
-     const char* useSingleWebProcess = getenv("WEBKIT_USE_SINGLE_WEB_PROCESS");
++        } else {
--    if (useSingleWebProcess && strcmp(useSingleWebProcess, "0"))
++            const char* prgname = g_get_prgname();
--        configuration.setUsesSingleWebProcess(true);
++            if (!g_strcmp0(prgname, "evolution") || !g_strcmp0(prgname, "geary")) {
-+    if (useSingleWebProcess) {
++                configuration.setUsesSingleWebProcess(true);
-+        if (strcmp(useSingleWebProcess, "0")) {
++            }
-+            configuration.setUsesSingleWebProcess(true);
 +        }
-+    } else {
+     }
-+        const char* prgname = g_get_prgname();
+ #endif
-+        if (!g_strcmp0(prgname, "evolution") || !g_strcmp0(prgname, "geary")) {
-+            configuration.setUsesSingleWebProcess(true);
-+        }
-+    }
-     priv->processPool = WebProcessPool::create(configuration);
  
-     if (!priv->websiteDataManager)

webkit2gtk3.changes

@@ -1,7 +1,38 @@
+-------------------------------------------------------------------
+Wed Apr 15 05:39:04 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 2.28.1:
+  + Fix position of default option element popup windows under
+    Wayland.
+  + Fix rendering after a cross site navigation with PSON enabled
+    and hardware acceleration forced.
+  + Fix a crash in nested wayland compositor when closing a tab
+    with PSON enabled.
+  + Update Chrome and Firefox versions in user agent quirks.
+  + Fix a crash with bubblewrap sandbox enabled.
+  + Fix a crash in JavaScriptCore in ppc64el.
+  + Fix the build with GStreamer 1.12.
+  + Fix several crashes and rendering issues.
+- Drop webkit2gtk3-gstreamer-build-fix.patch: Fixed upstream.
+
+-------------------------------------------------------------------
+Thu Apr  2 19:53:27 UTC 2020 - Michael Gorse <mgorse@suse.com>
+
+- Add webkit2gtk3-gstreamer-build-fix.patch: fix build with
+  gstreamer 1.12 (webkit#209296).
+- Rebase webkit-process.patch.
+- Use WebKit defaults for ENABLE_JIT and USE_SYSTEM_MALLOC, except
+  for aarch64. WebKit now sets reasonable defaults based on
+  architecture. Disable on aarch64 in case a user is still using
+  the kernel-64kb package.
+- Use bubblewrap, xdg-dbus-proxy, wpe, and wpebackend-fdo on 15.2;
+  they had been unintentionally excluded.
+- Increase mem_per_process; otherwise fails on SLE/Leap.
+
 -------------------------------------------------------------------
 Thu Mar 12 12:10:03 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
 
-- Update to version 2.28.0:
+- Update to version 2.28.0 (boo#1165528):
   + Add API to enable Process Swap on (Cross-site) Navigation.
   + Add user messages API for the communication with the web
     extension.
@@ -13,6 +44,7 @@ Thu Mar 12 12:10:03 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
     accelerated compositing mode.
   + Always use a light theme for rendering form controls.
   + Add about:gpu to show information about the graphics stack.
+  + Security fixes: CVE-2020-10018.
 - Drop webkit2gtk3-ppc-build-fix.patch: Fixed upstream.
 
 -------------------------------------------------------------------

webkit2gtk3.spec

@@ -31,7 +31,7 @@
 %define _gold_linker 0
 %endif
 Name:           webkit2gtk3
-Version:        2.28.0
+Version:        2.28.1
 Release:        0
 Summary:        Library for rendering web content, GTK+ Port
 License:        LGPL-2.0-or-later AND BSD-3-Clause
@@ -43,7 +43,7 @@ Source98:       baselibs.conf
 Source99:       webkit2gtk3.keyring
 # PATCH-FIX-OPENSUSE webkit2gtk3-fdo-soname.patch mgorse@suse.com -- don't call dlopen with an unversioned soname.
 Patch0:         webkit2gtk3-fdo-soname.patch
-# PATCH-NEEDS-REBASE webkit-process.patch boo#1159329 mgorse@suse.com -- use single web process for evolution and geary. WAS PATCH-FIX-OPENSUSE
+# PATCH-FIX-OPENSUSE webkit-process.patch boo#1159329 mgorse@suse.com -- use single web process for evolution and geary.
 Patch1:         webkit-process.patch
 
 BuildRequires:  Mesa-libEGL-devel
@@ -52,7 +52,7 @@ BuildRequires:  Mesa-libGLESv1_CM-devel
 BuildRequires:  Mesa-libGLESv2-devel
 BuildRequires:  Mesa-libGLESv3-devel
 BuildRequires:  bison >= 2.3
-%if 0%{?suse_version} > 1510
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
 BuildRequires:  bubblewrap
 %endif
 BuildRequires:  cmake
@@ -66,7 +66,7 @@ BuildRequires:  ninja
 BuildRequires:  perl >= 5.10.0
 BuildRequires:  pkgconfig
 BuildRequires:  ruby >= 1.8.7
-%if 0%{?suse_version} > 1510
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
 BuildRequires:  xdg-dbus-proxy
 %endif
 BuildRequires:  pkgconfig(atk)
@@ -102,7 +102,7 @@ BuildRequires:  pkgconfig(libxml-2.0) >= 2.8.0
 BuildRequires:  pkgconfig(libxslt) >= 1.1.7
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(upower-glib)
-%if 0%{?suse_version} > 1510
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
 BuildRequires:  pkgconfig(wpe-1.0) >= 1.3.0
 BuildRequires:  pkgconfig(wpebackend-fdo-1.0) >= 1.3.0
 %endif
@@ -134,11 +134,11 @@ more.
 Summary:        Library for rendering web content, GTK+ Port
 # Require the injected bundles. The bundles are dlopen()ed
 Group:          System/Libraries
-%if 0%{?suse_version} > 1510
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
 Requires:       bubblewrap
 %endif
 Requires:       webkit2gtk-4_0-injected-bundles
-%if 0%{?suse_version} > 1510
+%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
 Requires:       xdg-dbus-proxy
 %endif
 Provides:       %{_pkgname_no_slpp} = %{version}
@@ -271,9 +271,8 @@ A small test browswer from webkit, useful for testing features.
 %prep
 %setup -n webkitgtk-%{version}
 %patch0 -p1
-%if 0%{?suse_version} <= 1500
+%if 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150200
-# Needs rebase or dropping + it should not be applied for Leap 15.2
+%patch1 -p1
-#%%patch1 -p1
 %endif
 
 %build
@@ -286,7 +285,7 @@ cat /proc/meminfo
 echo "System limits:"
 ulimit -a
 if test -n "$max_link_jobs" -a "$max_link_jobs" -gt 1 ; then
-    mem_per_process=1300000
+        mem_per_process=1500000
     max_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo)
     max_jobs="$(($max_mem / $mem_per_process))"
     test "$max_link_jobs" -gt "$max_jobs" && max_link_jobs="$max_jobs" && echo "Warning: Reducing number of link jobs to $max_jobs because of memory limits"
@@ -313,15 +312,15 @@ export PYTHON=%{_bindir}/python3
   -DUSE_WOFF2=false \
   -DENABLE_MEDIA_SOURCE=OFF \
 %endif
-%if 0%{?suse_version} <= 1510
+%if 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150200
   -DUSE_WPE_RENDERER=OFF \
   -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
 %endif
   -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
-%ifarch armv6hl ppc ppc64 ppc64le riscv64 s390 s390x
+%ifarch aarch64
   -DENABLE_JIT=OFF \
+  -DUSE_SYSTEM_MALLOC=ON \
 %endif
-  -DUSE_SYSTEM_MALLOC=OFF \
 
 %ninja_build -j $max_link_jobs
 

webkitgtk-2.28.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:361f3d178f62a9c112cbadfedd46106c34455c26d57a12a28fb3b09178d20e8b
-size 21425084

webkitgtk-2.28.0.tar.xz.asc

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

webkitgtk-2.28.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:acbc26a3ed5c13f39e46875cf447a9c0541b6cfb17f9e7884323431cb327f3d8
+size 21427628

webkitgtk-2.28.1.tar.xz.asc

@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCXpQm+gAKCRDz0yLQ7EWC
+w9eyAKDu1f4tpuCk2McX1/xtl6j0fhnqzQCgwnBm6zCq4XjHM6NuBgKnwuUVbvk=
+=bOYI
+-----END PGP SIGNATURE-----