<!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>[153194] users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch</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/153194">153194</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-09-26 14:11:19 -0700 (Mon, 26 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: webkit2-gtk, copy PR-157574.patch from webkit2-gtk-devel.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkit2gtkfilesPR157574patch">users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportswwwwebkit2gtkfilesPR157574patch"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch (153193 => 153194)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch 2016-09-26 19:42:01 UTC (rev 153193)
+++ users/devans/GNOME-3/stable/dports/www/webkit2-gtk/files/PR-157574.patch 2016-09-26 21:11:19 UTC (rev 153194)
</span><span class="lines">@@ -1,11 +1,13 @@
</span><del>---- 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 @@
</del><ins>+diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h
+index ab53183..1310dec 100644
+--- Source/JavaScriptCore/API/WebKitAvailability.h
++++ Source/JavaScriptCore/API/WebKitAvailability.h
+@@ -27,57 +27,12 @@
</ins><span class="cx"> #define __WebKitAvailability__
</span><span class="cx">
</span><span class="cx"> #if defined(__APPLE__)
</span><span class="cx"> -
</span><del>- #include <AvailabilityMacros.h>
</del><ins>+-#include <AvailabilityMacros.h>
</ins><span class="cx"> #include <CoreFoundation/CoreFoundation.h>
</span><span class="cx"> -
</span><span class="cx"> -#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
</span><span class="lines">@@ -23,6 +25,10 @@
</span><span class="cx"> -#define __NSi_10_11 introduced=10.0 // Use 10.0 to indicate that everything is available.
</span><span class="cx"> -#endif
</span><span class="cx"> -
</span><ins>+-#ifndef __NSi_10_12 // Building from trunk rather than SDK.
+-#define __NSi_10_12 introduced=10.0 // Use 10.0 to indicate that everything is available.
+-#endif
+-
</ins><span class="cx"> -#ifndef __AVAILABILITY_INTERNAL__MAC_10_9
</span><span class="cx"> -#define __AVAILABILITY_INTERNAL__MAC_10_9
</span><span class="cx"> -#endif
</span><span class="lines">@@ -44,10 +50,13 @@
</span><span class="cx"> -#if defined(BUILDING_GTK__)
</span><span class="cx"> #undef CF_AVAILABLE
</span><span class="cx"> #define CF_AVAILABLE(_mac, _ios)
</span><ins>+ #undef CF_ENUM_AVAILABLE
+ #define CF_ENUM_AVAILABLE(_mac, _ios)
</ins><span class="cx"> -#endif
</span><span class="cx"> -
</span><span class="cx"> -#else
</span><span class="cx"> -#define CF_AVAILABLE(_mac, _ios)
</span><ins>+-#define CF_ENUM_AVAILABLE(_mac, _ios)
</ins><span class="cx"> -#endif
</span><span class="cx">
</span><span class="cx"> #endif /* __WebKitAvailability__ */
</span></span></pre>
</div>
</div>
</body>
</html>