Fix building w/bison-3 #485818 by Patrick Lauer.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

4 files changed, 27 insertions, 3 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index afc85059fa36..3b6fc39f4be4 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.231 2014/01/21 22:42:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.232 2014/01/24 19:06:31 vapier Exp $
+
+  24 Jan 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/webkit-gtk-1.8.3-bison-3.patch, webkit-gtk-1.8.3-r201.ebuild,
+  webkit-gtk-1.8.3-r300.ebuild:
+  Fix building w/bison-3 #485818 by Patrick Lauer.
 
   21 Jan 2014; Gilles Dartiguelongue <eva@gentoo.org>
   webkit-gtk-1.8.3-r200.ebuild, webkit-gtk-1.8.3-r201.ebuild,
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-bison-3.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-bison-3.patch
new file mode 100644
index 000000000000..d3d2477a79e3
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.8.3-bison-3.patch
@@ -0,0 +1,15 @@
+can't rely on YYLEX_PARAM calling yylex correctly, so use %lex-param
+instead.  fixes building with bison-3.
+
+https://bugs.gentoo.org/485818
+
+--- Source/ThirdParty/ANGLE/src/compiler/glslang.y
++++ Source/ThirdParty/ANGLE/src/compiler/glslang.y
+@@ -32,6 +32,7 @@
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {TParseContext* context}
+ 
+ %union {
+     struct {
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild
index a3ade957d212..cf2f830563c4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild,v 1.14 2014/01/21 22:42:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r201.ebuild,v 1.15 2014/01/24 19:06:31 vapier Exp $
 
 EAPI=5
 
@@ -138,6 +138,8 @@ src_prepare() {
 	# Bad utf8 data is being passed to enchant_dict_check, bug #447500
 	epatch "${FILESDIR}/${PN}-1.8.3-spellchecker.patch"
 
+	epatch "${FILESDIR}/${PN}-1.8.3-bison-3.patch" #485818
+
 	# Drop DEPRECATED flags
 	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild
index 75cbc7d7d6dd..5b3d43239be6 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild,v 1.15 2014/01/21 22:42:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.8.3-r300.ebuild,v 1.16 2014/01/24 19:06:31 vapier Exp $
 
 EAPI="4"
 
@@ -144,6 +144,8 @@ src_prepare() {
 	# Bug #403049, https://bugs.webkit.org/show_bug.cgi?id=79605
 	epatch "${FILESDIR}/${PN}-1.7.5-linguas.patch"
 
+	epatch "${FILESDIR}/${PN}-1.8.3-bison-3.patch" #485818
+
 	# Drop DEPRECATED flags
 	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die