gentoo/net-libs/webkit-gtk/files/2.48.3-fix-ftbfs-riscv64.patch
Michael Orlitzky 860830c6d7
net-libs/webkit-gtk: add 2.48.3
Updates:

 * Fix the riscv build, re-keyword for ~riscv
 * Drop the obsolete ICU patch
 * Disable the new drag-drop, speech synthesis, and touch support via
   mycmakeargs (path of least resistance, does not involve any new flags
   or dependencies).

These are usable in Evolution and with the MiniBrowser at least. There
are some caveats however:

 * Does not build for me with USE="-jumbo-build"
 * Does not build for me with clang LTO
 * The -r600 doesn't seem to work with epiphany (all pages hang)
 * The masked 2.48.3 (sans -rXXX) was not tested

The ~riscv keywords are the only reason we would need to keep the old
vulnerable 2.44.x ebuilds in the tree, and the "current" versions can
fail to build too, so I think this is a win despite the setbacks. The
old versions are still there if they cause less problems for someone.

Bug: https://bugs.gentoo.org/942369
Closes: https://bugs.gentoo.org/951085
Closes: https://bugs.gentoo.org/955769
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
2025-06-06 11:10:17 -04:00

41 lines
1.4 KiB
Diff

From: Alberto Garcia <berto@igalia.com>
Description: Use WTF_CPU_UNKNOWN when building for riscv64
WebKitGTK doesn't build on riscv64 even with the JIT disabled.
Treating the CPU as unknown is perhaps a bit severe, but it allows us
to get the build done until someone steps up to maintain this
properly.
Bug: https://bugs.webkit.org/show_bug.cgi?id=271371
Forwarded: no
Index: webkitgtk/Source/WTF/wtf/PlatformCPU.h
===================================================================
--- webkitgtk.orig/Source/WTF/wtf/PlatformCPU.h
+++ webkitgtk/Source/WTF/wtf/PlatformCPU.h
@@ -285,14 +285,6 @@
#endif /* ARM */
-/* CPU(RISCV64) - RISC-V 64-bit */
-#if defined(__riscv) \
- && defined(__riscv_xlen) \
- && (__riscv_xlen == 64)
-#define WTF_CPU_RISCV64 1
-#define WTF_CPU_KNOWN 1
-#endif
-
#if !CPU(KNOWN)
#define WTF_CPU_UNKNOWN 1
#endif
Index: webkitgtk/Source/cmake/WebKitCommon.cmake
===================================================================
--- webkitgtk.orig/Source/cmake/WebKitCommon.cmake
+++ webkitgtk/Source/cmake/WebKitCommon.cmake
@@ -125,8 +125,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
set(WTF_CPU_PPC64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
set(WTF_CPU_PPC64LE 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64")
- set(WTF_CPU_RISCV64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64")
set(WTF_CPU_LOONGARCH64 1)
else ()