[packages/gtk-webkit] - fix building with bison 3.0

baggins baggins at pld-linux.org
Sun Aug 18 22:26:43 CEST 2013


commit 2404f7c38250b5ce1939e6613b93ecd35fb1d1e8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Aug 18 22:26:25 2013 +0200

    - fix building with bison 3.0

 bison3.patch    | 10 ++++++++++
 gtk-webkit.spec |  2 ++
 2 files changed, 12 insertions(+)
---
diff --git a/gtk-webkit.spec b/gtk-webkit.spec
index d56822d..fa12cae 100644
--- a/gtk-webkit.spec
+++ b/gtk-webkit.spec
@@ -13,6 +13,7 @@ Source0:	http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 # Source0-md5:	413be319ba171feed9348d1bede6b0a7
 Patch0:		%{name}-sync-builtins.patch
 Patch1:		%{name}-pl.po.patch
+Patch2:		bison3.patch
 URL:		http://webkitgtk.org/
 BuildRequires:	EGL-devel
 BuildRequires:	OpenGL-GLX-devel
@@ -107,6 +108,7 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
 %setup -q -n webkitgtk-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/bison3.patch b/bison3.patch
new file mode 100644
index 0000000..25bda4a
--- /dev/null
+++ b/bison3.patch
@@ -0,0 +1,10 @@
+--- webkitgtk-2.0.4/Source/ThirdParty/ANGLE/src/compiler/glslang.y.orig	2013-07-19 09:03:53.000000000 +0200
++++ webkitgtk-2.0.4/Source/ThirdParty/ANGLE/src/compiler/glslang.y	2013-08-18 22:23:32.345011972 +0200
+@@ -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 {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit.git/commitdiff/2404f7c38250b5ce1939e6613b93ecd35fb1d1e8



More information about the pld-cvs-commit mailing list