summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgenstern2020-11-09 23:41:15 +1300
committerMorgenstern2020-11-09 23:41:15 +1300
commit4204daf41e69f16c3532b2846080b907d1464674 (patch)
treea9af6d3f048ad5a51653e87716a261398c5034e7
parent390089a820f08bfd461eed44d8a90a07b72df00e (diff)
downloadaur-4204daf41e69f16c3532b2846080b907d1464674.tar.gz
Add uchardet dependency, simplify pkgver function
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD13
2 files changed, 7 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1a50d2c62af..b8d4d55fc8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cherrytree-git
pkgdesc = Hierarchical note-taking application, git version
- pkgver = 0.99.13.r0.gc2b74656
+ pkgver = 0.99.19.r5.gcb239d48
pkgrel = 1
url = https://github.com/giuspen/cherrytree
arch = x86_64
@@ -11,6 +11,7 @@ pkgbase = cherrytree-git
depends = gspell
depends = gtksourceviewmm
depends = libxml++2.6
+ depends = uchardet
provides = cherrytree
conflicts = cherrytree
source = git+https://github.com/giuspen/cherrytree.git
diff --git a/PKGBUILD b/PKGBUILD
index 9680693410d..b58203c4317 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Morgenstern <charles [at] charlesbwise [dot] com>
pkgname=cherrytree-git
-_pkgname=$(echo -e "${pkgname/-git/}")
-pkgver=0.99.13.r0.gc2b74656
+_pkgname="${pkgname%%-git}"
+pkgver=0.99.19.r5.gcb239d48
pkgrel=1
pkgdesc="Hierarchical note-taking application, git version"
arch=('x86_64')
@@ -10,7 +10,8 @@ url="https://github.com/giuspen/${_pkgname}"
license=('GPL3')
depends=('gspell'
'gtksourceviewmm'
- 'libxml++2.6')
+ 'libxml++2.6'
+ 'uchardet')
makedepends=('cmake'
'git'
'python-lxml')
@@ -20,12 +21,8 @@ source=("git+https://github.com/giuspen/${_pkgname}.git")
sha256sums=('SKIP')
pkgver() {
- local _pkgver
cd "${_pkgname}"
- _pkgver=$(grep -m1 cherrytree debian/changelog | sed 's/.*(\(.*\)).*$/\1/g' | \
- sed 's/\-.*$//g')
- git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | \
- sed "s/.*r/$_pkgver\.r/"
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {