<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[148658] users/devans/GNOME-3/stable/dports/www/webkit2-gtk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/148658">148658</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-05-13 13:15:15 -0700 (Fri, 13 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: webkit2-gtk, fix build failures of dependent projects on older systems.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkit2gtkPortfile">users/devans/GNOME-3/stable/dports/www/webkit2-gtk/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkit2gtkfilesPR157554patch">users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157554.patch</a></li>
<li><a href="#usersdevansGNOME3stabledportswwwwebkit2gtkfilesPR157574patch">users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkit2gtk">users/devans/GNOME-3/stable/dports/www/webkit2-gtk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportswwwwebkit2gtk"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/www/webkit2-gtk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/trunk/dports/www/webkit2-gtk:146461-148237
</span><span class="cx"> + /branches/mld-qt-481/dports/www/webkit2-gtk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/www/webkit2-gtk:146461-148657
</span><a id="usersdevansGNOME3stabledportswwwwebkit2gtkPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/www/webkit2-gtk/Portfile (148657 => 148658)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk/Portfile 2016-05-13 17:25:08 UTC (rev 148657)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk/Portfile 2016-05-13 20:15:15 UTC (rev 148658)
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx"> name webkit2-gtk
</span><span class="cx"> conflicts webkit2-gtk-devel
</span><span class="cx"> version 2.12.2
</span><ins>+revision 1
</ins><span class="cx"> description Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
</span><span class="cx"> long_description ${description}
</span><span class="cx"> maintainers jeremyhu devans
</span><span class="lines">@@ -70,9 +71,13 @@
</span><span class="cx">
</span><span class="cx"> # PR-152650-2.patch: WIP to re-enable gtk-doc support
</span><span class="cx"> # PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
</span><ins>+# PR-157554.patch: https://bugs.webkit.org/show_bug.cgi?id=157554
+# PR-157574.patch: https://bugs.webkit.org/show_bug.cgi?id=157574
</ins><span class="cx"> patchfiles-append \
</span><span class="cx"> PR-152650-2.patch \
</span><del>- PR-153138.patch
</del><ins>+ PR-153138.patch \
+ PR-157554.patch \
+ PR-157574.patch
</ins><span class="cx">
</span><span class="cx"> # Build out-of-tree
</span><span class="cx"> configure.post_args ../${worksrcdir}
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkit2gtkfilesPR157554patchfromrev148657trunkdportswwwwebkit2gtkfilesPR157554patch"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157554.patch (from rev 148657, trunk/dports/www/webkit2-gtk/files/PR-157554.patch) (0 => 148658)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157554.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157554.patch 2016-05-13 20:15:15 UTC (rev 148658)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+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)
</ins></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkit2gtkfilesPR157574patchfromrev148657trunkdportswwwwebkit2gtkfilesPR157574patch"></a>
<div class="copfile"><h4>Copied: users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch (from rev 148657, trunk/dports/www/webkit2-gtk/files/PR-157574.patch) (0 => 148658)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch 2016-05-13 20:15:15 UTC (rev 148658)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+--- Source/JavaScriptCore/API/WebKitAvailability.h.orig 2016-04-27 23:21:38.000000000 -0700
++++ Source/JavaScriptCore/API/WebKitAvailability.h 2016-05-12 22:22:28.000000000 -0700
+@@ -27,50 +27,11 @@
+ #define __WebKitAvailability__
+
+ #if defined(__APPLE__)
+-
+ #include <AvailabilityMacros.h>
+ #include <CoreFoundation/CoreFoundation.h>
+-
+-#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
+-/* To support availability macros that mention newer OS X versions when building on older OS X versions,
+- we provide our own definitions of the underlying macros that the availability macros expand to. We're
+- free to expand the macros as no-ops since frameworks built on older OS X versions only ship bundled with
+- an application rather than as part of the system.
+-*/
+-
+-#ifndef __NSi_10_10 // Building from trunk rather than SDK.
+-#define __NSi_10_10 introduced=10.0 // Use 10.0 to indicate that everything is available.
+-#endif
+-
+-#ifndef __NSi_10_11 // Building from trunk rather than SDK.
+-#define __NSi_10_11 introduced=10.0 // Use 10.0 to indicate that everything is available.
+-#endif
+-
+-#ifndef __AVAILABILITY_INTERNAL__MAC_10_9
+-#define __AVAILABILITY_INTERNAL__MAC_10_9
+-#endif
+-
+-#ifndef __AVAILABILITY_INTERNAL__MAC_10_10
+-#define __AVAILABILITY_INTERNAL__MAC_10_10
+ #endif
+
+-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
+-#define AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
+-#endif
+-
+-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
+-#define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
+-#endif
+-
+-#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */
+-
+-#if defined(BUILDING_GTK__)
+ #undef CF_AVAILABLE
+ #define CF_AVAILABLE(_mac, _ios)
+-#endif
+-
+-#else
+-#define CF_AVAILABLE(_mac, _ios)
+-#endif
+
+ #endif /* __WebKitAvailability__ */
</ins></span></pre>
</div>
</div>
</body>
</html>