webkit-gtk: Add definition for BOS(SOLARIS) and OS(SOLARIS)

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue Oct 2 18:39:18 2018 +0200
Changeset:	6e924f91ce20537aa4311a440a815405b6ed7edd

Modified Files:
	webkit-gtk/distinfo
	webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
Added Files:
	webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h

Log Message:
webkit-gtk: Add definition for BOS(SOLARIS) and OS(SOLARIS)

XXX: Not even compile tested!

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

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

diffstat:
 webkit-gtk/distinfo                                |  3 ++-
 webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h | 27 +++++++++++++++++++---
 .../patch-Source_bmalloc_bmalloc_BPlatform.h       | 17 ++++++++++++++
 3 files changed, 43 insertions(+), 4 deletions(-)

diffs:
diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo
index 1fe40a6f37..9b772a4117 100644
--- a/webkit-gtk/distinfo
+++ b/webkit-gtk/distinfo
@@ -11,7 +11,7 @@ SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = e6a23d5ef22bddd0a9606f
 SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 36d29a5db03c2413ae93224ac391f3ff248983e8
 SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 928050c743dc889cb42fa4e74bec5664b8e1318c
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
-SHA1 (patch-Source_WTF_wtf_Platform.h) = 22290c6db58cedd4f9c166924150d019a269fdc4
+SHA1 (patch-Source_WTF_wtf_Platform.h) = e419f26fbd01d315ea3033d628105c6e30cc594b
 SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
 SHA1 (patch-Source_WTF_wtf_ThreadSpecific.h) = 38a85e10a72fe38d286a2ce747e090a2955b8791
 SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
@@ -23,6 +23,7 @@ SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 810
 SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 91a7e63ebeac06cca21547aa7025a55a4d174b6d
 SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 9c58253868e06b3dd3cac936651ba7e6a1437fc6
 SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
+SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = ad6c6f93732a4bb355ac2b65bff8968aae0460ba
 SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = 7bbf23f5ac92173dcce9743c5a115bdf0bf7c0ea
 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 03b72552414e7114bfa7ddc2d68fd97009a5ff7d
 SHA1 (patch-aj) = cd9a280c3bbab82c1a7aeb62a27ee6eb96c67ec2
diff --git a/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h b/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
index d82adddaef..bef4ac533a 100644
--- a/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
+++ b/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
@@ -1,11 +1,32 @@
 $NetBSD$
 
+- Add OS(SOLARIS) definition and add them to Unix systems.
 - Avoid flock() on SunOS, not supported on older platforms.
 - Add support for NetBSD.
 
 --- Source/WTF/wtf/Platform.h.orig	2018-09-21 19:59:47.000000000 +0000
 +++ Source/WTF/wtf/Platform.h
-@@ -567,8 +567,10 @@
+@@ -410,6 +410,11 @@
+ #define WTF_OS_OPENBSD 1
+ #endif
+ 
++/* OS(SOLARIS) - Solaris and derivatives */
++#ifdef __sun
++#define WTF_OS_SOLARIS 1
++#endif
++
+ /* OS(WINDOWS) - Any version of Windows */
+ #if defined(WIN32) || defined(_WIN32)
+ #define WTF_OS_WINDOWS 1
+@@ -427,6 +432,7 @@
+     || OS(LINUX)            \
+     || OS(NETBSD)           \
+     || OS(OPENBSD)          \
++    || OS(SOLARIS)          \
+     || defined(unix)        \
+     || defined(__unix)      \
+     || defined(__unix__)
+@@ -567,8 +573,10 @@
  #define USE_HARFBUZZ 1
  #define USE_SOUP 1
  #define USE_WEBP 1
@@ -16,7 +37,7 @@ $NetBSD$
  
  #if PLATFORM(GTK)
  #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_36
-@@ -697,7 +699,7 @@
+@@ -697,7 +705,7 @@
  #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
  #endif
  
@@ -25,7 +46,7 @@ $NetBSD$
  #define HAVE_MACHINE_CONTEXT 1
  #endif
  
-@@ -786,11 +788,11 @@
+@@ -786,11 +794,11 @@
  
  #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT)
  /* Enable the DFG JIT on X86 and X86_64. */
diff --git a/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h b/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h
new file mode 100644
index 0000000000..795f991c60
--- /dev/null
+++ b/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_BPlatform.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Add BOS(SOLARIS) definition.
+
+--- Source/bmalloc/bmalloc/BPlatform.h.orig	2018-07-25 11:56:32.000000000 +0000
++++ Source/bmalloc/bmalloc/BPlatform.h
+@@ -48,6 +48,10 @@
+ #define BOS_LINUX 1
+ #endif
+ 
++#ifdef __sun
++#define BOS_SOLARIS 1
++#endif
++
+ #if defined(WIN32) || defined(_WIN32)
+ #define BOS_WINDOWS 1
+ #endif