Remove now superfluous patch for wscript

Signed-off-by: Christopher Arndt <chris@chrisarndt.de>

3 files changed, 10 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 076ee9ff82b7..38d05848b8b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Oct  9 12:27:25 UTC 2017
 pkgbase = ttl2c-git
 	pkgdesc = Turtle to header conversion utility for LV2 Plugin developers
-	pkgver = 1.0.0.r3.d832ab8
-	pkgrel = 3
+	pkgver = 1.0.1.r5.b64e425
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/lvtk/ttl2c
 	arch = i686
@@ -14,9 +12,7 @@ pkgbase = ttl2c-git
 	provides = ttl2c
 	conflicts = ttl2c
 	source = ttl2c::git+https://github.com/lvtk/ttl2c.git
-	source = wscript-disable-check.diff
 	md5sums = SKIP
-	md5sums = 1203e5270aafad77868aa740b74f7481
 
 pkgname = ttl2c-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1f9f5e60bee5..f7654b2d377c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 _pkgname=ttl2c
 pkgname="${_pkgname}-git"
-pkgver=1.0.0.r3.d832ab8
-pkgrel=3
+pkgver=1.0.1.r5.b64e425
+pkgrel=1
 epoch=1
 pkgdesc="Turtle to header conversion utility for LV2 Plugin developers "
 arch=('i686' 'x86_64')
@@ -13,21 +13,17 @@ depends=('boost-libs')
 makedepends=('python')
 conflicts=("${_pkgname}")
 provides=("${_pkgname}")
-source=("${_pkgname}::git+https://github.com/lvtk/ttl2c.git"
-        'wscript-disable-check.diff')
-md5sums=('SKIP'
-         '1203e5270aafad77868aa740b74f7481')
+source=("${_pkgname}::git+https://github.com/lvtk/ttl2c.git")
+md5sums=('SKIP')
 
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
 
-  echo $(git describe --tags).r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
-}
-
-prepare() {
-  cd "${srcdir}/${_pkgname}"
-  patch -p0 -i "$srcdir/wscript-disable-check.diff"
+  local ver=$(grep ^VERSION wscript | cut -f 2 -d "'")
+  local rev=$(git rev-list --count HEAD)
+  local githash=$(git rev-parse --short HEAD)
+  echo ${ver}.r${rev}.${githash}
 }
 
 build() {
diff --git a/wscript-disable-check.diff b/wscript-disable-check.diff
deleted file mode 100644
index 4fe5aa51d0b8..000000000000
--- a/wscript-disable-check.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- wscript.orig	2017-01-22 16:43:53.239526285 +0100
-+++ wscript	2017-01-22 16:44:02.719526022 +0100
-@@ -29,8 +29,8 @@
-                uselib_store='BOOST', mandatory=True)
-     conf.check(header_name='boost/spirit/include/classic_parse_tree.hpp',
-                uselib_store='BOOST', mandatory=True)
--    conf.check(header_name='boost/spirit/include/classic_utility.hpp',
--               uselib_store='BOOST', mandatory=True)
-+    #conf.check(header_name='boost/spirit/include/classic_utility.hpp',
-+    #           uselib_store='BOOST', mandatory=True)
-     conf.check(header_name='boost/spirit/include/classic_ast.hpp',
-                uselib_store='BOOST', mandatory=True)
-