extra/webkit2gtk: Don't force-enable SSE2 in cmake

3 files changed, 28 insertions, 5 deletions

diff --git a/extra/webkit2gtk/PKGBUILD b/extra/webkit2gtk/PKGBUILD
index 0afeb273..b141a037 100644
--- a/extra/webkit2gtk/PKGBUILD
+++ b/extra/webkit2gtk/PKGBUILD
@@ -1,13 +1,13 @@
 # disable SSE2 on 486 and 686
-source_i486+=('webkitgtk-2.24.2-no-sse2.patch')
-source_i686+=('webkitgtk-2.24.2-no-sse2.patch')
-sha256sums_i486+=('e95391eceeb29d0ebc57d6b867afd7cd95ed92683edeb28c6a7a5048b5a9b85b')
-sha256sums_i686+=('e95391eceeb29d0ebc57d6b867afd7cd95ed92683edeb28c6a7a5048b5a9b85b')
+source_i486+=('webkitgtk-2.24.2-no-sse2.arch32.patch' 'webkitgtk-2.26.2-no-sse2-cmake.arch32.patch')
+source_i686+=('webkitgtk-2.24.2-no-sse2.arch32.patch' 'webkitgtk-2.26.2-no-sse2-cmake.arch32.patch')
+sha256sums_i486+=('e95391eceeb29d0ebc57d6b867afd7cd95ed92683edeb28c6a7a5048b5a9b85b' '48f46468c54518c3ce94b73321336a1f1aaf2d121b9222bc8d861726078b3001')
+sha256sums_i686+=('e95391eceeb29d0ebc57d6b867afd7cd95ed92683edeb28c6a7a5048b5a9b85b' '48f46468c54518c3ce94b73321336a1f1aaf2d121b9222bc8d861726078b3001')
 
 eval "$(
   declare -f prepare | \
     sed '
-      /cd.*/a [ "${CARCH}" = pentium4 ] || patch -p1 -i ../webkitgtk-2.24.2-no-sse2.patch
+      /cd.*/a for _p in \"$srcdir\"\/*.arch32.patch; do patch -p1 -i \"$_p\"; done
     '
 )"	
 
diff --git a/extra/webkit2gtk/webkitgtk-2.24.2-no-sse2.patch b/extra/webkit2gtk/webkitgtk-2.24.2-no-sse2.arch32.patch
index 5bcfb603..5bcfb603 100644
--- a/extra/webkit2gtk/webkitgtk-2.24.2-no-sse2.patch
+++ b/extra/webkit2gtk/webkitgtk-2.24.2-no-sse2.arch32.patch
diff --git a/extra/webkit2gtk/webkitgtk-2.26.2-no-sse2-cmake.arch32.patch b/extra/webkit2gtk/webkitgtk-2.26.2-no-sse2-cmake.arch32.patch
new file mode 100644
index 00000000..9d4c3451
--- /dev/null
+++ b/extra/webkit2gtk/webkitgtk-2.26.2-no-sse2-cmake.arch32.patch
@@ -0,0 +1,23 @@
+--- webkitgtk-2.26.2/Source/cmake/WebKitCompilerFlags.cmake	2019-08-28 14:46:33.000000000 +0300
++++ webkitgtk-2.26.2_nosse2/Source/cmake/WebKitCompilerFlags.cmake	2019-12-28 21:04:55.532144052 +0200
+@@ -139,13 +139,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 ()
+ endif ()
+ 
+ if (COMPILER_IS_GCC_OR_CLANG AND NOT MSVC)