CVS commit: pkgsrc/x11/qt5-qtwebkit

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Mar 26 12:14:25 UTC 2022

Modified Files:
        pkgsrc/x11/qt5-qtwebkit: distinfo
        pkgsrc/x11/qt5-qtwebkit/patches:
            patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp

Log Message:
qt5-qtwebkit: fix wrong NetBSD/evbarm patch, does not have asm/hwcap.h

package still does not build due to asm errors from FELightingNEON.cpp


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp

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.23 pkgsrc/x11/qt5-qtwebkit/distinfo:1.24
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.23       Tue Oct 26 11:34:24 2021
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Sat Mar 26 12:14:25 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2021/10/26 11:34:24 nia Exp $
+$NetBSD: distinfo,v 1.24 2022/03/26 12:14:25 tnn Exp $
 
 BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c
 SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
@@ -7,7 +7,7 @@ SHA1 (patch-CMakeLists.txt) = 6b0d295ed4
 SHA1 (patch-Source_JavaScriptCore_API_ObjCCallbackFunction.h) = be77c4b19f5f97c12180c1b7d3b72968364f3229
 SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 8b502d6960e5b52000dd6e67f65c2fbaf6e9d1f2
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 7bbb0a59a0c087abaaddda08fc31aa24809acb70
-SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 79b54cb1d03d976a0629fbd8ee9ac1881951ba10
+SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = d3ed3a25085752598dc04582eb80636c9cc6eaa9
 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = a3eba122c7226a80dacf1b762747fe0a7408b849
 SHA1 (patch-Source_JavaScriptCore_generate-bytecode-files) = b58ca94781fcf7b9f6a3eba715af2784e7a0acc0
 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 35f2ba0cc3fe0d76c28a3a244621291a17a5334a

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp:1.2 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp:1.3
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp:1.2     Wed Jan 17 19:37:33 2018
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp Sat Mar 26 12:14:25 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.2 2018/01/17 19:37:33 markd Exp $
+$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.3 2022/03/26 12:14:25 tnn Exp $
 
 * Add NetBSD support
 
---- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2017-06-04 20:16:05.000000000 +0000
+--- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2020-03-04 17:16:37.000000000 +0000
 +++ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
-@@ -42,6 +42,15 @@
+@@ -42,6 +42,14 @@
  #include <asm/hwcap.h>
  #endif
  
@@ -14,13 +14,12 @@ $NetBSD: patch-Source_JavaScriptCore_ass
 +#include <sys/sysctl.h>
 +#include <fcntl.h>
 +#include <unistd.h>
-+#include <asm/hwcap.h>
 +#endif
 +
  namespace JSC {
  
  static bool isVFPPresent()
-@@ -60,6 +69,16 @@ static bool isVFPPresent()
+@@ -60,6 +68,16 @@ static bool isVFPPresent()
      }
  #endif // OS(LINUX)