The package rpms/webkit2gtk4.0.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/webkit2gtk4.0.git/commit/?id=493c....
Change:
-%ifarch aarch64
Thanks.
Full change:
============
commit 1b6436ca922408506d2e9f05fa9066bb006a9a7c
Author: Pete Walter <pwalter(a)fedoraproject.org>
Date: Sat Apr 27 22:57:12 2024 +0100
Update to 2.44.1
Notably, the documentation has moved, and the dependency on libwpe and
wpebackend-fdo is gone.
diff --git a/.gitignore b/.gitignore
index c4adc8f..3066aa5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
/webkitgtk-2.42.4.tar.xz.asc
/webkitgtk-2.42.5.tar.xz
/webkitgtk-2.42.5.tar.xz.asc
+/webkitgtk-2.44.1.tar.xz
+/webkitgtk-2.44.1.tar.xz.asc
diff --git a/i686-build.patch b/i686-build.patch
deleted file mode 100644
index 1b5ec0d..0000000
--- a/i686-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Alberto Garcia <berto(a)igalia.com>
-Subject: Fix FTBFS in i386
-Bug:
https://bugs.webkit.org/show_bug.cgi?id=268739
-Index: webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-===================================================================
---- webkitgtk.orig/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-+++ webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
-@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpc
- UNUSED_VARIABLE(t2);
- UNUSED_VARIABLE(t3);
- UNUSED_VARIABLE(t5);
-- UNUSED_VARIABLE(t6);
-- UNUSED_VARIABLE(t7);
-
- struct StackPointerScope {
- StackPointerScope(CLoopStack& stack)
diff --git a/sources b/sources
index 5daca3a..f6daeb0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.42.5.tar.xz) =
9b992b1156a87b503deec4640ee9383227c7341910f1b33b7cba03d32194b36aa61de6ae3e8a58c23adcab74e71b78d1c8d4124f32bffc4dd58d93931fb94ef0
-SHA512 (webkitgtk-2.42.5.tar.xz.asc) =
9de7c3f7c75319e7d9a37cdf4929e392adb770a65acfdbb48e4288af66e1f6ef7372379e0d08f952b9a184a324e27e73fd64c5b7635aeef785cc3c8bdf4775a7
+SHA512 (webkitgtk-2.44.1.tar.xz) =
b1752303f9ee38ef98c1e5c0cad001d389eaedbbf07d13fed8699104e6e311cb47a9bed7089868cb92c53d2777aaff441147353da13123d5c8eee4adf8709169
+SHA512 (webkitgtk-2.44.1.tar.xz.asc) =
2d2ab4a903ff3e8eeb128b2e7a182d073fc12e14d4b8f2668aaafc638f194e2fa3cf707c040f679f320636c1398dd11df2b6e2941dd3580b8032ea30b604c711
diff --git a/webkit2gtk4.0.spec b/webkit2gtk4.0.spec
index 8021629..cafb2cc 100644
--- a/webkit2gtk4.0.spec
+++ b/webkit2gtk4.0.spec
@@ -11,7 +11,7 @@
%bcond_without docs
Name: webkit2gtk4.0
-Version: 2.42.5
+Version: 2.44.1
Release: %autorelease
Summary: WebKitGTK for GTK 3 and libsoup 2
@@ -49,9 +49,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
-#
https://bugs.webkit.org/show_bug.cgi?id=268739
-Patch: i686-build.patch
-
BuildRequires: bison
BuildRequires: bubblewrap
BuildRequires: cmake
@@ -69,6 +66,7 @@ BuildRequires: openssl-devel
BuildRequires: perl(English)
BuildRequires: perl(FindBin)
BuildRequires: perl(JSON::PP)
+BuildRequires: perl(bigint)
BuildRequires: python3
BuildRequires: ruby
BuildRequires: rubygems
@@ -100,7 +98,6 @@ BuildRequires: pkgconfig(libgcrypt)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libjxl)
BuildRequires: pkgconfig(libnotify)
-BuildRequires: pkgconfig(libopenjp2)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libsecret-1)
@@ -117,8 +114,6 @@ 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)
BuildRequires: pkgconfig(xt)
Requires: javascriptcoregtk4.0%{?_isa} = %{version}-%{release}
@@ -242,6 +237,7 @@ files for developing applications that use JavaScript engine from
webkit2gtk-4.0
-DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \
-DUSE_GTK4=OFF \
+ -DUSE_LIBBACKTRACE=OFF \
-DUSE_SOUP2=ON \
-DENABLE_WEBDRIVER=OFF \
%if %{without docs}
@@ -317,11 +313,10 @@ export NINJA_STATUS="[%f/%t %es] "
%if %{with docs}
%files doc
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/javascriptcoregtk-4.0/
-%{_datadir}/gtk-doc/html/webkit2gtk-4.0/
-%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.0/
+%dir %{_datadir}/doc
+%{_datadir}/doc/javascriptcoregtk-4.0/
+%{_datadir}/doc/webkit2gtk-4.0/
+%{_datadir}/doc/webkit2gtk-web-extension-4.0/
%endif
%changelog
commit 5cfc24ef0e67fcafbcb13cf74b1f3081e6d3235c
Author: Michael Catanzaro <mcatanzaro(a)redhat.com>
Date: Thu Apr 11 11:39:42 2024 -0500
Attempt to reenable LTO
Let's see whether this builds. Probably not.
(Actually, it did build. Yippee!)
diff --git a/webkit2gtk4.0.spec b/webkit2gtk4.0.spec
index 19ca21d..8021629 100644
--- a/webkit2gtk4.0.spec
+++ b/webkit2gtk4.0.spec
@@ -5,8 +5,6 @@
mkdir -p _license_files ; \
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
-%global _lto_cflags %{nil}
-
# 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!
commit 493c2ecacfc61a7f092d17b75ebca8e57229fd76
Author: Michael Catanzaro <mcatanzaro(a)redhat.com>
Date: Thu Apr 11 11:35:45 2024 -0500
Remove RHEL conditions from spec file
WebKitGTK is no longer part of ELN, so these are no longer needed.
It's probably desired in EPEL, but extra dependencies can be packaged
for EPEL.
Note that -DUSE_64KB_PAGE_BLOCK=ON is also no longer needed because the
relevant aarch64 builders are using Fedora and 4 KB page sizes. This
significantly improves both security and performance of the aarch64
builds.
diff --git a/webkit2gtk4.0.spec b/webkit2gtk4.0.spec
index 08d6088..19ca21d 100644
--- a/webkit2gtk4.0.spec
+++ b/webkit2gtk4.0.spec
@@ -5,11 +5,6 @@
mkdir -p _license_files ; \
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
-# No libmanette in RHEL
-%if !0%{?rhel}
-%global with_gamepad 1
-%endif
-
%global _lto_cflags %{nil}
# Build documentation by default (use `rpmbuild --without docs` to override it).
@@ -117,9 +112,7 @@ BuildRequires: pkgconfig(libtasn1)
BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(libwoff2dec)
BuildRequires: pkgconfig(libxslt)
-%if 0%{?with_gamepad}
BuildRequires: pkgconfig(manette-0.2)
-%endif
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(wayland-client)
@@ -255,14 +248,6 @@ files for developing applications that use JavaScript engine from
webkit2gtk-4.0
-DENABLE_WEBDRIVER=OFF \
%if %{without docs}
-DENABLE_DOCUMENTATION=OFF \
-%endif
-%if !0%{?with_gamepad}
- -DENABLE_GAMEPAD=OFF \
-%endif
-%if 0%{?rhel}
-%ifarch aarch64
- -DUSE_64KB_PAGE_BLOCK=ON \
-%endif
%endif
%{nil}
commit b8eec819e1fc5a4cd8add5d3c77117e425aa6638
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Mar 13 03:08:35 2024 +0000
Rebuild for jpegxl (libjxl) 0.10.2
commit 034fe06bb7e4a54a50cb6f291e19f6ccd946eafe
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Feb 14 02:49:38 2024 +0000
Rebuild for jpegxl (libjxl) 0.9.2 with soname bump