summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Maclennan2020-04-28 11:55:25 +0300
committerCaleb Maclennan2020-04-28 12:17:04 +0300
commit4bcfa82710cc216d893f0ebc5744bac02335af3d (patch)
tree864200e0c828d688f73df1227a157f1f4a1c7d47
parentfb78173abe2f98890b0485a8f1db600c70dbb97b (diff)
downloadaur-4bcfa82710cc216d893f0ebc5744bac02335af3d.tar.gz
upgpkg: xiphos-git 14.1.0.r112.g4e92215-1
Be more careful about what tags we reference from
-rw-r--r--PKGBUILD21
1 files changed, 11 insertions, 10 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 8671490d6759..9d815dd6e939 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,20 +33,21 @@ source=("git+https://github.com/crosswire/xiphos.git")
sha256sums=('SKIP')
pkgver() {
- cd "${pkgname%-git}"
- git describe --tags --abbrev=7 HEAD | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+ cd "${pkgname%-git}"
+ git describe --tags --abbrev=7 --match="[0-9]*" HEAD |
+ sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
- cd "${pkgname%-git}"
- cmake -S . -B build \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DGTKHTML=ON
- make -C build
+ cd "${pkgname%-git}"
+ cmake -S . -B build \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DGTKHTML=ON
+ make -C build
}
package() {
- cd "${pkgname%-git}"
- make -C build DESTDIR="$pkgdir" install
+ cd "${pkgname%-git}"
+ make -C build DESTDIR="$pkgdir" install
}