Accepting request 882741 from GNOME:Next

- Update to version 2.32.0 (boo#1184155):

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

old-wayland-scanner.patch

@@ -1,29 +0,0 @@
-diff -urp webkitgtk-2.30.3.orig/Source/WebKit/PlatformGTK.cmake webkitgtk-2.30.3/Source/WebKit/PlatformGTK.cmake
---- webkitgtk-2.30.3.orig/Source/WebKit/PlatformGTK.cmake	2020-09-11 03:11:29.000000000 -0500
-+++ webkitgtk-2.30.3/Source/WebKit/PlatformGTK.cmake	2020-12-02 14:05:01.252761221 -0600
-@@ -572,14 +572,14 @@ if (ENABLE_WAYLAND_TARGET)
-         DEPENDS ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml
-         COMMAND ${WAYLAND_SCANNER} server-header ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandServerProtocol.h
-         COMMAND ${WAYLAND_SCANNER} client-header ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.h
--        COMMAND ${WAYLAND_SCANNER} private-code ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.c
-+        COMMAND ${WAYLAND_SCANNER} code ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.c
-         VERBATIM
-     )
- 
-     add_custom_command(
-         OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/pointer-constraints-unstable-v1-protocol.c
-         DEPENDS ${WAYLAND_PROTOCOLS_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
--        COMMAND ${WAYLAND_SCANNER} private-code ${WAYLAND_PROTOCOLS_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/pointer-constraints-unstable-v1-protocol.c
-+        COMMAND ${WAYLAND_SCANNER} code ${WAYLAND_PROTOCOLS_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/pointer-constraints-unstable-v1-protocol.c
-         COMMAND ${WAYLAND_SCANNER} client-header ${WAYLAND_PROTOCOLS_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/pointer-constraints-unstable-v1-client-protocol.h
-         VERBATIM
-     )
-@@ -587,7 +587,7 @@ if (ENABLE_WAYLAND_TARGET)
-     add_custom_command(
-         OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/relative-pointer-unstable-v1-protocol.c
-         DEPENDS ${WAYLAND_PROTOCOLS_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml
--        COMMAND ${WAYLAND_SCANNER} private-code ${WAYLAND_PROTOCOLS_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/relative-pointer-unstable-v1-protocol.c
-+        COMMAND ${WAYLAND_SCANNER} code ${WAYLAND_PROTOCOLS_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/relative-pointer-unstable-v1-protocol.c
-         COMMAND ${WAYLAND_SCANNER} client-header ${WAYLAND_PROTOCOLS_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/relative-pointer-unstable-v1-client-protocol.h
-         VERBATIM
-     )

webkit-process.patch

@@ -1,22 +0,0 @@
-diff -urp webkitgtk-2.30.3.orig/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp webkitgtk-2.30.3/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
---- webkitgtk-2.30.3.orig/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp	2020-09-18 03:34:08.000000000 -0500
-+++ webkitgtk-2.30.3/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp	2020-11-20 16:25:05.830587831 -0600
-@@ -397,8 +397,16 @@ static void webkitWebContextConstructed(
-     configuration.setProcessSwapsOnNavigation(priv->psonEnabled);
-     if (!priv->psonEnabled) {
-         const char* useSingleWebProcess = getenv("WEBKIT_USE_SINGLE_WEB_PROCESS");
--        if (useSingleWebProcess && strcmp(useSingleWebProcess, "0"))
--            configuration.setUsesSingleWebProcess(true);
-+        if (useSingleWebProcess) {
-+            if (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);
-+            }
-+        }
-     }
- 
- #if !USE(GTK4)

webkit2gtk3.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Apr  2 17:34:41 UTC 2021 - Michael Gorse <mgorse@suse.com>
+
+- Update to version 2.32.0 (boo#1184155):
+  + Fix the authentication request port when URL omits the port.
+  + Fix iframe scrolling when main frame is scrolled in async
+    scrolling mode.
+  + Stop using g_memdup.
+  + Show a warning message when overriding signal handler for
+    threading suspension.
+  - Fix the build on RISC-V with GCC 11.
+  - Fix several crashes and rendering issues.
+  + Security fixes: CVE-2021-1788, CVE-2021-1844, CVE-2021-1871
+- Drop old-wayland-scanner.patch and webkit-process.patch, and also
+  drop support for Leap 15.0 and 15.1, since they are no longer
+  supported.
+
 -------------------------------------------------------------------
 Tue Mar 23 02:31:51 UTC 2021 - Michael Gorse <mgorse@suse.com>
 
@@ -56,9 +73,11 @@ Mon Mar 22 02:31:01 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
 -------------------------------------------------------------------
 Sun Mar 21 20:33:09 UTC 2021 - Michael Gorse <mgorse@suse.com>
 
-- Update to version 2.30.6:
+- Update to version 2.30.6 (boo#1184262):
   + Update user agent quirks again for Google Docs and Google Drive.
   + Fix several crashes and rendering issues.
+  + Security fixes: CVE-2020-27918, CVE-2020-29623, CVE-2021-1765
+  CVE-2021-1789, CVE-2021-1799, CVE-2021-1801, CVE-2021-1870.
 
 -------------------------------------------------------------------
 Fri Feb 19 07:45:12 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
@@ -173,7 +192,7 @@ Mon Sep 14 23:28:52 UTC 2020 - Michael Gorse <mgorse@suse.com>
   + Fix NTLM authentication.
   + Don't try to use SHM on wayland with older wpebackend-fdo.
   + Fix the build due to seccomp.h header not found.
-  + Security fixes: CVE-2020-9948, CVE-2020-9951.
+  + Security fixes: CVE-2020-9947, CVE-2020-9948, CVE-2020-9951.
 - Drop seccomp-build-fix.patch and wpe-shm-check.patch: fixed
   upstream.
 

webkit2gtk3.spec

@@ -31,7 +31,7 @@
 %define _gold_linker 0
 %endif
 Name:           webkit2gtk3
-Version:        2.31.91
+Version:        2.32.0
 Release:        0
 Summary:        Library for rendering web content, GTK+ Port
 License:        BSD-3-Clause AND LGPL-2.0-or-later
@@ -45,35 +45,29 @@ Source99:       webkit2gtk3.keyring
 # PATCH-FIX-OPENSUSE no-forced-sse.patch jengelh@iani.de -- cure execution of illegal instruction in i586 firefox.
 Patch0:         no-forced-sse.patch
 
-# Below patches are for 15.0/15.1 only
-# PATCH-NEEDS-REBASE webkit-process.patch boo#1159329 mgorse@suse.com -- use single web process for evolution and geary (was: PATCH-FIX-OPENSUSE).
-Patch100:       webkit-process.patch
-# PATCH-FIX-OPENSUSE old-wayland-scanner.patch mgorse@suse.com -- pass code to wayland-scanner, rather than private-code
-Patch101:       old-wayland-scanner.patch
-
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGL-devel
 BuildRequires:  Mesa-libGLESv1_CM-devel
 BuildRequires:  Mesa-libGLESv2-devel
 BuildRequires:  Mesa-libGLESv3-devel
 BuildRequires:  bison >= 2.3
-%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
 BuildRequires:  bubblewrap
-%endif
 BuildRequires:  cmake
 BuildRequires:  enchant-devel
+BuildRequires:  gcc-c++ >= 4.9
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gperf >= 3.0.1
 BuildRequires:  hyphen-devel
 BuildRequires:  libicu-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  ninja
+BuildRequires:  openjpeg2
+BuildRequires:  openjpeg2-devel
 BuildRequires:  perl >= 5.10.0
 BuildRequires:  pkgconfig
+BuildRequires:  python3
 BuildRequires:  ruby >= 1.8.7
-%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
 BuildRequires:  xdg-dbus-proxy
-%endif
 BuildRequires:  pkgconfig(atk)
 BuildRequires:  pkgconfig(atspi-2) >= 2.5.3
 BuildRequires:  pkgconfig(cairo) >= 1.10.2
@@ -104,26 +98,16 @@ BuildRequires:  pkgconfig(libsecret-1)
 BuildRequires:  pkgconfig(libsoup-2.4) >= 2.61.90
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libwebp)
+BuildRequires:  pkgconfig(libwoff2dec)
 BuildRequires:  pkgconfig(libxml-2.0) >= 2.8.0
 BuildRequires:  pkgconfig(libxslt) >= 1.1.7
 BuildRequires:  pkgconfig(manette-0.2)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(upower-glib)
-%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
-BuildRequires:  gcc-c++ >= 4.9
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(zlib)
-%if 0%{?suse_version} >= 1500
-BuildRequires:  openjpeg2
-BuildRequires:  openjpeg2-devel
-%endif
-%if 0%{?suse_version} > 1500
-BuildRequires:  pkgconfig(libwoff2dec)
-%endif
-BuildRequires:  python3
 %if %{_gold_linker}
 BuildRequires:  binutils-gold
 %endif
@@ -141,14 +125,10 @@ 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} > 1500 || 0%{?sle_version} >= 150200
 Requires:       bubblewrap
-%endif
 Requires:       libjavascriptcoregtk%{_sover} = %{version}
 Requires:       webkit2gtk-4_0-injected-bundles
-%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
 Requires:       xdg-dbus-proxy
-%endif
 Provides:       %{_pkgname_no_slpp} = %{version}
 Obsoletes:      webkit2gtk3-plugin-process-gtk2
 
@@ -277,12 +257,7 @@ A small test browswer from webkit, useful for testing features.
 %lang_package -n %{_pkgname_no_slpp}
 
 %prep
-%setup -q -n webkitgtk-%{version}
+%autosetup -p1 -n webkitgtk-%{version}
-%patch0 -p1
-%if 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150200
-#%patch100 -p1
-%patch101 -p1
-%endif
 
 %build
 %define _lto_cflags %{nil}
@@ -317,14 +292,6 @@ export PYTHON=%{_bindir}/python3
   -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \
   -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \
   -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \
-%if 0%{?suse_version} <= 1500
-  -DUSE_WOFF2=false \
-  -DENABLE_MEDIA_SOURCE=OFF \
-%endif
-%if 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150200
-  -DUSE_WPE_RENDERER=OFF \
-  -DENABLE_BUBBLEWRAP_SANDBOX=OFF \
-%endif
   -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
 %ifarch aarch64
   -DENABLE_JIT=OFF \

webkitgtk-2.31.91.tar.xz

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

webkitgtk-2.31.91.tar.xz.asc

@@ -1,6 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYEtgiQAKCRDz0yLQ7EWC
-wwcQAJ9AwE9Fl+BlVcmZmDUtopye4M8pCACgoPfE/LSiYcB5/cIGodVFy6z/Y/8=
-=ipus
------END PGP SIGNATURE-----

webkitgtk-2.32.0.tar.xz

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

webkitgtk-2.32.0.tar.xz.asc

@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYF28swAKCRDz0yLQ7EWC
+w7ylAJ9lCKFu4UValdmiFJVKeXG9EVZ6bACg0Hjy7JgESd7mTyMoeCDgHQbVJr4=
+=rWIy
+-----END PGP SIGNATURE-----