diff options
| author | khorben <khorben@pkgsrc.org> | 2015-07-14 00:02:34 +0000 |
|---|---|---|
| committer | khorben <khorben@pkgsrc.org> | 2015-07-14 00:02:34 +0000 |
| commit | 913910508fbd3c87e6f557c7d8f2fcf9b38e9e17 (patch) | |
| tree | 218d8a4003faef5e0ccc6ddc3d8898d21cd8dc9f | |
| parent | c7f918934a7acdae5fe236cb468ffa9c5c89874a (diff) | |
| download | pkgsrc-913910508fbd3c87e6f557c7d8f2fcf9b38e9e17.tar.gz | |
Revert part of the patch assuming strnstr(3) on NetBSD
strnstr(3) was added to NetBSD -current but is not in netbsd-7 (or
earlier releases). This patch was confirmed to still work on -current by
wiz@ (7.99.19 amd64), and on netbsd-7 by myself (7.0_RC1, amd64).
| -rw-r--r-- | www/webkit-gtk/distinfo | 4 | ||||
| -rw-r--r-- | www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h | 11 |
2 files changed, 3 insertions, 12 deletions
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo index 906e13ff72f..9e6f0eccd07 100644 --- a/www/webkit-gtk/distinfo +++ b/www/webkit-gtk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.77 2015/07/12 21:50:12 wiz Exp $ +$NetBSD: distinfo,v 1.78 2015/07/14 00:02:34 khorben Exp $ SHA1 (webkitgtk-2.8.4.tar.xz) = 127ee45bab6bbd9da1a9f63ec070d8cc06b40652 RMD160 (webkitgtk-2.8.4.tar.xz) = 4ad3b443a44275cac65d812ef3e53a355847f890 @@ -7,7 +7,7 @@ SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 1f4a4be3593 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 2b7e69b8e6aff9bd5f65190f8eb1afdbb993857f SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 925d653feaa204b5128d389959328cdf559f26d3 -SHA1 (patch-Source_WTF_wtf_Platform.h) = 6ac3e1263fdacc8677b2a4e98310f3886d1dbadf +SHA1 (patch-Source_WTF_wtf_Platform.h) = 2d2bd30ded91c8572e0c220c432ac4094289371b SHA1 (patch-Source_WTF_wtf_Stopwatch.h) = 25bc1552a10a5724cbf261d05c0202c153fd69f7 SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 3707a87994d941d5f147f797d7d0be1b45bea591 SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 599ed6188b632e78774fd833e3ea9e1a1acf8a2d diff --git a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h index 635ad24f906..ec77694fcbe 100644 --- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h +++ b/www/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h @@ -1,16 +1,7 @@ -$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.5 2015/07/12 00:44:46 wiz Exp $ +$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.6 2015/07/14 00:02:34 khorben Exp $ --- Source/WTF/wtf/Platform.h.orig 2015-03-23 08:08:04.000000000 +0000 +++ Source/WTF/wtf/Platform.h -@@ -579,7 +579,7 @@ - #endif - - #if !defined(HAVE_STRNSTR) --#if OS(DARWIN) || (OS(FREEBSD) && !defined(__GLIBC__)) -+#if OS(DARWIN) || ((OS(FREEBSD) || OS(NETBSD)) && !defined(__GLIBC__)) - #define HAVE_STRNSTR 1 - #endif - #endif @@ -632,6 +632,11 @@ #define USE_SYSTEM_MALLOC 1 #endif |