import webkit2gtk3-2.38.5-1.el9

2023-03-28 12:28:17 +00:00 · 2023-03-28 12:28:17 +00:00 · 809e05af87
parent d372c01691
commit 809e05af87
6 changed files with 39 additions and 67 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/webkitgtk-2.36.7.tar.xz
+SOURCES/webkitgtk-2.38.5.tar.xz
 SOURCES/webkitgtk-keys.gpg
--- a/.webkit2gtk3.metadata
+++ b/.webkit2gtk3.metadata
@ -1,2 +1,2 @@
-36078148b6e0ef002f0279b25b1caf173f851ac8 SOURCES/webkitgtk-2.36.7.tar.xz
+1774390c628bb3a524d4ed76f11de4a878078db6 SOURCES/webkitgtk-2.38.5.tar.xz
 cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg
--- a/SOURCES/aarch64-page-size.patch
+++ b/SOURCES/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!
--- a/SOURCES/webkitgtk-2.36.7.tar.xz.asc
+++ b/SOURCES/webkitgtk-2.36.7.tar.xz.asc
@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYwaNMwAKCRCRxVnb5MkS
-OwFGAJ9cz5+l3fKydXxOgJWDLBvlavsI1ACfbkmK0bmhBExS7febO1y16Ftd91Q=
-=Zhg7
-----END PGP SIGNATURE-----
--- a/SOURCES/webkitgtk-2.38.5.tar.xz.asc
+++ b/SOURCES/webkitgtk-2.38.5.tar.xz.asc
@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCY+yu2QAKCRDz0yLQ7EWC
+w7UkAKCS0EoptKZRn3/Z+WgGerHQEQXaFQCg51h2++dwb1bqVZ05Q1YtHmoT2gk=
+=or/S
+-----END PGP SIGNATURE-----
--- a/SPECS/webkit2gtk3.spec
+++ b/SPECS/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.5
 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_GTKDOC=ON \
-%endif
+  -DENABLE_DOCUMENTATION=OFF \
 %if !0%{?with_gamepad}
  -DENABLE_GAMEPAD=OFF \
 %endif
@ -237,8 +214,7 @@ rm -rf Source/ThirdParty/qunit/
 %endif
 %if 0%{?rhel}
 %ifarch aarch64
-  -DENABLE_JIT=OFF \
-  -DUSE_SYSTEM_MALLOC=ON \
+  -DUSE_64KB_PAGE_BLOCK=ON \
 %endif
 %endif
  %{nil}
@ -310,16 +286,31 @@ 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
+* Wed Feb 15 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1
+- Update to 2.38.5
+  Related: #2127467
+
+* Thu Feb 02 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.4-1
+- Update to 2.38.4
+  Related: #2127467
+
+* Thu Dec 22 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.3-1
+- Update to 2.38.3
+  Related: #2127467
+
+* Fri Nov 04 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.2-1
+- Update to 2.38.2
+  Related: #2127467
+
+* Mon Oct 31 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.1-2
+- Fix use with aarch64 64 KiB page size
+  Related: #2127467
+
+* 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