diff options
| author | root <root@rshg054.dnsready.net> | 2013-10-18 01:09:28 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-10-18 01:09:28 -0700 |
| commit | cc1dbaab9d968ae5ace1956c3662b8b492694800 (patch) | |
| tree | da9b8d35950f63d7a68e4d4e5938715e1f0f5cdb /extra/webkitgtk2 | |
| parent | c72dc5de577922ea7f6002cdabcfac1576eae211 (diff) | |
Fri Oct 18 01:09:01 PDT 2013
Diffstat (limited to 'extra/webkitgtk2')
| -rw-r--r-- | extra/webkitgtk2/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/webkitgtk2/bison3.patch | 11 |
2 files changed, 22 insertions, 4 deletions
diff --git a/extra/webkitgtk2/PKGBUILD b/extra/webkitgtk2/PKGBUILD index 2b2dc3754..cf9c63506 100644 --- a/extra/webkitgtk2/PKGBUILD +++ b/extra/webkitgtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188485 2013-06-14 23:12:24Z heftig $ +# $Id: PKGBUILD 196752 2013-10-17 14:03:02Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> 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,8 +16,15 @@ provides=("libwebkit=${pkgver}") 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 diff --git a/extra/webkitgtk2/bison3.patch b/extra/webkitgtk2/bison3.patch new file mode 100644 index 000000000..9c9dabb82 --- /dev/null +++ b/extra/webkitgtk2/bison3.patch @@ -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 { |