[148510] trunk/dports/www/webkit2-gtk
jeremyhu at macports.org
jeremyhu at macports.org
Tue May 10 20:40:22 PDT 2016
Revision: 148510
https://trac.macports.org/changeset/148510
Author: jeremyhu at macports.org
Date: 2016-05-10 20:40:21 -0700 (Tue, 10 May 2016)
Log Message:
-----------
webkit2-gtk: Fix Snow Leopard build failure
Modified Paths:
--------------
trunk/dports/www/webkit2-gtk/Portfile
Added Paths:
-----------
trunk/dports/www/webkit2-gtk/files/PR-157554.patch
Modified: trunk/dports/www/webkit2-gtk/Portfile
===================================================================
--- trunk/dports/www/webkit2-gtk/Portfile 2016-05-11 03:39:09 UTC (rev 148509)
+++ trunk/dports/www/webkit2-gtk/Portfile 2016-05-11 03:40:21 UTC (rev 148510)
@@ -70,9 +70,11 @@
# PR-152650-2.patch: WIP to re-enable gtk-doc support
# PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
+# PR-157554.patch: https://bugs.webkit.org/show_bug.cgi?id=157554
patchfiles-append \
PR-152650-2.patch \
- PR-153138.patch
+ PR-153138.patch \
+ PR-157554.patch
# Build out-of-tree
configure.post_args ../${worksrcdir}
Added: trunk/dports/www/webkit2-gtk/files/PR-157554.patch
===================================================================
--- trunk/dports/www/webkit2-gtk/files/PR-157554.patch (rev 0)
+++ trunk/dports/www/webkit2-gtk/files/PR-157554.patch 2016-05-11 03:40:21 UTC (rev 148510)
@@ -0,0 +1,33 @@
+https://bugs.webkit.org/show_bug.cgi?id=157554
+
+--- Source/WTF/wtf/OSRandomSource.cpp
++++ Source/WTF/wtf/OSRandomSource.cpp
+@@ -29,7 +29,7 @@
+ #include <stdint.h>
+ #include <stdlib.h>
+
+-#if !OS(DARWIN) && OS(UNIX)
++#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+@@ -46,7 +46,7 @@
+
+ namespace WTF {
+
+-#if !OS(DARWIN) && OS(UNIX)
++#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
+ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom()
+ {
+ CRASH();
+@@ -60,8 +56,8 @@ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToReadFromURandom()
+
+ void cryptographicallyRandomValuesFromOS(unsigned char* buffer, size_t length)
+ {
+-#if OS(DARWIN)
+- RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length));
++#if OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
++ return arc4random_buf(buffer, length);
+ #elif OS(UNIX)
+ int fd = open("/dev/urandom", O_RDONLY, 0);
+ if (fd < 0)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160510/489628ad/attachment-0001.html>
More information about the macports-changes
mailing list