Date: Tuesday, April 29, 2014 @ 14:04:37 Author: arodseth Revision: 110416
upgpkg: nsgenbind 0.1.0-1 Modified: nsgenbind/trunk/PKGBUILD Deleted: nsgenbind/trunk/bison.patch -------------+ PKGBUILD | 19 ++++++------------- bison.patch | 49 ------------------------------------------------- 2 files changed, 6 insertions(+), 62 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-04-29 11:58:39 UTC (rev 110415) +++ PKGBUILD 2014-04-29 12:04:37 UTC (rev 110416) @@ -3,29 +3,22 @@ # Contributor: Marian Buschsieweke <[email protected]> pkgname=nsgenbind -pkgver=0.0.1 +pkgver=0.1.0 pkgrel=1 pkgdesc='NetSurf javascript binding generator' arch=('x86_64' 'i686') url='http://www.netsurf-browser.org/' license=('GPL') -makedepends=('netsurf-buildsystem') -source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz"; - 'bison.patch') -sha256sums=('05eb57a0b6de8ae094826e39620cee9ef9b672e79f755e7810ca98c0a3989552' - '57f70fb9ea143cbbe5a2c2cbd0a2bfaa32a22c6df84ecaf343a2d04ed86b5a33') +makedepends=('netsurf-buildsystem' 'git') +source=("git://git.netsurf-browser.org/nsgenbind.git#tag=release/$pkgver") +md5sums=('SKIP') build() { - cd "$pkgname-$pkgver" - - patch -p1 -i ../bison.patch - make PREFIX=/usr + make -C "$pkgname" PREFIX=/usr } package() { - cd "$pkgname-$pkgver" - - make install PREFIX=/usr DESTDIR="$pkgdir" + make -C "$pkgname" install PREFIX=/usr DESTDIR="$pkgdir" } # vim:set ts=2 sw=2 et: Deleted: bison.patch =================================================================== --- bison.patch 2014-04-29 11:58:39 UTC (rev 110415) +++ bison.patch 2014-04-29 12:04:37 UTC (rev 110416) @@ -1,49 +0,0 @@ -From 51bd18034c510a6d4711823e08b69af2f7aa063e Mon Sep 17 00:00:00 2001 -From: Vincent Sanders <[email protected]> -Date: Fri, 03 May 2013 10:39:49 +0000 -Subject: fix building teh lexers with bison versions at and after 2.6 - ---- -diff --git a/src/nsgenbind-lexer.l b/src/nsgenbind-lexer.l -index b257c83..8189a72 100644 ---- a/src/nsgenbind-lexer.l -+++ b/src/nsgenbind-lexer.l -@@ -19,6 +19,16 @@ - yylloc->first_column = yylloc->last_column + 1; \ - yylloc->last_column += yyleng; - -+ -+/* Ensure compatability with bison 2.6 and later */ -+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED && defined NSGENBIND_STYPE_IS_DECLARED -+#define YYSTYPE NSGENBIND_STYPE -+#endif -+ -+#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED && defined NSGENBIND_LTYPE_IS_DECLARED -+#define YYLTYPE NSGENBIND_LTYPE -+#endif -+ - %} - - /* lexer options */ -diff --git a/src/webidl-lexer.l b/src/webidl-lexer.l -index 5369d99..74b9bb8 100644 ---- a/src/webidl-lexer.l -+++ b/src/webidl-lexer.l -@@ -27,6 +27,15 @@ - yylloc->first_column = yylloc->last_column + 1; \ - yylloc->last_column += yyleng; - -+/* Ensure compatability with bison 2.6 and later */ -+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED && defined WEBIDL_STYPE_IS_DECLARED -+#define YYSTYPE WEBIDL_STYPE -+#endif -+ -+#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED && defined WEBIDL_LTYPE_IS_DECLARED -+#define YYLTYPE WEBIDL_LTYPE -+#endif -+ - %} - - --- -cgit v0.9.0.3-65-g4555
