extra/webkitgtk-6.0: Same patch as webkit2gtk

3 files changed, 89 insertions, 0 deletions

diff --git a/extra/webkitgtk-6.0/PKGBUILD b/extra/webkitgtk-6.0/PKGBUILD
new file mode 100644
index 00000000..ed606e4a
--- /dev/null
+++ b/extra/webkitgtk-6.0/PKGBUILD
@@ -0,0 +1,16 @@
+options+=('!debug' '!lto')
+
+if [ "${CARCH}" != "pentium4" ]; then
+  eval "$(
+    declare -f prepare | \
+      sed '
+        4 i patch -p1 -i "${srcdir}/${CARCH}.diff"
+      '
+  )"
+fi
+
+unset sha256sums
+source_i486+=('i486.diff')
+source_i686+=('i686.diff')
+b2sums_i486+=('84b147cd7c1c5bb324af8bc1451fe048b72f8c3c43001fb7a2ab01112566e48194264ab65491c4a7b80669bb101069744915faa03b0ae844f734170e3958760e')
+b2sums_i686+=('3c765caa8e153722c7791fb6c1168e27b5b72922f433a9614969003900adeee5784d41b7836d18f177491369cf5929782296ef88a5e076719a44cda42c0abea1')
diff --git a/extra/webkitgtk-6.0/i486.diff b/extra/webkitgtk-6.0/i486.diff
new file mode 100644
index 00000000..f794a6f5
--- /dev/null
+++ b/extra/webkitgtk-6.0/i486.diff
@@ -0,0 +1,36 @@
+diff -ru webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h
+--- webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h	2024-03-16 06:45:47.852676000 +0000
++++ webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h	2024-07-13 05:48:45.724474953 +0000
+@@ -112,7 +112,7 @@
+ #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
+ #    include <intrin.h>
+ #    define ANGLE_USE_SSE
+-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
++#elif 0
+ #    include <x86intrin.h>
+ #    define ANGLE_USE_SSE
+ #endif
+diff -ru webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake
+--- webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake	2024-03-16 06:45:51.284670000 +0000
++++ webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake	2024-07-13 05:50:15.429706698 +0000
+@@ -175,13 +175,13 @@
+     endif ()
+ 
+     # Force SSE2 fp on x86 builds.
+-    if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING)
+-        WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse)
+-        include(DetectSSE2)
+-        if (NOT SSE2_SUPPORT_FOUND)
+-            message(FATAL_ERROR "SSE2 support is required to compile WebKit")
+-        endif ()
+-    endif ()
++#    if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING)
++#        WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse)
++#        include(DetectSSE2)
++#        if (NOT SSE2_SUPPORT_FOUND)
++#            message(FATAL_ERROR "SSE2 support is required to compile WebKit")
++#        endif ()
++#    endif ()
+ 
+     # Makes builds faster. The GCC manual warns about the possibility that the assembler being
+     # used may not support input from a pipe, but in practice the toolchains we support all do.
diff --git a/extra/webkitgtk-6.0/i686.diff b/extra/webkitgtk-6.0/i686.diff
new file mode 100644
index 00000000..814b4e3b
--- /dev/null
+++ b/extra/webkitgtk-6.0/i686.diff
@@ -0,0 +1,37 @@
+diff -ru webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h
+--- webkitgtk-2.44.2/Source/ThirdParty/ANGLE/src/common/platform.h	2024-03-16 06:45:47.852676000 +0000
++++ webkitgtk-2.44.2_sse/Source/ThirdParty/ANGLE/src/common/platform.h	2024-07-13 05:48:45.724474953 +0000
+@@ -112,7 +112,7 @@
+ #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
+ #    include <intrin.h>
+ #    define ANGLE_USE_SSE
+-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
++#elif 0
+ #    include <x86intrin.h>
+ #    define ANGLE_USE_SSE
+ #endif
+diff -ru webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake
+--- webkitgtk-2.44.2/Source/cmake/WebKitCompilerFlags.cmake	2024-03-16 06:45:51.284670000 +0000
++++ webkitgtk-2.44.2_sse/Source/cmake/WebKitCompilerFlags.cmake	2024-07-13 05:47:42.679555436 +0000
+@@ -175,13 +175,14 @@
+     endif ()
+ 
+     # Force SSE2 fp on x86 builds.
+-    if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING)
+-        WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse)
+-        include(DetectSSE2)
+-        if (NOT SSE2_SUPPORT_FOUND)
+-            message(FATAL_ERROR "SSE2 support is required to compile WebKit")
+-        endif ()
+-    endif ()
++    WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse -mfpmath=387)
++#    if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING)
++#        WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse)
++#        include(DetectSSE2)
++#        if (NOT SSE2_SUPPORT_FOUND)
++#            message(FATAL_ERROR "SSE2 support is required to compile WebKit")
++#        endif ()
++#    endif ()
+ 
+     # Makes builds faster. The GCC manual warns about the possibility that the assembler being
+     # used may not support input from a pipe, but in practice the toolchains we support all do.