webkit-gtk: add some patches from FreeBSD and OpenBSD ports

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: webkit-gtk: add some patches from FreeBSD and OpenBSD ports
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Mon, 15 May 2017 14:54:17 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon May 15 16:54:17 2017 +0200
Changeset:	18f897459982b57a7f383fe575973e45aea64956

Modified Files:
	webkit-gtk/distinfo
	webkit-gtk/patches/patch-CMakeLists.txt
	webkit-gtk/patches/patch-aj
Added Files:
	webkit-gtk/patches/patch-Source_JavaScriptCore_CMakeLists.txt
	webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h
	webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
	webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h

Log Message:
webkit-gtk: add some patches from FreeBSD and OpenBSD ports

- Add some chunks/patches from FreeBSD and OpenBSD ports patches that should
  improve sparc64 support and enables JIT for i386 and amd64.
  (XXX: I should double-check webkit-jit PKG_OPTIONS accordingly)
- Sync patch-aj with FreeBSD and OpenBSD ports.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=18f897459982b57a7f383fe575973e45aea64956

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

diffstat:
 webkit-gtk/distinfo                                |  8 +++-
 webkit-gtk/patches/patch-CMakeLists.txt            | 28 ++++++++++--
 .../patch-Source_JavaScriptCore_CMakeLists.txt     | 16 +++++++
 ...Source_JavaScriptCore_jit_ExecutableAllocator.h | 19 ++++++++
 webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h | 51 ++++++++++++++++++++++
 .../patches/patch-Source_WTF_wtf_dtoa_utils.h      | 17 ++++++++
 webkit-gtk/patches/patch-aj                        |  2 +-
 7 files changed, 135 insertions(+), 6 deletions(-)

diffs:
diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo
index 7170b08fc1..933ead795f 100644
--- a/webkit-gtk/distinfo
+++ b/webkit-gtk/distinfo
@@ -4,14 +4,18 @@ SHA1 (webkitgtk-2.16.1.tar.xz) = d0b367ca1ac89da57b7068aa37efcc101aeb97f8
 RMD160 (webkitgtk-2.16.1.tar.xz) = 82e198ac35993d0e5a2ff9a76755b1c33849458f
 SHA512 (webkitgtk-2.16.1.tar.xz) = 4b8de15644d0d0f9814c674020cbbab8628347915b8010977dbe2365ce276ea05b3bf86171400ae8eb5bfdebbadcfabd1efce34a177b5c82aa765bd3351e7010
 Size (webkitgtk-2.16.1.tar.xz) = 14675996 bytes
-SHA1 (patch-CMakeLists.txt) = c48c0e5d33f378b7ecf31fffef609fb2501e5cd3
+SHA1 (patch-CMakeLists.txt) = 07293fd11d19b6f09120a89a08ff612c36644649
 SHA1 (patch-Source_JavaScriptCore_API_JSStringRef.cpp) = 419425db19f685335eab01099d0a941614a2a99c
+SHA1 (patch-Source_JavaScriptCore_CMakeLists.txt) = 1b3485f72d809b2a1d6ec047b36331a6489fd10d
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4
 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = dd8c03f924d9b96abc9ba5d3a315fefc096be7b0
+SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.h) = 7160b0b3006f21e2f73075072b76bb65fcbf5e49
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
 SHA1 (patch-Source_WTF_wtf_Compiler.h) = f4f7771e4b421dddf9f73c7131e671d0c34b906c
 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 01195978abe07154fbc28de9efc47b3f3105fd89
+SHA1 (patch-Source_WTF_wtf_Platform.h) = 54244d8d53b319f9a520a2f8072a79dd5b48c7f8
+SHA1 (patch-Source_WTF_wtf_dtoa_utils.h) = 192bb016ef584f26967de94d29ee5e43db6fb1f0
 SHA1 (patch-Source_WebCore_platform_FileSystem.cpp) = adef1a42c4e210f0a3dcb82807e2d2039684a0ec
 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
 SHA1 (patch-Source_WebKit2_CMakeLists.txt) = 10a3fca678095ad04ce43e6d291e3907a44f67b4
@@ -20,4 +24,4 @@ SHA1 (patch-Source_WebKit2_Shared_API_c_WKString.cpp) = 0a735e069ad6412e5c785006
 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 03b72552414e7114bfa7ddc2d68fd97009a5ff7d
 SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 459bf361b03b8f4be57813d146423064adc47d8f
 SHA1 (patch-ai) = b8a45f2f5c1aa5aed178527ecd6cbd93baf76f8e
-SHA1 (patch-aj) = 8247194bd8d62fcc356650c946756898fbe22982
+SHA1 (patch-aj) = c22bffb9363c4f4636aa6e7ca5c03501644e6ab2
diff --git a/webkit-gtk/patches/patch-CMakeLists.txt b/webkit-gtk/patches/patch-CMakeLists.txt
index 4d539e15c4..1fb1066099 100644
--- a/webkit-gtk/patches/patch-CMakeLists.txt
+++ b/webkit-gtk/patches/patch-CMakeLists.txt
@@ -1,8 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2016/01/21 13:42:33 leot Exp $
+$NetBSD$
 
---- CMakeLists.txt.orig	2016-01-20 12:12:59.000000000 +0000
+- Fix support for arm
+- Fix support for ppc and add support for sparc64.
+  From FreeBSD and OpenBSD ports.
+
+--- CMakeLists.txt.orig	2017-02-20 16:19:36.000000000 +0000
 +++ CMakeLists.txt
-@@ -87,6 +87,8 @@ else ()
+@@ -61,6 +61,8 @@ else ()
  endif ()
  if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
      set(WTF_CPU_ARM 1)
@@ -11,3 +15,21 @@ $NetBSD: patch-CMakeLists.txt,v 1.2 2016/01/21 13:42:33 leot Exp $
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
      set(WTF_CPU_ARM64 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+@@ -71,7 +73,7 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
+     set(WTF_CPU_X86_64 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
+     set(WTF_CPU_X86 1)
+-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)")
+     set(WTF_CPU_PPC 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
+     set(WTF_CPU_PPC64 1)
+@@ -83,6 +85,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
+     set(WTF_CPU_S390 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
+     set(WTF_CPU_S390X 1)
++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64")
++    set(WTF_CPU_SPARC64 1)
+ else ()
+     message(FATAL_ERROR "Unknown CPU '${LOWERCASE_CMAKE_SYSTEM_PROCESSOR}'")
+ endif ()
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_CMakeLists.txt b/webkit-gtk/patches/patch-Source_JavaScriptCore_CMakeLists.txt
new file mode 100644
index 0000000000..95845b9245
--- /dev/null
+++ b/webkit-gtk/patches/patch-Source_JavaScriptCore_CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Add support for sparc64.
+
+From OpenBSD ports.
+
+--- Source/JavaScriptCore/CMakeLists.txt.orig	Tue Feb 28 09:34:11 2017
++++ Source/JavaScriptCore/CMakeLists.txt	Sun Mar 26 13:55:13 2017
+@@ -1481,6 +1481,7 @@ elseif (WTF_CPU_PPC64)
+ elseif (WTF_CPU_PPC64LE)
+ elseif (WTF_CPU_S390)
+ elseif (WTF_CPU_S390X)
++elseif (WTF_CPU_SPARC64)
+ elseif (WTF_CPU_MIPS)
+ elseif (WTF_CPU_SH4)
+ elseif (WTF_CPU_X86)
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h b/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h
new file mode 100644
index 0000000000..d0179a9565
--- /dev/null
+++ b/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.h
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Avoid to (pre)allocate 1GB of memory:
+
+ <https://bugs.webkit.org/show_bug.cgi?id=61137>
+
+From FreeBSD and OpenBSD ports.
+
+--- Source/JavaScriptCore/jit/ExecutableAllocator.h.orig	Tue Feb 28 09:34:11 2017
++++ Source/JavaScriptCore/jit/ExecutableAllocator.h	Sun Mar 26 13:55:13 2017
+@@ -66,7 +66,7 @@ static const size_t fixedExecutableMemoryPoolSize = FI
+ static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024;
+ #elif CPU(ARM64)
+ static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;
+-#elif CPU(X86_64)
++#elif CPU(X86_64) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) 
+ static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024;
+ #else
+ static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;
diff --git a/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h b/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
new file mode 100644
index 0000000000..9f512f41ff
--- /dev/null
+++ b/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
@@ -0,0 +1,51 @@
+$NetBSD$
+
+Add support for sparc64:
+
+ <https://bugs.webkit.org/show_bug.cgi?id=129963>
+
+From OpenBSD ports.
+
+--- Source/WTF/wtf/Platform.h.orig	Tue Feb 28 09:34:11 2017
++++ Source/WTF/wtf/Platform.h	Sun Mar 26 13:55:13 2017
+@@ -155,6 +155,12 @@
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
+ 
++/* CPU(SPARC64) - SPARC V9 */
++#if defined(__sparc64__)
++#define WTF_CPU_SPARC64 1
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++
+ /* CPU(X86) - i386 / x86 32-bit */
+ #if   defined(__i386__) \
+     || defined(i386)     \
+@@ -348,7 +354,7 @@
+ 
+ #endif /* ARM */
+ 
+-#if CPU(ARM) || CPU(MIPS) || CPU(SH4)
++#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC64)
+ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
+ #endif
+ 
+@@ -680,7 +686,8 @@
+     || CPU(S390X) \
+     || CPU(MIPS64) \
+     || CPU(PPC64) \
+-    || CPU(PPC64LE)
++    || CPU(PPC64LE) \
++    || CPU(SPARC64)
+ #define USE_JSVALUE64 1
+ #else
+ #define USE_JSVALUE32_64 1
+@@ -736,7 +743,7 @@
+ 
+ #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT)
+ /* Enable the DFG JIT on X86 and X86_64. */
+-#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(WINDOWS) || OS(HURD))
++#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) || OS(WINDOWS) || OS(HURD))
+ #define ENABLE_DFG_JIT 1
+ #endif
+ /* Enable the DFG JIT on ARMv7.  Only tested on iOS and Qt/GTK+ Linux. */
diff --git a/webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h b/webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h
new file mode 100644
index 0000000000..2fd81ab553
--- /dev/null
+++ b/webkit-gtk/patches/patch-Source_WTF_wtf_dtoa_utils.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Add support for sparc64.
+
+From OpenBSD ports.
+
+--- Source/WTF/wtf/dtoa/utils.h.orig	Wed Mar  4 15:25:16 2015
++++ Source/WTF/wtf/dtoa/utils.h	Fri Mar 27 10:18:18 2015
+@@ -49,7 +49,7 @@
+ defined(__ARMEL__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
++#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA) || CPU(SPARC64)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__)
+ #if defined(_WIN32)
diff --git a/webkit-gtk/patches/patch-aj b/webkit-gtk/patches/patch-aj
index 82f29a4c6f..02c963922c 100644
--- a/webkit-gtk/patches/patch-aj
+++ b/webkit-gtk/patches/patch-aj
@@ -1,6 +1,6 @@
 $NetBSD: patch-aj,v 1.5 2015/09/26 10:16:38 leot Exp $
 
---- Source/WTF/wtf/InlineASM.h.orig	2015-07-22 12:37:57.000000000 +0000
+--- Source/WTF/wtf/InlineASM.h.orig	2017-02-20 16:20:15.000000000 +0000
 +++ Source/WTF/wtf/InlineASM.h
 @@ -40,7 +40,7 @@
  #define THUMB_FUNC_PARAM(name)
Prev by Date: pan2-git: fix build after switch from intltool to modern gettext.
Next by Date: webkit-gtk: (really!) sync patch-aj with OpenBSD ports
Previous by Thread: pan2-git: fix build after switch from intltool to modern gettext.
Next by Thread: webkit-gtk: (really!) sync patch-aj with OpenBSD ports
Indexes:
Home | Main Index | Thread Index | Old Index