pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

webkit-gtk: Avoid flock() on SunOS, not supported on older platforms.



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue Oct 2 11:02:00 2018 +0200
Changeset:	c9b7fa790964f9ba0b03ae0bb713e76f64e3af69

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

Log Message:
webkit-gtk: Avoid flock() on SunOS, not supported on older platforms.

From www/webkit-gtk by <jperkin>.

Via:

 cvs rdiff -u -r1.105 -r1.106 pkgsrc/www/webkit-gtk/distinfo
 cvs rdiff -u -r0 -r1.11 pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h

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

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

diffstat:
 webkit-gtk/distinfo                                |  2 +-
 webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diffs:
diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo
index d93309a451..14d2fdd39f 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) = 81d9c3a9f5d850d85aaa24d00cc72b5d0261f33a
 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) = 6ab636e109494d555d3ee63d49b1a11482309ab0
+SHA1 (patch-Source_WTF_wtf_Platform.h) = 3677181ad0a686e79f666dad34236d4475b8da15
 SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 0b35ab065e4cccbb63199cd8a9add0d5106c6150
 SHA1 (patch-Source_WTF_wtf_ThreadSpecific.h) = 38a85e10a72fe38d286a2ce747e090a2955b8791
 SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
diff --git a/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h b/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
index f1f8343400..3e857f0b8d 100644
--- a/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
+++ b/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
@@ -1,10 +1,22 @@
 $NetBSD$
 
-Add support for NetBSD.
+- 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
-@@ -697,7 +697,7 @@
+@@ -567,8 +567,10 @@
+ #define USE_HARFBUZZ 1
+ #define USE_SOUP 1
+ #define USE_WEBP 1
++#ifndef __sun
+ #define USE_FILE_LOCK 1
+ #endif
++#endif
+ 
+ #if PLATFORM(GTK)
+ #define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_36
+@@ -697,7 +699,7 @@
  #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
  #endif
  
@@ -13,7 +25,7 @@ Add support for NetBSD.
  #define HAVE_MACHINE_CONTEXT 1
  #endif
  
-@@ -786,11 +786,11 @@
+@@ -786,11 +788,11 @@
  
  #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT)
  /* Enable the DFG JIT on X86 and X86_64. */


Home | Main Index | Thread Index | Old Index