Accepting request 967369 from GNOME:Next

- Drop webkit2gtk3-gcc12.patch. It isn't needed anymore, since the
  relevant gcc change has been reverted for now.
- Update some minimum version requirements to match cmake checks.
- Remove build requirements on geoclue and libbrotlidec: they are
  no longer build-time dependencies. Add geoclue2 to Recommends.

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

webkit2gtk3-gcc12.patch

@@ -1,73 +0,0 @@
-From 0a17a235d9f56d9107a3e87a42bdcff4c43806a7 Mon Sep 17 00:00:00 2001
-From: Mike Gorse <mgorse@suse.com>
-Date: Wed, 30 Mar 2022 13:07:47 -0500
-Subject: [PATCH] Add default constructors needed to build with gcc 12
-
----
- Source/JavaScriptCore/ChangeLog                   | 11 +++++++++++
- Source/JavaScriptCore/runtime/SamplingProfiler.h  | 15 +++++++++++----
- Source/WebCore/ChangeLog                          | 10 ++++++++++
- .../platform/graphics/ColorInterpolationMethod.h  | 10 +++++++++-
- 4 files changed, 41 insertions(+), 5 deletions(-)
-
-diff --git a/Source/JavaScriptCore/runtime/SamplingProfiler.h b/Source/JavaScriptCore/runtime/SamplingProfiler.h
-index 64415967ab7f..87ecbb4e7bd0 100644
---- a/Source/JavaScriptCore/runtime/SamplingProfiler.h
-+++ b/Source/JavaScriptCore/runtime/SamplingProfiler.h
-@@ -106,6 +106,13 @@ public:
-         BytecodeIndex wasmOffset;
- 
-         struct CodeLocation {
-+            CodeLocation()
-+            : lineNumber { std::numeric_limits<unsigned>::max() },
-+              columnNumber { std::numeric_limits<unsigned>::max() },
-+              jitType { JITType::None },
-+              isRegExp { false }
-+            { }
-+
-             bool hasCodeBlockHash() const
-             {
-                 return codeBlockHash.isSet();
-@@ -123,12 +130,12 @@ public:
-             }
- 
-             // These attempt to be expression-level line and column number.
--            unsigned lineNumber { std::numeric_limits<unsigned>::max() };
--            unsigned columnNumber { std::numeric_limits<unsigned>::max() };
-+            unsigned lineNumber;
-+            unsigned columnNumber;
-             BytecodeIndex bytecodeIndex;
-             CodeBlockHash codeBlockHash;
--            JITType jitType { JITType::None };
--            bool isRegExp { false };
-+            JITType jitType;
-+            bool isRegExp;
-         };
- 
-         CodeLocation semanticLocation;
-diff --git a/Source/WebCore/platform/graphics/ColorInterpolationMethod.h b/Source/WebCore/platform/graphics/ColorInterpolationMethod.h
-index ee6cba0d1d3a..990251d82a23 100644
---- a/Source/WebCore/platform/graphics/ColorInterpolationMethod.h
-+++ b/Source/WebCore/platform/graphics/ColorInterpolationMethod.h
-@@ -57,9 +57,17 @@ enum class ColorInterpolationColorSpace : uint8_t {
-     
- struct ColorInterpolationMethod {
-     struct HSL {
-+        HSL()
-+        : hueInterpolationMethod { HueInterpolationMethod::Shorter}
-+        { }
-+
-+        HSL(HueInterpolationMethod method)
-+        : hueInterpolationMethod(method)
-+        { }
-+
-         static constexpr auto interpolationColorSpace = ColorInterpolationColorSpace::HSL;
-         using ColorType = WebCore::HSLA<float>;
--        HueInterpolationMethod hueInterpolationMethod = HueInterpolationMethod::Shorter;
-+        HueInterpolationMethod hueInterpolationMethod;
-     };
-     struct HWB {
-         static constexpr auto interpolationColorSpace = ColorInterpolationColorSpace::HWB;
--- 
-2.35.1
-

webkit2gtk3.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Apr  6 15:12:09 UTC 2022 - Michael Gorse <mgorse@suse.com>
+
+- Drop webkit2gtk3-gcc12.patch. It isn't needed anymore, since the
+  relevant gcc change has been reverted for now.
+- Update some minimum version requirements to match cmake checks.
+- Remove build requirements on geoclue and libbrotlidec: they are
+  no longer build-time dependencies. Add geoclue2 to Recommends.
+
 -------------------------------------------------------------------
 Wed Mar 30 18:04:39 UTC 2022 - Michael Gorse <mgorse@suse.com>
 

webkit2gtk3.spec

@@ -88,8 +88,6 @@ Source99:       webkit2gtk3.keyring
 
 # PATCH-FIX-OPENSUSE no-forced-sse.patch jengelh@iani.de -- cure execution of illegal instruction in i586 webkit
 Patch0:         no-forced-sse.patch
-# PATCH-FIX-UPSTREAM webkit2gtk3-gcc12.patch boo#1197584 webkit#238482 mgorse@suse.com -- fix the build with gcc 12.
-Patch1:         webkit2gtk3-gcc12.patch
 
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGL-devel
@@ -102,9 +100,9 @@ BuildRequires:  cmake
 BuildRequires:  enchant-devel
 BuildRequires:  flex
 %if %usegcc10
-BuildRequires:  gcc10-c++ >= 4.9
+BuildRequires:  gcc10-c++
 %else
-BuildRequires:  gcc-c++ >= 7.3
+BuildRequires:  gcc-c++ >= 8.3
 %endif
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gperf >= 3.0.1
@@ -117,15 +115,14 @@ BuildRequires:  openjpeg2-devel
 BuildRequires:  perl >= 5.10.0
 BuildRequires:  pkgconfig
 BuildRequires:  python3
-BuildRequires:  ruby >= 1.8.7
+BuildRequires:  ruby >= 1.9
 BuildRequires:  xdg-dbus-proxy
 BuildRequires:  pkgconfig(atk)
 BuildRequires:  pkgconfig(atspi-2) >= 2.5.3
-BuildRequires:  pkgconfig(cairo) >= 1.10.2
+BuildRequires:  pkgconfig(cairo) >= 1.14.0
 BuildRequires:  pkgconfig(fontconfig) >= 2.8.0
 BuildRequires:  pkgconfig(freetype2) >= 2.4.2
-BuildRequires:  pkgconfig(geoclue-2.0) >= 2.1.5
+BuildRequires:  pkgconfig(glib-2.0) >= 2.56.4
-BuildRequires:  pkgconfig(glib-2.0) >= 2.44
 %if %usegcc10
 BuildRequires:  pkgconfig(glproto)
 %endif
@@ -149,10 +146,9 @@ BuildRequires:  pkgconfig(gtk4) >= 3.98.50
 BuildRequires:  pkgconfig(xcomposite)
 %endif
 BuildRequires:  pkgconfig(gudev-1.0)
-BuildRequires:  pkgconfig(harfbuzz) >= 0.9.2
+BuildRequires:  pkgconfig(harfbuzz) >= 0.9.18
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libavif) >= 0.9.0
-BuildRequires:  pkgconfig(libbrotlidec) >= 1.0.1
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libseccomp)
@@ -160,7 +156,7 @@ BuildRequires:  pkgconfig(libsecret-1)
 %if %{_usesoup2}
 BuildRequires:  pkgconfig(libsoup-2.4) >= 2.54.0
 %else
-BuildRequires:  pkgconfig(libsoup-3.0) >= 2.99.9
+BuildRequires:  pkgconfig(libsoup-3.0) >= 3.0.0
 %endif
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libwebp)
@@ -172,7 +168,7 @@ BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(upower-glib)
 BuildRequires:  pkgconfig(wayland-protocols)
 BuildRequires:  pkgconfig(wpe-1.0) >= 1.3.0
-BuildRequires:  pkgconfig(wpebackend-fdo-1.0) >= 1.3.0
+BuildRequires:  pkgconfig(wpebackend-fdo-1.0) >= 1.6.0
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(zlib)
 %if %{_gold_linker}
@@ -199,6 +195,7 @@ Requires:       xdg-dbus-proxy
 Provides:       %{_pkgname_no_slpp} = %{version}
 Provides:       WebKit2GTK-%{_apiver}
 Obsoletes:      webkit2gtk3-plugin-process-gtk2 < %{version}
+Recommends:     geoclue2
 Recommends:     gstreamer-plugins-bad
 Recommends:     gstreamer-plugins-good
 Recommends:     xdg-desktop-portal-gtk