summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander F. Rødseth2018-10-29 14:42:11 +0100
committerAlexander F. Rødseth2018-10-29 14:42:11 +0100
commit5d2c1adcf93d0cb8e3d61eab359e71a5d71e8ff2 (patch)
treea9f6339cd200757c8fa74eaf649101bc06bb1053
parentad3fbf303a31bcf73f0dd722cb65b69ce91e7ed2 (diff)
downloadaur-5d2c1adcf93d0cb8e3d61eab359e71a5d71e8ff2.tar.gz
Upgrade to 1.0
-rw-r--r--.SRCINFO28
-rw-r--r--[-rwxr-xr-x]PKGBUILD46
-rwxr-xr-xptask.install12
-rw-r--r--task-2.4.1-1.patch13
4 files changed, 39 insertions, 60 deletions
diff --git a/.SRCINFO b/.SRCINFO
index abaeb9ded24..db0ca8c9ab9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
+# Generated by mksrcinfo v8
+# Mon Oct 29 13:42:04 UTC 2018
pkgbase = ptask
- pkgdesc = A GTK+ graphical user interface for managing tasks in taskwarrior
- pkgver = 0.0.9
- pkgrel = 3
- url = http://wpitchoune.net/ptask
- install = ptask.install
- arch = i686
+ pkgdesc = GTK+ task managing application
+ pkgver = 1.0.0
+ pkgrel = 1
+ url = https://wpitchoune.net/ptask
arch = x86_64
license = GPL2
- depends = task
- depends = json-c
+ makedepends = addinclude
depends = gtk3
- depends = hicolor-icon-theme
- optdepends = asciidoc: required to generate html version of NEWS and README
- optdepends = help2man: required to regenerate manpages automatically
- source = http://wpitchoune.net/ptask/files/ptask-0.0.9.tar.gz
- source = task-2.4.1-1.patch
- sha256sums = 24df60301bd7e94ab56187f8fcd11e64c6589a72b95970ff880069ca200fc9e8
- sha256sums = 80ec8f7e11fff4de6ce69160dccc588ec2f5244ed30632c32f8fe8a1a93050a0
+ depends = json-c
+ depends = task=2.5.1
+ optdepends = asciidoc: for generating the HTML version of NEWS and README
+ optdepends = help2man: for regenerate manpages automatically
+ source = https://wpitchoune.net/ptask/files/ptask-1.0.0.tar.gz
+ sha256sums = b8cde0f7994bd91410a13284188c865e255621bcfd23f6051f7b25b14eced18e
pkgname = ptask
diff --git a/PKGBUILD b/PKGBUILD
index 166ed9534ec..d1bbcfed321 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,38 @@
-# Maintainer: stef204 <stef204 AT [*] (where[*]=yandex DOT com)>
+# Maintainer: Alexander F. Rødseth <xyproto@archlinux.org>
+# Contributor: stef204 <stef204@yandex.com>
pkgname=ptask
-pkgver=0.0.9
-pkgrel=3
-pkgdesc="A GTK+ graphical user interface for managing tasks in taskwarrior"
-arch=('i686' 'x86_64')
-url="http://wpitchoune.net/ptask"
+pkgver=1.0.0
+pkgrel=1
+_taskver=2.5.1
+pkgdesc='GTK+ task managing application'
+arch=('x86_64')
+url='https://wpitchoune.net/ptask'
license=('GPL2')
-depends=('task' 'json-c' 'gtk3' 'hicolor-icon-theme')
-optdepends=('asciidoc: required to generate html version of NEWS and README'
- 'help2man: required to regenerate manpages automatically')
-install=$pkgname.install
-source=("http://wpitchoune.net/ptask/files/$pkgname-$pkgver.tar.gz" "task-2.4.1-1.patch")
-sha256sums=('24df60301bd7e94ab56187f8fcd11e64c6589a72b95970ff880069ca200fc9e8'
- '80ec8f7e11fff4de6ce69160dccc588ec2f5244ed30632c32f8fe8a1a93050a0')
+depends=('gtk3' 'json-c' "task=$_taskver")
+makedepends=('addinclude')
+optdepends=('asciidoc: for generating the HTML version of NEWS and README'
+ 'help2man: for regenerate manpages automatically')
+source=("https://wpitchoune.net/ptask/files/$pkgname-$pkgver.tar.gz")
+sha256sums=('b8cde0f7994bd91410a13284188c865e255621bcfd23f6051f7b25b14eced18e')
prepare() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p2 < $srcdir/task-2.4.1-1.patch
+ cd "$pkgname-$pkgver/src"
+
+ echo -e '#pragma once\n#define is_error(ptr) (ptr == NULL)' > is_error.h
+ addinclude tw.c is_error
+ sed -i "s,2.0.0,$_taskver," tw.c
}
build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/usr/share
- make
+ cd "$pkgname-$pkgver"
+
+ ./configure --prefix=/usr --sysconfdir=/usr/share
+ make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
}
+
+# vim: et ts=2 sw=2:
diff --git a/ptask.install b/ptask.install
deleted file mode 100755
index 0880e5acf6f..00000000000
--- a/ptask.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/task-2.4.1-1.patch b/task-2.4.1-1.patch
deleted file mode 100644
index ff2b2cb919a..00000000000
--- a/task-2.4.1-1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../ptask-0.0.9/src/tw.c 2014-10-10 13:04:35.000000000 +0200
-+++ ../ptask-0.0.9-patched/src/tw.c 2015-02-18 15:07:45.850462451 +0100
-@@ -109,8 +109,8 @@
- 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.3.0")
-+ || !strcmp(ver, "2.4.1-1"))
- return 1;
- else
- return 0;