<!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>[115803] trunk/dports/www</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/115803">115803</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-01-11 12:21:09 -0800 (Sat, 11 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkit-gtk{,-devel}: Possible fix for +quartz build failure (#42010)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkitgtkPortfile">trunk/dports/www/webkit-gtk/Portfile</a></li>
<li><a href="#trunkdportswwwwebkitgtkfilesquartzduplicatesymbolspatch">trunk/dports/www/webkit-gtk/files/quartz-duplicate-symbols.patch</a></li>
<li><a href="#trunkdportswwwwebkitgtkfilesquartzincludewidgetbackingstorecairopatch">trunk/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch</a></li>
<li><a href="#trunkdportswwwwebkitgtkdevelPortfile">trunk/dports/www/webkit-gtk-devel/Portfile</a></li>
<li><a href="#trunkdportswwwwebkitgtkdevelfilesquartzduplicatesymbolspatch">trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols.patch</a></li>
<li><a href="#trunkdportswwwwebkitgtkdevelfilesquartzincludewidgetbackingstorecairopatch">trunk/dports/www/webkit-gtk-devel/files/quartz-include-widgetbackingstorecairo.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwwebkitgtkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit-gtk/Portfile (115802 => 115803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk/Portfile 2014-01-11 19:22:12 UTC (rev 115802)
+++ trunk/dports/www/webkit-gtk/Portfile 2014-01-11 20:21:09 UTC (rev 115803)
</span><span class="lines">@@ -50,12 +50,14 @@
</span><span class="cx"> # case-insensitive.patch: https://bugs.webkit.org/show_bug.cgi?id=65811
</span><span class="cx"> # our-icu.patch: No upstream bug report, probably not wanted
</span><span class="cx"> # quartz-webcore.patch: https://bugs.webkit.org/show_bug.cgi?id=126326
</span><ins>+# quartz-duplicate-symbols.patch: https://bugs.webkit.org/show_bug.cgi?id=126821
</ins><span class="cx"> # clang-check.patch: https://bugs.webkit.org/show_bug.cgi?id=126324
</span><span class="cx">
</span><span class="cx"> patchfiles \
</span><span class="cx"> clang-assertions.patch \
</span><span class="cx"> case-insensitive.patch \
</span><span class="cx"> our-icu.patch \
</span><ins>+ quartz-duplicate-symbols.patch \
</ins><span class="cx"> quartz-webcore.patch \
</span><span class="cx"> clang-check.patch \
</span><span class="cx"> no-WebCoreLayer.a.patch
</span><span class="lines">@@ -231,8 +233,7 @@
</span><span class="cx"> # quartz-include-widgetbackingstorecairo.patch
</span><span class="cx"> # https://trac.macports.org/ticket/38203
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=111598
</span><del>- patchfiles-append quartz-duplicate-symbols.patch \
- quartz-include-widgetbackingstorecairo.patch
</del><ins>+ patchfiles-append quartz-include-widgetbackingstorecairo.patch
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant video description {Enable HTML5 video support using gstreamer} {
</span></span></pre></div>
<a id="trunkdportswwwwebkitgtkfilesquartzduplicatesymbolspatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit-gtk/files/quartz-duplicate-symbols.patch (115802 => 115803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk/files/quartz-duplicate-symbols.patch 2014-01-11 19:22:12 UTC (rev 115802)
+++ trunk/dports/www/webkit-gtk/files/quartz-duplicate-symbols.patch 2014-01-11 20:21:09 UTC (rev 115803)
</span><span class="lines">@@ -1,13 +1,13 @@
</span><del>---- Source/WebCore/plugins/PluginPackageNone.cpp.orig 2012-10-29 20:40:46.000000000 -0400
-+++ Source/WebCore/plugins/PluginPackageNone.cpp 2012-10-29 20:40:46.000000000 -0400
-@@ -28,10 +28,6 @@
</del><ins>+--- Source/WebCore/GNUmakefile.list.am.orig 2013-12-18 03:03:41.000000000 -0800
++++ Source/WebCore/GNUmakefile.list.am 2014-01-11 12:15:07.000000000 -0800
+@@ -6283,10 +6283,6 @@ webcoregtk_sources += \
+ Source/WebCore/platform/graphics/glx/GLContextGLX.cpp \
+ Source/WebCore/platform/graphics/glx/GLContextGLX.h
+ endif # END USE_GLX
+-else
+-webcore_sources += \
+- Source/WebCore/plugins/PluginPackageNone.cpp \
+- Source/WebCore/plugins/PluginViewNone.cpp
+ endif # END TARGET_X11
</ins><span class="cx">
</span><del>- namespace WebCore {
-
--void PluginPackage::determineQuirks(const String&)
--{
--}
--
- bool PluginPackage::fetchInfo()
- {
- return false;
</del><ins>+ if TARGET_X11_OR_WAYLAND
</ins></span></pre></div>
<a id="trunkdportswwwwebkitgtkfilesquartzincludewidgetbackingstorecairopatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch (115802 => 115803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch 2014-01-11 19:22:12 UTC (rev 115802)
+++ trunk/dports/www/webkit-gtk/files/quartz-include-widgetbackingstorecairo.patch 2014-01-11 20:21:09 UTC (rev 115803)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- Source/WebCore/GNUmakefile.list.am.old 2013-02-24 19:01:51.000000000 +0100
-+++ Source/WebCore/GNUmakefile.list.am 2013-02-24 19:03:41.000000000 +0100
-@@ -5949,6 +5949,9 @@
</del><ins>+--- Source/WebCore/GNUmakefile.list.am.orig 2014-01-11 12:15:07.000000000 -0800
++++ Source/WebCore/GNUmakefile.list.am 2014-01-11 12:16:03.000000000 -0800
+@@ -6328,6 +6328,9 @@ else
</ins><span class="cx"> webcore_sources += \
</span><span class="cx"> Source/WebCore/plugins/PluginPackageNone.cpp \
</span><span class="cx"> Source/WebCore/plugins/PluginViewNone.cpp
</span><span class="lines">@@ -8,5 +8,5 @@
</span><span class="cx"> +webcoregtk_sources += \
</span><span class="cx"> + Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
</span><span class="cx"> endif # END TARGET_WIN32
</span><del>- endif # END TARGET_X11
</del><ins>+ endif # END TARGET_X11_OR_WAYLAND
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportswwwwebkitgtkdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit-gtk-devel/Portfile (115802 => 115803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk-devel/Portfile 2014-01-11 19:22:12 UTC (rev 115802)
+++ trunk/dports/www/webkit-gtk-devel/Portfile 2014-01-11 20:21:09 UTC (rev 115803)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> # case-insensitive.patch: https://bugs.webkit.org/show_bug.cgi?id=65811
</span><span class="cx"> # our-icu.patch: No upstream bug report, probably not wanted
</span><span class="cx"> # quartz-webcore.patch: https://bugs.webkit.org/show_bug.cgi?id=126326
</span><ins>+# quartz-duplicate-symbols.patch: https://bugs.webkit.org/show_bug.cgi?id=126821
</ins><span class="cx"> # clang-check.patch: https://bugs.webkit.org/show_bug.cgi?id=126324
</span><span class="cx"> # libc++.patch: https://bugs.webkit.org/show_bug.cgi?id=126431
</span><span class="cx"> # gstreamer.patch: https://bugs.webkit.org/show_bug.cgi?id=126437
</span><span class="lines">@@ -63,6 +64,7 @@
</span><span class="cx"> clang-assertions.patch \
</span><span class="cx"> case-insensitive.patch \
</span><span class="cx"> our-icu.patch \
</span><ins>+ quartz-duplicate-symbols.patch \
</ins><span class="cx"> quartz-webcore.patch \
</span><span class="cx"> clang-check.patch \
</span><span class="cx"> libc++.patch \
</span><span class="lines">@@ -239,8 +241,7 @@
</span><span class="cx"> # quartz-include-widgetbackingstorecairo.patch
</span><span class="cx"> # https://trac.macports.org/ticket/38203
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=111598
</span><del>- patchfiles-append quartz-duplicate-symbols.patch \
- quartz-include-widgetbackingstorecairo.patch
</del><ins>+ patchfiles-append quartz-include-widgetbackingstorecairo.patch
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant video description {Enable HTML5 video support using gstreamer} {
</span></span></pre></div>
<a id="trunkdportswwwwebkitgtkdevelfilesquartzduplicatesymbolspatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols.patch (115802 => 115803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols.patch 2014-01-11 19:22:12 UTC (rev 115802)
+++ trunk/dports/www/webkit-gtk-devel/files/quartz-duplicate-symbols.patch 2014-01-11 20:21:09 UTC (rev 115803)
</span><span class="lines">@@ -1,13 +1,13 @@
</span><del>---- Source/WebCore/plugins/PluginPackageNone.cpp.orig 2012-10-29 20:40:46.000000000 -0400
-+++ Source/WebCore/plugins/PluginPackageNone.cpp 2012-10-29 20:40:46.000000000 -0400
-@@ -28,10 +28,6 @@
</del><ins>+--- Source/WebCore/GNUmakefile.list.am.orig 2013-12-18 03:03:41.000000000 -0800
++++ Source/WebCore/GNUmakefile.list.am 2014-01-11 12:15:07.000000000 -0800
+@@ -6283,10 +6283,6 @@ webcoregtk_sources += \
+ Source/WebCore/platform/graphics/glx/GLContextGLX.cpp \
+ Source/WebCore/platform/graphics/glx/GLContextGLX.h
+ endif # END USE_GLX
+-else
+-webcore_sources += \
+- Source/WebCore/plugins/PluginPackageNone.cpp \
+- Source/WebCore/plugins/PluginViewNone.cpp
+ endif # END TARGET_X11
</ins><span class="cx">
</span><del>- namespace WebCore {
-
--void PluginPackage::determineQuirks(const String&)
--{
--}
--
- bool PluginPackage::fetchInfo()
- {
- return false;
</del><ins>+ if TARGET_X11_OR_WAYLAND
</ins></span></pre></div>
<a id="trunkdportswwwwebkitgtkdevelfilesquartzincludewidgetbackingstorecairopatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit-gtk-devel/files/quartz-include-widgetbackingstorecairo.patch (115802 => 115803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk-devel/files/quartz-include-widgetbackingstorecairo.patch 2014-01-11 19:22:12 UTC (rev 115802)
+++ trunk/dports/www/webkit-gtk-devel/files/quartz-include-widgetbackingstorecairo.patch 2014-01-11 20:21:09 UTC (rev 115803)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- Source/WebCore/GNUmakefile.list.am.old 2013-02-24 19:01:51.000000000 +0100
-+++ Source/WebCore/GNUmakefile.list.am 2013-02-24 19:03:41.000000000 +0100
-@@ -5949,6 +5949,9 @@
</del><ins>+--- Source/WebCore/GNUmakefile.list.am.orig 2014-01-11 12:15:07.000000000 -0800
++++ Source/WebCore/GNUmakefile.list.am 2014-01-11 12:16:03.000000000 -0800
+@@ -6328,6 +6328,9 @@ else
</ins><span class="cx"> webcore_sources += \
</span><span class="cx"> Source/WebCore/plugins/PluginPackageNone.cpp \
</span><span class="cx"> Source/WebCore/plugins/PluginViewNone.cpp
</span><span class="lines">@@ -8,5 +8,5 @@
</span><span class="cx"> +webcoregtk_sources += \
</span><span class="cx"> + Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
</span><span class="cx"> endif # END TARGET_WIN32
</span><del>- endif # END TARGET_X11
</del><ins>+ endif # END TARGET_X11_OR_WAYLAND
</ins><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>