update pkg: ptask-git 0.0.9.r9.g2b8b4aa-3

+ patch to make compatible with 2.5
+ change strcmp to strncmp to allow checking of only the major version
numbers

I wonder when I'll just completely port the entire project...

Signed-off-by: Joost Bremmer <toost.b@gmail.com>

3 files changed, 28 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d2fa0d66fc57..b9c901f51440 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ptask-git
 	pkgdesc = A GTK+ graphical user interface for managing tasks in taskwarrior
 	pkgver = 0.0.9.r9.g2b8b4aa
-	pkgrel = 2
+	pkgrel = 3
 	url = http://wpitchoune.net/ptask
 	install = ptask-git.install
 	arch = i686
@@ -17,9 +17,9 @@ pkgbase = ptask-git
 	provides = ptask
 	conflicts = ptask
 	source = ptask-git::git+http://git.wpitchoune.net/ptask.git
-	source = task-2.4.4-compat.patch
+	source = task-2.5-compat.patch
 	sha512sums = SKIP
-	sha512sums = 85ee768407ca6827df6544d86772d392e269d26e1ca6ca2faebb059e52cc9acd04c4baf2a1f4f02f5d088dd470992c9a35398512c465a988fc3aa3588d1a8a77
+	sha512sums = ffe243097a6580105820fa2ba84b52667ba8d97c34b9e377b54ce297896dbb695fab47d66c634dff724d4c676bf60a83690e5d574b7b34c0b757558f305a6a23
 
 pkgname = ptask-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 607023de9b61..694bdb86fce0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ptask-git
 pkgver=0.0.9.r9.g2b8b4aa
-pkgrel=2
+pkgrel=3
 pkgdesc='A GTK+ graphical user interface for managing tasks in taskwarrior'
 arch=('i686'
       'x86_64')
@@ -18,9 +18,9 @@ makedepends=('git'
 			 'asciidoc')
 install=$pkgname.install
 source=("$pkgname::git+http://git.wpitchoune.net/${pkgname%-git}.git"
-        'task-2.4.4-compat.patch')
+        'task-2.5-compat.patch')
 sha512sums=('SKIP'
-            '85ee768407ca6827df6544d86772d392e269d26e1ca6ca2faebb059e52cc9acd04c4baf2a1f4f02f5d088dd470992c9a35398512c465a988fc3aa3588d1a8a77')
+            'ffe243097a6580105820fa2ba84b52667ba8d97c34b9e377b54ce297896dbb695fab47d66c634dff724d4c676bf60a83690e5d574b7b34c0b757558f305a6a23')
 conflicts=("${pkgname%-git}")
 provides=("${pkgname%-git}")
 
@@ -31,7 +31,7 @@ pkgver() {
 
 prepare() {
   cd "$srcdir/$pkgname"
-  patch -p1 -i ${srcdir}/task-2.4.4-compat.patch
+  patch -p1 -i ${srcdir}/task-2.5-compat.patch
 }
 
 build() {
diff --git a/task-2.5-compat.patch b/task-2.5-compat.patch
new file mode 100644
index 000000000000..fa4b0c0ceb0d
--- /dev/null
+++ b/task-2.5-compat.patch
@@ -0,0 +1,21 @@
+diff -aur ptask-git/src/tw.c ptask-new/src/tw.c
+--- ptask-git/src/tw.c	2016-04-04 14:51:03.742076645 +0200
++++ ptask-new/src/tw.c	2016-04-04 14:54:59.306938336 +0200
+@@ -111,11 +111,12 @@
+ 
+ 	log_debug("task version: %s", ver);
+ 
+-	if (!strcmp(ver, "2.2.0")
+-	    || !strcmp(ver, "2.0.0")
+-	    || !strcmp(ver, "2.3.0")
+-	    || !strcmp(ver, "2.4.0")
+-	    || !strcmp(ver, "2.4.1"))
++	if (!strncmp(ver, "2.0", 3)
++	    || !strncmp(ver, "2.1", 3)
++		|| !strncmp(ver, "2.2", 3)
++	    || !strncmp(ver, "2.3", 3)
++	    || !strncmp(ver, "2.4", 3)
++	    || !strncmp(ver, "2.5", 3))
+ 		return 1;
+ 	else
+ 		return 0;