[133867] trunk/dports/www/webkit-gtk-2.0

[larryv at macports.org]

Revision: 133867
          https://trac.macports.org/changeset/133867
Author:   larryv at macports.org
Date:     2015-03-13 11:46:03 -0700 (Fri, 13 Mar 2015)
Log Message:
-----------
webkit-{gtk,gtk3}-2.0: Fix build with Bison 3 (#39923)

Adapted from upstream fix (http://trac.webkit.org/changeset/154109).

Modified Paths:
--------------
    trunk/dports/www/webkit-gtk-2.0/Portfile

Added Paths:
-----------
    trunk/dports/www/webkit-gtk-2.0/files/bison3.patch

Modified: trunk/dports/www/webkit-gtk-2.0/Portfile
===================================================================
--- 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)
@@ -56,6 +56,7 @@
 # ppc.patch: https://bugs.webkit.org/show_bug.cgi?id=96005
 # tiger.patch: No upstream bug, http://trac.macports.org/ticket/35923
 # quartz-webcore.patch: https://bugs.webkit.org/show_bug.cgi?id=126326
+# bison3.patch: https://bugs.webkit.org/show_bug.cgi?id=119798
 
 patchfiles \
         clang-assertions.patch \
@@ -67,7 +68,8 @@
         ppc.patch \
         tiger.patch \
         quartz-webcore.patch \
-        patch-freetype-includes.diff
+        patch-freetype-includes.diff \
+        bison3.patch
 
 conflicts_build     google-test
 

Added: trunk/dports/www/webkit-gtk-2.0/files/bison3.patch
===================================================================
--- 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)
@@ -0,0 +1,12 @@
+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 {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150313/a5ab51e6/attachment.html>