From 6b590a97c38f6f934c796370dc822d261655577d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Thu, 13 Feb 2014 08:37:52 -0600
Subject: [PATCH] ftbfs using bison3

---
 glslang_bison3.patch | 14 ++++++++++++++
 qtwebkit.spec        | 10 +++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 glslang_bison3.patch

diff --git a/glslang_bison3.patch b/glslang_bison3.patch
new file mode 100644
index 0000000..3a0712d
--- /dev/null
+++ b/glslang_bison3.patch
@@ -0,0 +1,14 @@
+Description: fix build failure with new bison
+Origin: upstream, https://qt.gitorious.org/qt/qtwebkit/commit/60ba8bd5b3575d
+Last-Update: 2013-12-22
+
+--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
++++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+@@ -47,6 +47,7 @@
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+ 
+ %union {
+     struct {
diff --git a/qtwebkit.spec b/qtwebkit.spec
index 5a4fedd..518a6e0 100644
--- a/qtwebkit.spec
+++ b/qtwebkit.spec
@@ -3,7 +3,7 @@ Name: qtwebkit
 Summary: Qt WebKit bindings
 
 Version: 2.3.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 URL: http://trac.webkit.org/wiki/QtWebKit
@@ -42,6 +42,10 @@ Patch10: qtwebkit-ppc.patch
 # rebased for 2.3.1, not sure if this is still needed?  -- rex
 Patch11: qtwebkit-23-LLInt-C-Loop-backend-ppc.patch
 
+# fix build when using bison3
+# https://qt.gitorious.org/qt/qtwebkit/commit/60ba8bd5b3575d
+Patch12: glslang_bison3.patch
+
 ## upstream patches
 Patch102: 0002-Texmap-GTK-The-poster-circle-doesn-t-appear.patch
 Patch103: 0003-Qt-Tiled-backing-store-not-clipped-to-frame-or-visib.patch
@@ -109,6 +113,7 @@ Provides:  qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
 %patch10 -p1 -b .system-malloc
 %patch11 -p1 -b .Double2Ints
 %endif
+%patch12 -p1 -b .bison3
 %patch102 -p1 -b .0002
 %patch103 -p1 -b .0003
 %patch104 -p1 -b .0004
@@ -198,6 +203,9 @@ popd
 
 
 %changelog
+* Thu Feb 13 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-6
+- ftbfs using bison3
+
 * Wed Feb 12 2014 Rex Dieter <rdieter@fedoraproject.org> 2.3.3-5
 - rebuild (libicu)