Fix JavaScriptCore/offlineasm/riscv64.rb

Backport upstream fix.

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -28,3 +28,6 @@
 /webkitgtk-2.42.1.tar.xz.asc
 /webkitgtk-2.42.2.tar.xz.asc
 /webkitgtk-2.43.1.tar.xz.asc
+/webkitgtk-2.43.2.tar.xz.asc
+/webkitgtk-2.43.3.tar.xz.asc
+/webkitgtk-2.43.4.tar.xz.asc

6b46c24db81426c056f4f1f6fe915c2cdd687a1e.patch

@@ -0,0 +1,45 @@
+From 6b46c24db81426c056f4f1f6fe915c2cdd687a1e Mon Sep 17 00:00:00 2001
+From: luyahan <luyahan@qq.com>
+Date: Sat, 3 Feb 2024 23:39:01 -0800
+Subject: [PATCH] Fix build failed for riscv64
+ https://bugs.webkit.org/show_bug.cgi?id=266218
+
+Reviewed by Yusuke Suzuki.
+
+fix the build error
+
+* RISCV64.patch: Added.
+* Source/JavaScriptCore/assembler/RISCV64Assembler.h:
+* Source/JavaScriptCore/offlineasm/riscv64.rb:
+
+Canonical link: https://commits.webkit.org/274066@main
+---
+ Source/JavaScriptCore/assembler/RISCV64Assembler.h | 1 +
+ Source/JavaScriptCore/offlineasm/riscv64.rb        | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/assembler/RISCV64Assembler.h b/Source/JavaScriptCore/assembler/RISCV64Assembler.h
+index bdaef036b52a2..73332f2d645a4 100644
+--- a/Source/JavaScriptCore/assembler/RISCV64Assembler.h
++++ b/Source/JavaScriptCore/assembler/RISCV64Assembler.h
+@@ -28,6 +28,7 @@
+ #if ENABLE(ASSEMBLER) && CPU(RISCV64)
+ 
+ #include "AssemblerBuffer.h"
++#include "AssemblerCommon.h"
+ #include "RISCV64Registers.h"
+ #include <tuple>
+ 
+diff --git a/Source/JavaScriptCore/offlineasm/riscv64.rb b/Source/JavaScriptCore/offlineasm/riscv64.rb
+index 4abb1761509d1..bead518f07d44 100644
+--- a/Source/JavaScriptCore/offlineasm/riscv64.rb
++++ b/Source/JavaScriptCore/offlineasm/riscv64.rb
+@@ -1624,7 +1624,7 @@ def lowerRISCV64
+             riscv64ValidateOperands(operands, [RegisterID, RegisterID])
+             $asm.puts "#{rvop(opcode)} #{operands[1].riscv64Operand}, #{operands[0].riscv64Operand}"
+         when /^rv_b(eq|ne|gt|ge|gtu|geu|lt|le|ltu|leu)$/
+-            riscv64ValidateOperands(operands, [RegisterID, RegisterID, LocalLabelReference])
++            riscv64ValidateOperands(operands, [RegisterID, RegisterID, LocalLabelReference], [RegisterID, RegisterID, LabelReference])
+             $asm.puts "#{rvop(opcode)} #{operands[0].riscv64Operand}, #{operands[1].riscv64Operand}, #{operands[2].asmLabel}"
+         when /^rv_b(eqz|nez|lez|ltz|gez|gtz)$/
+             riscv64ValidateOperands(operands, [RegisterID, LocalLabelReference])

sources

@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.43.1.tar.xz.asc) = 53b7a2c141edade9733c556b9662cd51d4ff23f2605d7c0b49ecbc5f20e6802eb9fb0061c236d18aa90767d55531a2fd6f591af1c06aeb5caadd40197a309bc0
-SHA512 (webkitgtk-2.43.1.tar.xz) = 7ee064c4655bcbb53ffc3d5f6c1bd166eb3dfdf2165c20c5fbbb5eb7f394704aebf53c32d98db84694fd4ba88c073861f7c7361c1dd57b26424526e041923d25
+SHA512 (webkitgtk-2.43.4.tar.xz) = 6246137deb76192f20bdd1b98e415a183e0c90edf357b08577fa82ce0d196da295c4edf1598b1edc15a258ad6c14997654b947e46e1ea65821c9e5ce6e1dda5c
+SHA512 (webkitgtk-2.43.4.tar.xz.asc) = 25fb00babd4d6d0ef6463226561963972895f2320c86e9da1bdf06cb6acdc6cee1ad97380b418e645d20f98a1cd4ec37d20efa0cb75473a6d62ae0cae28ecce7

webkitgtk.spec

@@ -6,9 +6,9 @@
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
 # No libmanette in RHEL
-%if !0%{?rhel}
-%global with_gamepad 1
-%endif
+%bcond gamepad %{undefined rhel}
+%bcond avif %[%{undefined rhel} || %{defined epel}]
+%bcond jpegxl %[%{undefined rhel} || %{defined epel}]
 
 %global _lto_cflags %{nil}
 
@@ -18,8 +18,8 @@
 %bcond_without docs
 
 Name:           webkitgtk
-Version:        2.43.1
-Release:        %autorelease
+Version:        2.43.4
+Release:        %autorelease -e 0.riscv64
 Summary:        GTK web content engine library
 
 # Source/bmalloc/bmalloc/*.h is BSD-2-Clause
@@ -56,6 +56,14 @@ 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=268744
+# https://bugzilla.redhat.com/show_bug.cgi?id=2253099
+Patch0:          display-vblank-monitor.patch
+
+# https://bugs.webkit.org/show_bug.cgi?id=266218
+# https://github.com/WebKit/WebKit/commit/6b46c24db81426c056f4f1f6fe915c2cdd687a1e
+Patch1:          6b46c24db81426c056f4f1f6fe915c2cdd687a1e.patch
+
 BuildRequires:  bison
 BuildRequires:  bubblewrap
 BuildRequires:  cmake
@@ -73,6 +81,7 @@ BuildRequires:  openssl-devel
 BuildRequires:  perl(English)
 BuildRequires:  perl(FindBin)
 BuildRequires:  perl(JSON::PP)
+BuildRequires:  perl(bigint)
 BuildRequires:  python3
 BuildRequires:  ruby
 BuildRequires:  rubygems
@@ -98,13 +107,16 @@ BuildRequires:  pkgconfig(gtk4)
 BuildRequires:  pkgconfig(harfbuzz)
 BuildRequires:  pkgconfig(icu-uc)
 BuildRequires:  pkgconfig(lcms2)
+%if %{with avif}
 BuildRequires:  pkgconfig(libavif)
+%endif
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libgcrypt)
 BuildRequires:  pkgconfig(libjpeg)
+%if %{with jpegxl}
 BuildRequires:  pkgconfig(libjxl)
+%endif
 BuildRequires:  pkgconfig(libnotify)
-BuildRequires:  pkgconfig(libopenjp2)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libseccomp)
 BuildRequires:  pkgconfig(libsecret-1)
@@ -114,7 +126,7 @@ BuildRequires:  pkgconfig(libtasn1)
 BuildRequires:  pkgconfig(libwebp)
 BuildRequires:  pkgconfig(libwoff2dec)
 BuildRequires:  pkgconfig(libxslt)
-%if 0%{?with_gamepad}
+%if %{with gamepad}
 BuildRequires:  pkgconfig(manette-0.2)
 %endif
 BuildRequires:  pkgconfig(sqlite3)
@@ -123,8 +135,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)
 
 # Filter out provides for private libraries
@@ -305,9 +315,15 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1
 %if %{without docs}
   -DENABLE_DOCUMENTATION=OFF \
 %endif
-%if !0%{?with_gamepad}
+%if %{without gamepad}
   -DENABLE_GAMEPAD=OFF \
 %endif
+%if %{without avif}
+  -DUSE_AVIF=OFF \
+%endif
+%if %{without jpegxl}
+  -DUSE_JPEGXL=OFF \
+%endif
 %if 0%{?rhel}
 %ifarch aarch64
   -DUSE_64KB_PAGE_BLOCK=ON \
@@ -326,9 +342,15 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.1
 %if %{without docs}
   -DENABLE_DOCUMENTATION=OFF \
 %endif
-%if !0%{?with_gamepad}
+%if %{without gamepad}
   -DENABLE_GAMEPAD=OFF \
 %endif
+%if %{without avif}
+  -DUSE_AVIF=OFF \
+%endif
+%if %{without jpegxl}
+  -DUSE_JPEGXL=OFF \
+%endif
 %if 0%{?rhel}
 %ifarch aarch64
   -DUSE_64KB_PAGE_BLOCK=ON \
@@ -453,18 +475,16 @@ export NINJA_STATUS="[2/2][%f/%t %es] "
 
 %if %{with docs}
 %files -n webkitgtk6.0-doc
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/javascriptcoregtk-6.0/
-%{_datadir}/gtk-doc/html/webkitgtk-6.0/
-%{_datadir}/gtk-doc/html/webkitgtk-web-process-extension-6.0/
+%dir %{_datadir}/doc
+%{_datadir}/doc/javascriptcoregtk-6.0/
+%{_datadir}/doc/webkitgtk-6.0/
+%{_datadir}/doc/webkitgtk-web-process-extension-6.0/
 
 %files -n webkit2gtk4.1-doc
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/javascriptcoregtk-4.1/
-%{_datadir}/gtk-doc/html/webkit2gtk-4.1/
-%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.1/
+%dir %{_datadir}/doc
+%{_datadir}/doc/javascriptcoregtk-4.1/
+%{_datadir}/doc/webkit2gtk-4.1/
+%{_datadir}/doc/webkit2gtk-web-extension-4.1/
 %endif
 
 %changelog