Update to 2.38.1

Resolves: #2127467

.gitignore

@@ -103,3 +103,5 @@
 /webkitgtk-2.36.6.tar.xz.asc
 /webkitgtk-2.36.7.tar.xz
 /webkitgtk-2.36.7.tar.xz.asc
+/webkitgtk-2.38.1.tar.xz
+/webkitgtk-2.38.1.tar.xz.asc

aarch64-page-size.patch

@@ -1,19 +0,0 @@
-diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h
-index 9bb7fffcc1ae..3e1e24aa69f5 100644
---- a/Source/WTF/wtf/PageBlock.h
-+++ b/Source/WTF/wtf/PageBlock.h
-@@ -45,11 +45,11 @@ namespace WTF {
- // On Linux, Power systems normally use 64 KiB pages.
- //
- // Use 64 KiB for any unknown CPUs to be conservative.
--#if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64) || (OS(LINUX) && CPU(ARM64))
-+#if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64)
- constexpr size_t CeilingOnPageSize = 16 * KB;
--#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN)
-+#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) || CPU(ARM64)
- constexpr size_t CeilingOnPageSize = 64 * KB;
--#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(RISCV64)
-+#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(RISCV64)
- constexpr size_t CeilingOnPageSize = 4 * KB;
- #else
- #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture!

sources

@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.36.7.tar.xz) = e27975cf55b6be4cde2b34ed03fc717e6550dc495b444c781b3af0b32f7d580451de27ed41d74c6ff734b876118f22847096131168b0c8325031be84c1972888
+SHA512 (webkitgtk-2.38.1.tar.xz) = d81e85a5a43c33a63f88964907053888bb971c8fa1fe7fc90f71461c440458a21e09730c558be2b5efe42e02eb1c3d789a2571dc6d795f9c6d95fd499683a9e2
-SHA512 (webkitgtk-2.36.7.tar.xz.asc) = bdf24c4d76f4524a7baa7a40a318d0f46c42a6e840b6f396b43b542ef75a6201ecfe7020265eea773fd684e74c5ce7657c59deb7f3f004e6482c413df6d479c6
+SHA512 (webkitgtk-2.38.1.tar.xz.asc) = 08ed960ab697f02e70b6f1151f9e2d473c0aca4ff9b5fdedfa7cecf3c87375728aa22199d0b2b441d243d11e38698b771a9c57519962f45fef1111a346f944fd

webkit2gtk3.spec

@@ -10,13 +10,8 @@
 %global with_gamepad 1
 %endif
 
-# Build documentation by default (use `rpmbuild --without docs` to override it).
-# This is used by Coverity. Coverity injects custom compiler warnings, but
-# any warning during WebKit docs build is fatal!
-%bcond_without docs
-
 Name:           webkit2gtk3
-Version:        2.36.7
+Version:        2.38.1
 Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
@@ -29,12 +24,6 @@ Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
 # $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
 Source2:        webkitgtk-keys.gpg
 
-%if 0%{?rhel}
-# https://bugs.webkit.org/show_bug.cgi?id=217989
-# https://bugs.webkit.org/show_bug.cgi?id=227905
-Patch0:         aarch64-page-size.patch
-%endif
-
 BuildRequires:  bison
 BuildRequires:  bubblewrap
 BuildRequires:  cmake
@@ -44,7 +33,6 @@ BuildRequires:  gettext
 BuildRequires:  git
 BuildRequires:  gnupg2
 BuildRequires:  gperf
-BuildRequires:  gtk-doc
 BuildRequires:  hyphen-devel
 BuildRequires:  libatomic
 BuildRequires:  ninja-build
@@ -128,6 +116,10 @@ Provides:       webkitgtk4 = %{version}-%{release}
 Obsoletes:      webkit2gtk3-plugin-process-gtk2 < %{version}-%{release}
 Provides:       webkit2gtk3-plugin-process-gtk2 = %{version}-%{release}
 
+# Don't build documentation anymore to avoid gi-docgen dependency
+Obsoletes:      webkit2gtk3-doc < %{version}-%{release}
+Provides:       webkit2gtk3-doc = %{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)
@@ -157,18 +149,6 @@ Provides:       webkitgtk4-devel = %{version}-%{release}
 The %{name}-devel package contains libraries, build data, and header
 files for developing applications that use %{name}.
 
-%if %{with docs}
-%package        doc
-Summary:        Documentation files for %{name}
-BuildArch:      noarch
-Requires:       %{name} = %{version}-%{release}
-Obsoletes:      webkitgtk4-doc < %{version}-%{release}
-Provides:       webkitgtk4-doc = %{version}-%{release}
-
-%description    doc
-This package contains developer documentation for %{name}.
-%endif
-
 %package        jsc
 Summary:        JavaScript engine from %{name}
 Obsoletes:      webkitgtk4-jsc < %{version}-%{release}
@@ -224,11 +204,8 @@ rm -rf Source/ThirdParty/qunit/
   -GNinja \
   -DPORT=GTK \
   -DCMAKE_BUILD_TYPE=Release \
-  -DENABLE_MINIBROWSER=ON \
   -DUSE_SOUP2=ON \
-%if %{with docs}
+  -DENABLE_DOCUMENTATION=OFF \
-  -DENABLE_GTKDOC=ON \
-%endif
 %if !0%{?with_gamepad}
   -DENABLE_GAMEPAD=OFF \
 %endif
@@ -310,16 +287,11 @@ export NINJA_STATUS="[%f/%t][%e] "
 %dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
 
-%if %{with docs}
-%files doc
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/jsc-glib-4.0/
-%{_datadir}/gtk-doc/html/webkit2gtk-4.0/
-%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
-%endif
-
 %changelog
+* Mon Oct 24 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.1-1
+- Update to 2.38.1
+  Resolves: #2127467
+
 * Wed Aug 24 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.7-1
 - Update to 2.36.7
   Related: #2061996