From 038a3f379aa6577368cdd876cf7d1a1ffd6bf905 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Tue, 16 Apr 2019 08:55:22 +0000
Subject: [PATCH] SECURITY update to webkitgtk4-2.24.1.
 https://webkitgtk.org/security/WSA-2019-0002.html

---
 www/webkitgtk4/Makefile                          | 11 +++++------
 www/webkitgtk4/distinfo                          |  4 ++--
 .../patches/patch-Source_cmake_FindSSE2_cmake    | 16 ++++++++++++++++
 3 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 www/webkitgtk4/patches/patch-Source_cmake_FindSSE2_cmake

diff --git a/www/webkitgtk4/Makefile b/www/webkitgtk4/Makefile
index 2dae92c30ff..43ab8febb19 100644
--- a/www/webkitgtk4/Makefile
+++ b/www/webkitgtk4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.99 2019/03/25 14:03:49 cwen Exp $
+# $OpenBSD: Makefile,v 1.100 2019/04/16 08:55:22 ajacoutot Exp $
 
 # patches/patch-Source_JavaScriptCore_javascriptcoregtk_pc_in
 # patches/patch-Source_WebKit_gtk_webkit2gtk-web-extension_pc_in
@@ -12,8 +12,7 @@ PORTROACH =		limitw:1,even
 
 COMMENT =		GTK+ port of the WebKit rendering engine
 
-V =			2.24.0
-REVISION =		0
+V =			2.24.1
 DISTNAME =		webkitgtk-${V}
 PKGNAME =		webkitgtk4-${V}
 EXTRACT_SUFX =		.tar.xz
@@ -107,10 +106,10 @@ CONFIGURE_ARGS +=	-DENABLE_LLINT_C_LOOP=ON
 LDFLAGS +=		-Wl,--no-keep-memory
 .endif
 
-# __sync_add_and_fetch_8
+# __sync_add_and_fetch_8, SSE2
 .if ${MACHINE_ARCH} == "i386"
-CFLAGS +=		-march=i686
-CXXFLAGS +=		-march=i686
+CFLAGS +=		-march=i686 -msse2
+CXXFLAGS +=		-march=i686 -msse2
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc"
diff --git a/www/webkitgtk4/distinfo b/www/webkitgtk4/distinfo
index 5410400d486..84f051d5626 100644
--- a/www/webkitgtk4/distinfo
+++ b/www/webkitgtk4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (webkitgtk-2.24.0.tar.xz) = LkrRUD/kgs61qDz3CsnNQvN+txhVWk1oRP5MWakhRAc=
-SIZE (webkitgtk-2.24.0.tar.xz) = 17894000
+SHA256 (webkitgtk-2.24.1.tar.xz) = U8uOqtLKTKquZj1oMxuD/SfVvV9sU4jW6jxFXjOPOW0=
+SIZE (webkitgtk-2.24.1.tar.xz) = 17897488
diff --git a/www/webkitgtk4/patches/patch-Source_cmake_FindSSE2_cmake b/www/webkitgtk4/patches/patch-Source_cmake_FindSSE2_cmake
new file mode 100644
index 00000000000..bdfb3ed7c5b
--- /dev/null
+++ b/www/webkitgtk4/patches/patch-Source_cmake_FindSSE2_cmake
@@ -0,0 +1,16 @@
+$OpenBSD: patch-Source_cmake_FindSSE2_cmake,v 1.1 2019/04/16 08:55:22 ajacoutot Exp $
+
+XXX CMAKE_COMPILER_IS_CLANG is not a thing
+
+Index: Source/cmake/FindSSE2.cmake
+--- Source/cmake/FindSSE2.cmake.orig
++++ Source/cmake/FindSSE2.cmake
+@@ -49,7 +49,7 @@ macro(CHECK_FOR_SSE2)
+         }"
+         HAVE_SSE2_EXTENSIONS)
+ 
+-    if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
++    if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))
+         if (HAVE_SSE2_EXTENSIONS)
+             set(SSE2_SUPPORT_FOUND TRUE)
+         endif ()