Update to 2.38.2

Also, ENABLE_MINIBROWSER is now default

.gitignore

@@ -87,3 +87,41 @@
 /webkitgtk-2.34.0.tar.xz.asc
 /webkitgtk-2.34.1.tar.xz
 /webkitgtk-2.34.1.tar.xz.asc
+/webkitgtk-2.34.2.tar.xz
+/webkitgtk-2.34.2.tar.xz.asc
+/webkitgtk-2.34.4.tar.xz
+/webkitgtk-2.34.4.tar.xz.asc
+/webkitgtk-2.34.5.tar.xz
+/webkitgtk-2.34.5.tar.xz.asc
+/webkitgtk-2.34.6.tar.xz
+/webkitgtk-2.34.6.tar.xz.asc
+/webkitgtk-2.35.1.tar.xz
+/webkitgtk-2.35.1.tar.xz.asc
+/webkitgtk-2.35.2.tar.xz
+/webkitgtk-2.35.2.tar.xz.asc
+/webkitgtk-2.35.3.tar.xz
+/webkitgtk-2.35.3.tar.xz.asc
+/webkitgtk-2.35.90.tar.xz
+/webkitgtk-2.35.90.tar.xz.asc
+/webkitgtk-2.36.0.tar.xz
+/webkitgtk-2.36.0.tar.xz.asc
+/webkitgtk-2.36.1.tar.xz
+/webkitgtk-2.36.1.tar.xz.asc
+/webkitgtk-2.36.2.tar.xz
+/webkitgtk-2.36.2.tar.xz.asc
+/webkitgtk-2.36.3.tar.xz
+/webkitgtk-2.36.3.tar.xz.asc
+/webkitgtk-2.36.4.tar.xz
+/webkitgtk-2.36.4.tar.xz.asc
+/webkitgtk-2.36.5.tar.xz
+/webkitgtk-2.36.5.tar.xz.asc
+/webkitgtk-2.36.6.tar.xz
+/webkitgtk-2.36.6.tar.xz.asc
+/webkitgtk-2.36.7.tar.xz
+/webkitgtk-2.36.7.tar.xz.asc
+/webkitgtk-2.38.0.tar.xz
+/webkitgtk-2.38.0.tar.xz.asc
+/webkitgtk-2.38.1.tar.xz
+/webkitgtk-2.38.1.tar.xz.asc
+/webkitgtk-2.38.2.tar.xz
+/webkitgtk-2.38.2.tar.xz.asc

sources

@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.34.1.tar.xz) = 13f42ecd474c013640233421abe63f55eefa7a5e62d080897197c4f1cde68a2584472586b41ba4d7a1d84a2e08311521c68d259daafcb9386b7164a49a7386ed
-SHA512 (webkitgtk-2.34.1.tar.xz.asc) = 6c89bbe389c7e951fe03c5995fff132986a2807db38a90f3d9463acffaa250d9deb906e72b60af48a4a49915e6c5393a0adaed3f170b203f993c15b353e52831
+SHA512 (webkitgtk-2.38.2.tar.xz) = 177e792ce10e3c03e9b1e11459f03433cf70ad2a505a3bcca0542c4f9e77b1171953cf0cf1c3bcde0559bd5935167fac50f7dbac948635392ea663b3bb4b1c37
+SHA512 (webkitgtk-2.38.2.tar.xz.asc) = 3a48e6622ea65ed4e4b1c4e004d805992e232c37eb8966c987cf496ec31c708837e58f8ae24f42e3e60ec8e85bbfb08c6c519bbec2fb0488da6a9c3e2cb41f01

webkit2gtk3.spec

@@ -16,7 +16,7 @@
 %bcond_without docs
 
 Name:           webkit2gtk3
-Version:        2.34.1
+Version:        2.38.2
 Release:        %autorelease
 Summary:        GTK Web content engine library
 
@@ -24,10 +24,10 @@ License:        LGPLv2
 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
-# $ gpg --import 0xF3D322D0EC4582C3.asc
-# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 > gpgkey-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg
-Source2:        gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg
+# Use the keys from https://webkitgtk.org/verifying.html
+# $ gpg --import aperez.key carlosgc.key
+# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
+Source2:        webkitgtk-keys.gpg
 
 BuildRequires:  bison
 BuildRequires:  bubblewrap
@@ -35,10 +35,10 @@ BuildRequires:  cmake
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
+BuildRequires:  gi-docgen
 BuildRequires:  git
 BuildRequires:  gnupg2
 BuildRequires:  gperf
-BuildRequires:  gtk-doc
 BuildRequires:  hyphen-devel
 BuildRequires:  libatomic
 BuildRequires:  ninja-build
@@ -90,6 +90,7 @@ BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(upower-glib)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(wayland-protocols)
 BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(wpe-1.0)
 BuildRequires:  pkgconfig(wpebackend-fdo-1.0)
@@ -103,7 +104,7 @@ Requires:       xdg-dbus-proxy
 Recommends:     geoclue2
 
 # Needed for various GStreamer elements.
-Recommends:     gstreamer1-plugins-bad-freeworld
+Recommends:     gstreamer1-plugins-bad-free
 Recommends:     gstreamer1-plugins-good
 
 # If no xdg-desktop-portal backend is installed, many features will be broken
@@ -111,6 +112,24 @@ Recommends:     gstreamer1-plugins-good
 # desktop settings access, including font settings.
 Recommends:     xdg-desktop-portal-gtk
 
+# Obsolete libwebkit2gtk from the webkitgtk3 package
+Obsoletes:      libwebkit2gtk < 2.5.0
+Provides:       libwebkit2gtk = %{version}-%{release}
+
+# This package was renamed, so obsolete the old webkitgtk4 package
+Obsoletes:      webkitgtk4 < %{version}-%{release}
+Provides:       webkitgtk4 = %{version}-%{release}
+
+# GTK+ 2 plugins support was removed in 2.25.3
+Obsoletes:      webkit2gtk3-plugin-process-gtk2 < %{version}-%{release}
+Provides:       webkit2gtk3-plugin-process-gtk2 = %{version}-%{release}
+
+# In Fedora 37+, this package is renamed to webkit2gtk4.0. Add provides for the
+# new name so that other packages don't need to conditionalize their spec
+# files.
+Provides:       webkit2gtk4.0 = %{version}-%{release}
+Provides:       webkit2gtk4.0%{?_isa} = %{version}-%{release}
+
 # We're supposed to specify versions here, but these libraries don't do
 # normal releases. Accordingly, they're not suitable to be system libs.
 Provides:       bundled(angle)
@@ -135,6 +154,10 @@ Requires:       %{name}-jsc%{?_isa} = %{version}-%{release}
 Requires:       %{name}-jsc-devel%{?_isa} = %{version}-%{release}
 Obsoletes:      webkitgtk4-devel < %{version}-%{release}
 Provides:       webkitgtk4-devel = %{version}-%{release}
+# In Fedora 37+, this package is renamed to webkit2gtk4.0. Add provides for the
+# new name so that other packages don't need to conditionalize their spec
+# files.
+Provides:       webkit2gtk4.0-devel = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries, build data, and header
@@ -147,6 +170,10 @@ BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 Obsoletes:      webkitgtk4-doc < %{version}-%{release}
 Provides:       webkitgtk4-doc = %{version}-%{release}
+# In Fedora 37+, this package is renamed to webkit2gtk4.0. Add provides for the
+# new name so that other packages don't need to conditionalize their spec
+# files.
+Provides:       webkit2gtk4.0-doc = %{version}-%{release}
 
 %description    doc
 This package contains developer documentation for %{name}.
@@ -156,6 +183,10 @@ This package contains developer documentation for %{name}.
 Summary:        JavaScript engine from %{name}
 Obsoletes:      webkitgtk4-jsc < %{version}-%{release}
 Provides:       webkitgtk4-jsc = %{version}-%{release}
+# In Fedora 37+, this package is renamed to webkit2gtk4.0. Add provides for the
+# new name so that other packages don't need to conditionalize their spec
+# files.
+Provides:       javascriptcoregtk4.0 = %{version}-%{release}
 
 %description    jsc
 This package contains JavaScript engine from %{name}.
@@ -165,6 +196,10 @@ Summary:        Development files for JavaScript engine from %{name}
 Requires:       %{name}-jsc%{?_isa} = %{version}-%{release}
 Obsoletes:      webkitgtk4-jsc-devel < %{version}-%{release}
 Provides:       webkitgtk4-jsc-devel = %{version}-%{release}
+# In Fedora 37+, this package is renamed to webkit2gtk4.0. Add provides for the
+# new name so that other packages don't need to conditionalize their spec
+# files.
+Provides:       javascriptcoregtk4.0-devel = %{version}-%{release}
 
 %description    jsc-devel
 The %{name}-jsc-devel package contains libraries, build data, and header
@@ -188,19 +223,20 @@ rm -rf Source/ThirdParty/qunit/
 # is only needed for x86_64.
 %global _dwz_max_die_limit_x86_64 250000000
 
-# Decrease debuginfo even on ix86 because of:
-# https://bugs.webkit.org/show_bug.cgi?id=140176
+# Remove debuginfo to reduce memory consumption:            
+# https://bugs.webkit.org/show_bug.cgi?id=140176            
+# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/I6IVNA52TXTBRQLKW45CJ5K4RA4WNGMI/
 %ifarch s390x %{arm} %{ix86} %{power64} %{mips}
-# Decrease debuginfo verbosity to reduce memory consumption even more
-%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
+%global debug_package %{nil}            
+%global optflags %(echo %{optflags} | sed 's/-g /-g0 /')
 %endif
 
 %cmake \
   -GNinja \
   -DPORT=GTK \
   -DCMAKE_BUILD_TYPE=Release \
-  -DENABLE_MINIBROWSER=ON \
   -DUSE_SOUP2=ON \
+  -DUSE_LD_GOLD=OFF \
 %if %{with docs}
   -DENABLE_GTKDOC=ON \
 %endif
@@ -225,7 +261,6 @@ export NINJA_STATUS="[%f/%t][%e] "
 %add_to_license_files Source/JavaScriptCore/COPYING.LIB
 %add_to_license_files Source/ThirdParty/ANGLE/LICENSE
 %add_to_license_files Source/ThirdParty/ANGLE/src/common/third_party/smhasher/LICENSE
-%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/compiler/LICENSE
 %add_to_license_files Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/LICENSE
 %add_to_license_files Source/WebCore/LICENSE-APPLE
 %add_to_license_files Source/WebCore/LICENSE-LGPL-2
@@ -284,9 +319,9 @@ export NINJA_STATUS="[%f/%t][%e] "
 %files doc
 %dir %{_datadir}/gtk-doc
 %dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/jsc-glib-4.0/
+%{_datadir}/gtk-doc/html/javascriptcoregtk-4.0/
 %{_datadir}/gtk-doc/html/webkit2gtk-4.0/
-%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
+%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.0/
 %endif
 
 %changelog