CVS commit: pkgsrc/x11/qt5-qtwebkit

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Mar 22 20:02:10 UTC 2023

Modified Files:
        pkgsrc/x11/qt5-qtwebkit: distinfo
        pkgsrc/x11/qt5-qtwebkit/patches:
            patch-Source_JavaScriptCore_assembler_ARM64Assembler.h

Log Message:
qt5-qtwebkit: fix buidling on Darwin/arm64


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtwebkit/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.29 pkgsrc/x11/qt5-qtwebkit/distinfo:1.30
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.29       Fri Dec 30 20:19:10 2022
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Wed Mar 22 20:02:10 2023
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.29 2022/12/30 20:19:10 adam Exp $
+$NetBSD: distinfo,v 1.30 2023/03/22 20:02:10 adam Exp $
 
 BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c
 SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
 Size (qtwebkit-5.212.0-alpha4.tar.xz) = 12528508 bytes
 SHA1 (patch-CMakeLists.txt) = 6b0d295ed4ec40c6364b0a86c94d19966977f7d7
 SHA1 (patch-Source_JavaScriptCore_API_ObjCCallbackFunction.h) = be77c4b19f5f97c12180c1b7d3b72968364f3229
-SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 8b502d6960e5b52000dd6e67f65c2fbaf6e9d1f2
+SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = d57347e73081761c06f13564f5d2db496f91cdf3
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 7bbb0a59a0c087abaaddda08fc31aa24809acb70
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = d3ed3a25085752598dc04582eb80636c9cc6eaa9
 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = a3eba122c7226a80dacf1b762747fe0a7408b849

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h:1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h:1.2
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h:1.1  Fri Dec 13 09:48:02 2019
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h      Wed Mar 22 20:02:10 2023
@@ -1,12 +1,25 @@
-$NetBSD: patch-Source_JavaScriptCore_assembler_ARM64Assembler.h,v 1.1 2019/12/13 09:48:02 mrg Exp $
+$NetBSD: patch-Source_JavaScriptCore_assembler_ARM64Assembler.h,v 1.2 2023/03/22 20:02:10 adam Exp $
 
-find a valid clear cache for netbsd/arm64.
+Find a valid clear cache for Darwin/arm64 and NetBSD/arm64.
 
---- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig      2019-12-07 02:31:00.900806242 -0800
-+++ Source/JavaScriptCore/assembler/ARM64Assembler.h   2019-12-07 02:30:09.650436008 -0800
-@@ -2666,6 +2666,8 @@
+--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig      2020-03-04 17:16:37.000000000 +0000
++++ Source/JavaScriptCore/assembler/ARM64Assembler.h
+@@ -34,6 +34,9 @@
+ #include <wtf/Assertions.h>
+ #include <wtf/Vector.h>
+ #include <stdint.h>
++#if OS(IOS) || OS(MAC_OS_X)
++#include <libkern/OSCacheControl.h>
++#endif
+ 
+ #define CHECK_DATASIZE_OF(datasize) ASSERT(datasize == 32 || datasize == 64)
+ #define DATASIZE_OF(datasize) ((datasize == 64) ? Datasize_64 : Datasize_32)
+@@ -2664,8 +2667,10 @@ public:
+ 
+     static void cacheFlush(void* code, size_t size)
      {
- #if OS(IOS)
+-#if OS(IOS)
++#if OS(IOS) || OS(MAC_OS_X)
          sys_cache_control(kCacheFunctionPrepareForExecution, code, size);
 +#elif OS(NETBSD)
 +      __builtin___clear_cache(code, reinterpret_cast<char*>(code) + size);