<!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>[139265] users/devans/GNOME-3/stable/dports/www/webkit-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/139265">139265</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-08-09 20:12:10 -0700 (Sun, 09 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: webkit-gtk, update patches to fix +quartz build (#47829, #48419).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkfilesclangassertionspatch">users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-assertions.patch</a></li>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkfilesleopardplatformpatch">users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch</a></li>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtkfilesquartzwebcorepatch">users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-webcore.patch</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportswwwwebkitgtk">users/devans/GNOME-3/stable/dports/www/webkit-gtk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportswwwwebkitgtk"></a>
<div class="propset"><h4>Property changes: users/devans/GNOME-3/stable/dports/www/webkit-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/webkit-gtk:127269-139222
</span><span class="cx"> + /branches/mld-qt-481/dports/www/webkit-gtk:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/trunk/dports/www/webkit-gtk:127269-139264
</span><a id="usersdevansGNOME3stabledportswwwwebkitgtkfilesclangassertionspatch"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-assertions.patch (139264 => 139265)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-assertions.patch 2015-08-10 03:00:37 UTC (rev 139264)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/clang-assertions.patch 2015-08-10 03:12:10 UTC (rev 139265)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- Source/WTF/wtf/Assertions.h.orig 2013-01-18 15:03:57.000000000 -0800
</span><span class="cx"> +++ Source/WTF/wtf/Assertions.h 2013-01-18 15:04:46.000000000 -0800
</span><del>-@@ -381,7 +381,8 @@ while (0)
</del><ins>+@@ -371,7 +371,8 @@ while (0)
</ins><span class="cx"> // a function. Hence it uses macro naming convention.
</span><span class="cx"> #pragma clang diagnostic push
</span><span class="cx"> #pragma clang diagnostic ignored "-Wmissing-noreturn"
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkfilesleopardplatformpatch"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch (139264 => 139265)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch 2015-08-10 03:00:37 UTC (rev 139264)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/leopard-platform.patch 2015-08-10 03:12:10 UTC (rev 139265)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- Source/WTF/wtf/Platform.h.orig 2015-01-06 13:30:52.000000000 -0800
</span><span class="cx"> +++ Source/WTF/wtf/Platform.h 2015-01-06 13:42:15.000000000 -0800
</span><del>-@@ -587,11 +587,14 @@
</del><ins>+@@ -590,11 +590,14 @@
</ins><span class="cx">
</span><span class="cx"> #if OS(DARWIN)
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportswwwwebkitgtkfilesquartzwebcorepatch"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-webcore.patch (139264 => 139265)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-webcore.patch 2015-08-10 03:00:37 UTC (rev 139264)
+++ users/devans/GNOME-3/stable/dports/www/webkit-gtk/files/quartz-webcore.patch 2015-08-10 03:12:10 UTC (rev 139265)
</span><span class="lines">@@ -1,18 +1,18 @@
</span><del>---- Source/WebCore/plugins/PluginView-orig.cpp 2013-07-19 00:04:11.000000000 -0700
-+++ Source/WebCore/plugins/PluginView.cpp 2013-08-12 17:48:20.000000000 -0700
-@@ -865,7 +865,7 @@
</del><ins>+--- Source/WebCore/plugins/PluginView.cpp.orig 2015-05-20 02:03:24.000000000 -0700
++++ Source/WebCore/plugins/PluginView.cpp 2015-08-08 15:02:30.000000000 -0700
+@@ -839,7 +839,7 @@
+ #if defined(XP_MACOSX)
</ins><span class="cx"> , m_contextRef(0)
</span><del>- , m_fakeWindow(0)
</del><span class="cx"> #endif
</span><span class="cx"> -#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> +#if PLATFORM(X11) && ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> , m_hasPendingGeometryChange(true)
</span><span class="cx"> , m_drawable(0)
</span><span class="cx"> , m_visual(0)
</span><del>---- Source/WebCore/plugins/PluginView-orig.h 2013-07-19 00:04:11.000000000 -0700
-+++ Source/WebCore/plugins/PluginView.h 2013-08-12 16:09:21.000000000 -0700
-@@ -427,7 +427,7 @@
- Point mousePosForPlugin(MouseEvent* event = 0) const;
</del><ins>+--- Source/WebCore/plugins/PluginView.h.orig 2015-05-20 02:03:24.000000000 -0700
++++ Source/WebCore/plugins/PluginView.h 2015-08-08 15:02:30.000000000 -0700
+@@ -378,7 +378,7 @@
+ void setNPWindowIfNeeded();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> -#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="lines">@@ -20,3 +20,17 @@
</span><span class="cx"> bool m_hasPendingGeometryChange;
</span><span class="cx"> Pixmap m_drawable;
</span><span class="cx"> Visual* m_visual;
</span><ins>+--- Source/WebCore/GNUmakefile.list.am.orig 2015-06-16 09:12:37.000000000 +0200
++++ Source/WebCore/GNUmakefile.list.am 2015-06-16 09:13:38.000000000 +0200
+@@ -6315,11 +6315,9 @@
+
+ if TARGET_QUARTZ
+ if !TARGET_X11
+-if ENABLE_WEBKIT2
+ webcore_sources += \
+ Source/WebCore/plugins/PluginPackageNone.cpp \
+ Source/WebCore/plugins/PluginViewNone.cpp
+-endif # END ENABLE_WEBKIT2
+ endif # END !TARGET_X11
+ platformgtk_sources += \
+ Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
</ins></span></pre>
</div>
</div>
</body>
</html>