Compare commits

..

7 Commits

Author SHA1 Message Date
David Abdurachmanov 880df7a0f3
Disable JIT and reduce debug information size
These are the same changes as in webkitgtk package.

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2024-05-22 15:36:35 +03:00
David Abdurachmanov 78eb3e50d4
Merge remote-tracking branch 'up/main' into main-riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2024-05-22 15:34:43 +03:00
Pete Walter 1b6436ca92 Update to 2.44.1
Notably, the documentation has moved, and the dependency on libwpe and
wpebackend-fdo is gone.
2024-04-27 23:15:50 +01:00
Michael Catanzaro 5cfc24ef0e Attempt to reenable LTO
Let's see whether this builds. Probably not.

(Actually, it did build. Yippee!)
2024-04-27 23:15:49 +01:00
Michael Catanzaro 493c2ecacf 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.
2024-04-27 23:15:22 +01:00
Sérgio M. Basto b8eec819e1 Rebuild for jpegxl (libjxl) 0.10.2 2024-03-13 03:08:35 +00:00
David Abdurachmanov 2649090ce2
Rebuilt for Fedora/RISCV (riscv64); adding .rvreX to Release:
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2024-03-02 14:14:55 +02:00
4 changed files with 19 additions and 48 deletions

2
.gitignore vendored
View File

@ -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

View File

@ -1,16 +0,0 @@
From: Alberto Garcia <berto@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)

View File

@ -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

View File

@ -5,21 +5,14 @@
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).
# This is used by Coverity. Coverity injects custom compiler warnings, but
# any warning during WebKit docs build is fatal!
%bcond_without docs
Name: webkit2gtk4.0
Version: 2.42.5
Release: %autorelease
Version: 2.44.1
Release: %autorelease -e 0.riscv64
Summary: WebKitGTK for GTK 3 and libsoup 2
# Source/bmalloc/bmalloc/*.h is BSD-2-Clause
@ -56,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
@ -76,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
@ -107,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,17 +107,13 @@ 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)
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}
@ -226,6 +212,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
# https://bugzilla.redhat.com/show_bug.cgi?id=1456261
%global _dwz_max_die_limit_x86_64 250000000
%global _dwz_max_die_limit_aarch64 250000000
%global _dwz_max_die_limit_riscv64 250000000
# Require 32 GB of RAM per vCPU for debuginfo processing. 16 GB is not enough.
%global _find_debuginfo_opts %limit_build -m 32768
@ -233,7 +220,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
# Reduce debuginfo verbosity 32-bit builds to reduce memory consumption even more.
# https://bugs.webkit.org/show_bug.cgi?id=140176
# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/I6IVNA52TXTBRQLKW45CJ5K4RA4WNGMI/
%ifarch %{ix86}
%ifarch %{ix86} riscv64
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%endif
@ -251,18 +238,17 @@ 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}
-DENABLE_DOCUMENTATION=OFF \
%endif
%if !0%{?with_gamepad}
-DENABLE_GAMEPAD=OFF \
%endif
%if 0%{?rhel}
%ifarch aarch64
-DUSE_64KB_PAGE_BLOCK=ON \
%endif
%ifarch riscv64
-DENABLE_JIT=OFF \
-DENABLE_WEBASSEMBLY=OFF \
-DENABLE_C_LOOP=OFF \
-DENABLE_SAMPLING_PROFILER=OFF \
%endif
%{nil}
@ -334,11 +320,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