Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1545603494238920"
MIME-Version: 1.0
Date: Sun, 23 Dec 2018 22:18:14 +0000
From: "Roy Marples" <roy@netbsd.org>
Subject: CVS commit: pkgsrc/www/webkit-gtk
To: pkgsrc-changes@NetBSD.org
Reply-To: roy@netbsd.org
Message-Id: <20181223221814.6A36DFB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1545603494238920
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	roy
Date:		Sun Dec 23 22:18:14 UTC 2018

Modified Files:
	pkgsrc/www/webkit-gtk: distinfo
	pkgsrc/www/webkit-gtk/patches: patch-CMakeLists.txt
	    patch-Source_JavaScriptCore_assembler_ARM64Assembler.h

Log Message:
Work with a bigger register for aarch64.


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/www/webkit-gtk/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/webkit-gtk/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.


--_----------=_1545603494238920
Content-Disposition: inline
Content-Length: 4389
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/webkit-gtk/distinfo
diff -u pkgsrc/www/webkit-gtk/distinfo:1.112 pkgsrc/www/webkit-gtk/distinfo:1.113
--- pkgsrc/www/webkit-gtk/distinfo:1.112	Thu Dec 13 22:50:27 2018
+++ pkgsrc/www/webkit-gtk/distinfo	Sun Dec 23 22:18:14 2018
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.112 2018/12/13 22:50:27 leot Exp $
+$NetBSD: distinfo,v 1.113 2018/12/23 22:18:14 roy Exp $
 
 SHA1 (webkitgtk-2.22.5.tar.xz) = 809b067a1672a81a4ce31363a0872c668cc72953
 RMD160 (webkitgtk-2.22.5.tar.xz) = 6f251088424cfb2fc082a5625ba9f71fbc686759
 SHA512 (webkitgtk-2.22.5.tar.xz) = fcea9fab3d71869cc10e322b1b63864a9594624f6aa3e29efd8b47e5ca639145f8c2cdb299ecb51eadf3ac1238dac06b4b7ebe94969b2f61a21cea8b609007bc
 Size (webkitgtk-2.22.5.tar.xz) = 16774560 bytes
-SHA1 (patch-CMakeLists.txt) = 2f05f3682bda601c99544dafd8e79bd622dfc5a5
-SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 7479e5933df6f8d1670e362ae68c253362eda9e9
+SHA1 (patch-CMakeLists.txt) = e43197a293419af02da21329c9897ae2994ab5a3
+SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = a41e02c7a1f9bfb91a2af36ec0410e1bf2b9a745
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = bae08310572c2e23c69cbf6aa9760a67345dcfe3
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = ab75ef8714e5071fcd094735717a2f5d0321c747
 SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = e6a23d5ef22bddd0a9606fb0e472960e4cf5673e

Index: pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt
diff -u pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt:1.5 pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt:1.6
--- pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt:1.5	Wed Oct 24 18:31:07 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt	Sun Dec 23 22:18:14 2018
@@ -1,10 +1,19 @@
-$NetBSD: patch-CMakeLists.txt,v 1.5 2018/10/24 18:31:07 leot Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.6 2018/12/23 22:18:14 roy Exp $
 
 - Fix support for arm
 - Fix support for ppc, from FreeBSD.
 
---- CMakeLists.txt.orig	2018-09-06 11:51:31.000000000 +0000
+--- CMakeLists.txt.orig	2018-12-13 01:57:34.000000000 +0000
 +++ CMakeLists.txt
+@@ -19,7 +19,7 @@ else ()
+     message(STATUS "The CMake build type is: ${CMAKE_BUILD_TYPE}")
+ endif ()
+ 
+-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
++set (CMAKE_MODULE_PATH "/usr/obj.pkgsrc/www/webkit-gtk/work/.buildlink/cmake-Modules" "${CMAKE_SOURCE_DIR}/Source/cmake")
+ 
+ set(ENABLE_WEBCORE ON)
+ 
 @@ -85,6 +85,8 @@ else ()
  endif ()
  if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")

Index: pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
diff -u pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h:1.1 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h:1.2
--- pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h:1.1	Tue Nov 13 20:11:38 2018
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h	Sun Dec 23 22:18:14 2018
@@ -1,12 +1,21 @@
-$NetBSD: patch-Source_JavaScriptCore_assembler_ARM64Assembler.h,v 1.1 2018/11/13 20:11:38 leot Exp $
+$NetBSD: patch-Source_JavaScriptCore_assembler_ARM64Assembler.h,v 1.2 2018/12/23 22:18:14 roy Exp $
 
-Add support for FreeBSD and NetBSD.
+- Bump m_compareRegister to hold values of JSC::ARM64Assembler::RegisterID
+- Add support for FreeBSD and NetBSD.
+  Based on patch from FreeBSD ports but using __builtin___clear_cache()
+  instead of __clear_cache() (the former is also available in gcc).
 
-Based on patch from FreeBSD ports but using __builtin___clear_cache()
-instead of __clear_cache() (the former is also available in gcc).
-
---- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig	2018-10-27 21:20:55.000000000 +0000
+--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig	2018-12-13 01:57:37.000000000 +0000
 +++ Source/JavaScriptCore/assembler/ARM64Assembler.h
+@@ -456,7 +456,7 @@ public:
+                 JumpLinkType m_linkType : 8;
+                 Condition m_condition : 4;
+                 unsigned m_bitNumber : 6;
+-                RegisterID m_compareRegister : 6;
++                RegisterID m_compareRegister : 8;
+                 bool m_is64Bit : 1;
+             } realTypes;
+             struct CopyTypes {
 @@ -2863,6 +2863,8 @@ public:
      {
  #if OS(IOS)


--_----------=_1545603494238920--