Pullup ticket #6687 - requested by nia

www/webkit-gtk: aarch64 build fix

Revisions pulled up:
- www/webkit-gtk/Makefile                                       1.239
- www/webkit-gtk/distinfo                                       1.172
- www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake 1.7

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sat Oct  8 11:06:36 UTC 2022

   Modified Files:
   	pkgsrc/www/webkit-gtk: Makefile distinfo
   	pkgsrc/www/webkit-gtk/patches: patch-Source_cmake_OptionsCommon.cmake

   Log Message:
   webkit-gtk: Attempt to fix the build on NetBSD 9 aarch64 by avoiding
   the compiler builtin __int128_t implementation

   related to PR toolchain/57022

3 files changed, 30 insertions, 5 deletions

diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 808bdfd3a9b..761c8a48807 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.238 2022/09/25 08:57:51 nia Exp $
+# $NetBSD: Makefile,v 1.238.2.1 2022/10/23 11:30:34 bsiegert Exp $
 
 DISTNAME=	webkitgtk-2.36.8
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
@@ -52,6 +52,10 @@ CMAKE_ARGS+=		-DUSE_LIBHYPHEN=OFF
 CMAKE_ARGS+=		-DUSE_OPENJPEG=OFF
 CMAKE_ARGS+=		-DUSE_SOUP2=ON
 
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*)
+CMAKE_ARGS+=		-DAVOID_INT128=ON
+.endif
+
 REPLACE_PERL+=	Source/JavaScriptCore/Scripts/*.pl
 REPLACE_PERL+=	Source/JavaScriptCore/create_hash_table
 REPLACE_PERL+=	Source/WebCore/Scripts/*.pl
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index 187599acb88..550dca41ae9 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.171 2022/09/16 19:56:33 leot Exp $
+$NetBSD: distinfo,v 1.171.2.1 2022/10/23 11:30:34 bsiegert Exp $
 
 BLAKE2s (webkitgtk-2.36.8.tar.xz) = 277ba5935bda3e3867083b4c736499d974b9c733dbd05bf574510857dde481a1
 SHA512 (webkitgtk-2.36.8.tar.xz) = 50576f13ea84c0634d174ccf0b70d0eb28752589b2b9ce7a82ffeee1b4b6c849a802f7ae83a3c5a74d0da2b7e3321876ead33e819d8006b8153376074cb57036
@@ -41,7 +41,7 @@ SHA1 (patch-Source_WebKit_Scripts_generate-unified-sources.sh) = def930cf3f706ac
 SHA1 (patch-Source_bmalloc_bmalloc_AvailableMemory.cpp) = 18915c691d6f4e2a8870f8fee0909bd1a609cc05
 SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = 28d1f657fde427062a729b26398e96825082fc4d
 SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = 22c23689fa79c930145068ed7966844bbf92a6a9
-SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 7db9d7b06e7f784000e66b0dab23e98f6298107a
+SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 83f0bfdb104e9e5c5c9afb155d399ae4c767c450
 SHA1 (patch-Source_cmake_WebKitCommon.cmake) = 73a0da491ef93d5cc25214e7733b54bbdacd487e
 SHA1 (patch-Tools_TestWebKitAPI_Scripts_check-xcfilelists.sh) = 6e8327bf46150806910b21b298767f313e1eb3ce
 SHA1 (patch-Tools_TestWebKitAPI_Scripts_generate-unified-sources.sh) = 06747f279263558f05bb01c8da9c994a357ce74a
diff --git a/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake b/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
index e7909d101df..6ab5c765a16 100644
--- a/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
+++ b/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
@@ -1,8 +1,10 @@
-$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.6 2022/05/29 17:47:15 leot Exp $
+$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.6.4.1 2022/10/23 11:30:34 bsiegert Exp $
 
 Using the T option of GNU ar lead to malformed .a archive on NetBSD. Disable it.
 
---- Source/cmake/OptionsCommon.cmake.orig	2022-02-23 08:59:06.000000000 +0000
+Add option to avoid use of builtin __int128_t type due to PR toolchain/57022
+
+--- Source/cmake/OptionsCommon.cmake.orig	2022-06-30 09:49:38.479512200 +0000
 +++ Source/cmake/OptionsCommon.cmake
 @@ -128,10 +128,10 @@ endif ()
  option(USE_THIN_ARCHIVES "Produce all static libraries as thin archives" ${USE_THIN_ARCHIVES_DEFAULT})
@@ -19,3 +21,22 @@ Using the T option of GNU ar lead to malformed .a archive on NetBSD. Disable it.
  endif ()
  
  set(ENABLE_DEBUG_FISSION_DEFAULT OFF)
+@@ -219,12 +219,18 @@ WEBKIT_CHECK_HAVE_STRUCT(HAVE_STAT_BIRTH
+ WEBKIT_CHECK_HAVE_STRUCT(HAVE_TM_GMTOFF "struct tm" tm_gmtoff time.h)
+ WEBKIT_CHECK_HAVE_STRUCT(HAVE_TM_ZONE "struct tm" tm_zone time.h)
+ 
++option(AVOID_INT128 "Avoid using compiler builtin __int128_t type" OFF)
++
++if (NOT AVOID_INT128)
+ # Check for int types
+ check_type_size("__int128_t" INT128_VALUE)
+ 
+ if (HAVE_INT128_VALUE)
+   SET_AND_EXPOSE_TO_BUILD(HAVE_INT128_T INT128_VALUE)
+ endif ()
++else ()
++  SET_AND_EXPOSE_TO_BUILD(HAVE_INT128_T FALSE)
++endif ()
+ 
+ # Check which filesystem implementation is available if any
+ if (STD_FILESYSTEM_IS_AVAILABLE)