summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD38
2 files changed, 34 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8a7b381042e2..c932eba4c604 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,14 @@
pkgbase = json-stroller-git
- pkgdesc = A ncurse tool for viewing json files and displaying differences between json formatted data
- pkgver = v1.1.2
+ pkgdesc = view json files and display differences between json formatted data
+ pkgver = 1.2.r0.g787cbc5
pkgrel = 1
- arch = i686
+ url = https://github.com/isundil/jsonStroller
arch = x86_64
- license = GPL3
- source = json-stroller-git::git://github.com/isundil/jsonStroller.git
+ license = GPL-3.0-or-later
+ makedepends = cmake
+ makedepends = git
+ depends = ncurses
+ source = json-stroller-git::git+https://github.com/isundil/jsonStroller.git
md5sums = SKIP
pkgname = json-stroller-git
-
diff --git a/PKGBUILD b/PKGBUILD
index c6bf618e91d7..c030d466b0b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,35 @@
pkgname=json-stroller-git
-pkgver=v1.1.2
+pkgver=1.2.r0.g787cbc5
pkgrel=1
-pkgdesc="A ncurse tool for viewing json files and displaying differences between json formatted data"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=()
-source=("$pkgname::git://github.com/isundil/jsonStroller.git")
+pkgdesc="view json files and display differences between json formatted data"
+arch=('x86_64')
+url="https://github.com/isundil/jsonStroller"
+license=('GPL-3.0-or-later')
+depends=('ncurses')
+makedepends=('cmake' 'git')
+source=("$pkgname::git+${url}.git")
md5sums=('SKIP')
-build() {
+pkgver() {
cd $pkgname
- cmake -DCMAKE_BUILD_TYPE=Release
- make all doc test
+ git describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./g;'
}
-package() {
- cd "$srcdir/$pkgname"
- make DESTDIR="$pkgdir" install
+prepare() {
+ cd $pkgname
+ # fix cmake warnings
+ sed -i -e '2iproject(jsonstroller)' -e 's/2.8/3.5/' CMakeLists.txt
+}
+
+build() {
+ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -B build -S $pkgname
+ cmake --build build
+}
+
+check() {
+ ctest --test-dir build --output-on-failure
}
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}