[arch-commits] Commit in webkitgtk2/trunk (PKGBUILD bison3.patch)

[Jan Steffens]

    Date: Saturday, October 12, 2013 @ 21:34:25
  Author: heftig
Revision: 196405

icu rebuild

Added:
  webkitgtk2/trunk/bison3.patch
Modified:
  webkitgtk2/trunk/PKGBUILD

--------------+
 PKGBUILD     |   13 ++++++++++---
 bison3.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-12 18:57:59 UTC (rev 196404)
+++ PKGBUILD	2013-10-12 19:34:25 UTC (rev 196405)
@@ -3,7 +3,7 @@
 
 pkgname=webkitgtk2
 pkgver=1.10.2
-pkgrel=7
+pkgrel=8
 pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
 arch=(i686 x86_64)
 url="http://webkitgtk.org/"
@@ -16,9 +16,16 @@
 conflicts=(libwebkit)
 replaces=(libwebkit)
 options=(!libtool !emptydirs)
-source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
-sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c')
+source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz
+        bison3.patch)
+sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c'
+            '0996b25d17be61470678c18db9bfad1bf807aac410690fb8935370dbc8b3ce34')
 
+prepare() {
+  cd webkitgtk-$pkgver
+  patch -Np1 -i ../bison3.patch
+}
+
 build() {
   cd webkitgtk-$pkgver
 

Added: bison3.patch
===================================================================
--- bison3.patch	                        (rev 0)
+++ bison3.patch	2013-10-12 19:34:25 UTC (rev 196405)
@@ -0,0 +1,11 @@
+diff -u -r webkitgtk-1.10.2/Source/ThirdParty/ANGLE/src/compiler/glslang.y webkitgtk-1.10.2-bison3/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+--- webkitgtk-1.10.2/Source/ThirdParty/ANGLE/src/compiler/glslang.y	2012-11-23 21:12:16.000000000 +0100
++++ webkitgtk-1.10.2-bison3/Source/ThirdParty/ANGLE/src/compiler/glslang.y	2013-10-12 20:42:54.531301735 +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 {