summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2023-02-04 21:33:47 -0300
committerDaniel Bermond2023-02-04 21:33:47 -0300
commitffbe7089042886ed88c4211ce98e7da06f3b812f (patch)
tree1955426293124a0f3d36f748eda50e29934d2e11
parent6f73a93a2607b4c79e6d1fcf45d71b19bfa6e0e7 (diff)
downloadaur-cs-signal-git.tar.gz
Match latest upstream changes
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD11
2 files changed, 9 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c92ab237b475..d09fd3a2b403 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,14 @@
pkgbase = cs-signal-git
pkgdesc = Library for thread aware signal/slot delivery (git version)
- pkgver = r45.6add822
+ pkgver = 1.3.0.r0.g727df0a
pkgrel = 1
url = https://www.copperspice.com/
arch = x86_64
license = BSD
makedepends = git
makedepends = cmake
+ makedepends = catch2
+ makedepends = cs-libguarded
depends = gcc-libs
provides = cs-signal
conflicts = cs-signal
@@ -14,4 +16,3 @@ pkgbase = cs-signal-git
sha256sums = SKIP
pkgname = cs-signal-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 8a84050fdb42..1bd84cf110c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,37 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=cs-signal-git
-pkgver=r45.6add822
+pkgver=1.3.0.r0.g727df0a
pkgrel=1
pkgdesc='Library for thread aware signal/slot delivery (git version)'
arch=('x86_64')
url='https://www.copperspice.com/'
license=('BSD')
depends=('gcc-libs')
-makedepends=('git' 'cmake')
+makedepends=('git' 'cmake' 'catch2' 'cs-libguarded')
provides=('cs-signal')
conflicts=('cs-signal')
source=('git+https://github.com/copperspice/cs_signal.git')
sha256sums=('SKIP')
pkgver() {
- printf 'r%s.%s' "$(git -C cs_signal rev-list --count HEAD)" "$(git -C cs_signal rev-parse --short HEAD)"
+ git -C cs_signal describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^signal\.//;s/^v//'
}
build() {
cmake -B build -S cs_signal \
-DCMAKE_BUILD_TYPE:STRING='None' \
-DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+ -DBUILD_TESTS:BOOL='ON' \
-Wno-dev
make -C build
}
check() {
- build/bin/Test
+ make -C build test
}
package() {
- make -C build DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --install build
install -D -m644 cs_signal/LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
}