Fixes wrong version obtained by git describe and also fixes vte dependency

2 files changed, 6 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1074515e5a65..f7e822e89998 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sat Dec 12 15:13:37 UTC 2015
 pkgbase = termit-git
 	pkgdesc = Terminal emulator based on VTE library with Lua scripting
-	pkgver = 2.5.0.r137.gc53f3c5
+	pkgver = termit.3.0.r1.g8d8fe55
 	pkgrel = 1
 	url = https://github.com/nonstop/termit
 	arch = i686
@@ -11,7 +9,7 @@ pkgbase = termit-git
 	makedepends = git
 	makedepends = cmake>=2.4
 	depends = lua
-	depends = vte>=0.28
+	depends = vte3
 	conflicts = termit
 	source = termit::git+https://github.com/nonstop/termit.git
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index cc310d176426..0eea4af69b68 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: xomachine <xomachiner@gmail.com>
 pkgname=termit-git
-pkgver=2.5.0.r137.gc53f3c5
+pkgver=termit.3.0.r1.g8d8fe55
 pkgrel=1
 pkgdesc="Terminal emulator based on VTE library with Lua scripting"
 conflicts=("termit")
 arch=('i686' 'x86_64')
 url="https://github.com/nonstop/termit"
 license=('GPL')
-depends=("lua" "vte>=0.28")
+depends=("lua" "vte3")
 makedepends=("git" "cmake>=2.4")
 source=("termit::git+https://github.com/nonstop/termit.git")
 md5sums=('SKIP')
@@ -16,7 +16,7 @@ pkgver() {
   _pkgname=$(echo $pkgname | sed -e 's/-git$//')
   cd "$srcdir/$_pkgname"
   ( set -o pipefail
-    git describe --long 2>/dev/null | sed -e 's/\([^-]*-g\)/r\1/;s/-/./g' -e 's/version\.//g' ||
+    git describe --tags --long 2>/dev/null | sed -e 's/\([^-]*-g\)/r\1/;s/-/./g' -e 's/version\.//g' ||
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
   )
 }
@@ -24,7 +24,7 @@ pkgver() {
 build() {
   _pkgname=$(echo $pkgname | sed -e 's/-git$//')
   cd "$srcdir/$_pkgname"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
+  cmake -DCMAKE_C_FLAGS="-I/usr/include/vte-2.91" -DCMAKE_INSTALL_PREFIX=/usr .
   make
 }
 package ()