summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgenstern2020-12-22 12:07:29 +1300
committerMorgenstern2020-12-22 12:07:29 +1300
commit2842f944a15ed489846ec9ac3d76e0a21afcabca (patch)
tree61316349a11f6c5629af46c2a857a149797700ce
parentf04052176fa60ae8e7a75c3c4aeb898e555f0487 (diff)
downloadaur-2842f944a15ed489846ec9ac3d76e0a21afcabca.tar.gz
Update to v0.99.26, add test instructions, switch source back to giuspen.com
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD29
2 files changed, 23 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e37caea50be3..f14030658bc8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = cherrytree
pkgdesc = Hierarchical note-taking application
- pkgver = 0.99.25
- pkgrel = 2
+ pkgver = 0.99.26
+ pkgrel = 1
url = https://www.giuspen.com/cherrytree/
arch = x86_64
license = GPL3
@@ -11,8 +11,8 @@ pkgbase = cherrytree
depends = gtksourceviewmm
depends = libxml++2.6
depends = uchardet
- source = cherrytree-0.99.25.tar.gz::https://github.com/giuspen/cherrytree/archive/0.99.25.tar.gz
- sha256sums = fc35b15655b25299576cfceb73bb69c8b1201ceb82fe6e75591e529506b5177d
+ source = https://www.giuspen.com/software/cherrytree_0.99.26.tar.xz
+ sha256sums = 29aaabea722faeaaed4e1142551dfeb2e022e5bce25ebccd626d74fe0cd3572e
pkgname = cherrytree
diff --git a/PKGBUILD b/PKGBUILD
index c7593bcbef83..31c08da824dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: Morgenstern <charles [at] charlesbwise [dot] com>
pkgname=cherrytree
-pkgver=0.99.25
-pkgrel=2
+pkgver=0.99.26
+pkgrel=1
pkgdesc="Hierarchical note-taking application"
arch=('x86_64')
-url="https://www.giuspen.com/cherrytree/"
+url="https://www.giuspen.com/${pkgname}/"
license=('GPL3')
depends=('gspell'
'gtksourceviewmm'
@@ -13,23 +13,32 @@ depends=('gspell'
'uchardet')
makedepends=('cmake'
'python')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/giuspen/cherrytree/archive/${pkgver}.tar.gz")
-sha256sums=('fc35b15655b25299576cfceb73bb69c8b1201ceb82fe6e75591e529506b5177d')
+source=(https://www.giuspen.com/software/${pkgname}_${pkgver}.tar.xz)
+sha256sums=('29aaabea722faeaaed4e1142551dfeb2e022e5bce25ebccd626d74fe0cd3572e')
prepare() {
# Fix automatic optimisation flag override
- sed -i 's/-O3/-O2/' "${pkgname}-${pkgver}/CMakeLists.txt"
+ sed -i 's/-O3/-O2/' "${pkgname}_${pkgver}/CMakeLists.txt"
}
+# Remove GMOCK and TESTING options to build tests
+# Make sure there are NO instances of cherrytree running when building!
build() {
cmake \
- -B "${pkgname}-${pkgver}/build" \
- -S "${pkgname}-${pkgver}" \
+ -B "${pkgname}_${pkgver}/build" \
+ -S "${pkgname}_${pkgver}" \
+ -DBUILD_GMOCK:BOOL=OFF \
-DBUILD_TESTING:BOOL=OFF \
-Wno-dev
- make -C "${pkgname}-${pkgver}/build"
+ make -C "${pkgname}_${pkgver}/build" all
}
+# Uncomment to build tests
+# Make sure there are NO instances of cherrytree running when building!
+#check() {
+# make -C "${pkgname}_${pkgver}/build" test
+#}
+
package() {
- make -C "${pkgname}-${pkgver}/build" DESTDIR="${pkgdir}" install
+ make -C "${pkgname}_${pkgver}/build" DESTDIR="${pkgdir}" install
}