<!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>[133867] trunk/dports/www/webkit-gtk-2.0</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/133867">133867</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2015-03-13 11:46:03 -0700 (Fri, 13 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkit-{gtk,gtk3}-2.0: Fix build with Bison 3 (#39923)
Adapted from upstream fix (http://trac.webkit.org/changeset/154109).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkitgtk20Portfile">trunk/dports/www/webkit-gtk-2.0/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkitgtk20filesbison3patch">trunk/dports/www/webkit-gtk-2.0/files/bison3.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwwebkitgtk20Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit-gtk-2.0/Portfile (133866 => 133867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk-2.0/Portfile 2015-03-13 18:45:53 UTC (rev 133866)
+++ trunk/dports/www/webkit-gtk-2.0/Portfile 2015-03-13 18:46:03 UTC (rev 133867)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> # ppc.patch: https://bugs.webkit.org/show_bug.cgi?id=96005
</span><span class="cx"> # tiger.patch: No upstream bug, http://trac.macports.org/ticket/35923
</span><span class="cx"> # quartz-webcore.patch: https://bugs.webkit.org/show_bug.cgi?id=126326
</span><ins>+# bison3.patch: https://bugs.webkit.org/show_bug.cgi?id=119798
</ins><span class="cx">
</span><span class="cx"> patchfiles \
</span><span class="cx"> clang-assertions.patch \
</span><span class="lines">@@ -67,7 +68,8 @@
</span><span class="cx"> ppc.patch \
</span><span class="cx"> tiger.patch \
</span><span class="cx"> quartz-webcore.patch \
</span><del>- patch-freetype-includes.diff
</del><ins>+ patch-freetype-includes.diff \
+ bison3.patch
</ins><span class="cx">
</span><span class="cx"> conflicts_build google-test
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportswwwwebkitgtk20filesbison3patch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/webkit-gtk-2.0/files/bison3.patch (0 => 133867)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit-gtk-2.0/files/bison3.patch (rev 0)
+++ trunk/dports/www/webkit-gtk-2.0/files/bison3.patch 2015-03-13 18:46:03 UTC (rev 133867)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Index: Source/ThirdParty/ANGLE/src/compiler/glslang.y
+===================================================================
+--- Source/ThirdParty/ANGLE/src/compiler/glslang.y.orig
++++ Source/ThirdParty/ANGLE/src/compiler/glslang.y
+@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glsl
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+
+ %union {
+ struct {
</ins></span></pre>
</div>
</div>
</body>
</html>