diff options
| author | xpt | 2020-08-24 12:02:22 -0400 |
|---|---|---|
| committer | xpt | 2020-08-24 12:02:22 -0400 |
| commit | 2bdc1466a3eddd80d7198ed2d010fbdfb8e6ffdb (patch) | |
| tree | a1a2727e72977cfc5c7e72eed703b998c70a7a17 | |
| parent | 70a4c2e11d308a0822ea52b97ca2084a7143d9f7 (diff) | |
| download | aur-2bdc1466a3eddd80d7198ed2d010fbdfb8e6ffdb.tar.gz | |
Update to 0.5.4.r23.g75c730f
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 25 |
2 files changed, 11 insertions, 21 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# jue ene 10 05:56:56 UTC 2019 pkgbase = nasc-git pkgdesc = Do maths like a normal person. - pkgver = 0.5.1.r0.g4ee07c4 + pkgver = 0.5.4.r23.g75c730f pkgrel = 1 url = http://parnold-x.github.io/nasc/ install = nasc.install @@ -11,7 +9,7 @@ pkgbase = nasc-git license = GPL3 makedepends = vala makedepends = git - makedepends = cmake + makedepends = meson depends = gtk3 depends = libqalculate depends = granite @@ -19,7 +17,6 @@ pkgbase = nasc-git depends = libgee depends = gtksourceview3 depends = libsoup - depends = libpthread-stubs provides = nasc conflicts = nasc conflicts = nasc-bzr @@ -1,15 +1,15 @@ # Maintainer: xpt <user.xpt@gmail.com> pkgname=nasc-git _pkgname=nasc -pkgver=0.5.1.r0.g4ee07c4 +pkgver=0.5.4.r23.g75c730f pkgrel=1 pkgdesc='Do maths like a normal person.' arch=('i686' 'x86_64') url='http://parnold-x.github.io/nasc/' license=('GPL3') -depends=('gtk3' 'libqalculate' 'granite' 'glib2' 'libgee' 'gtksourceview3' 'libsoup' 'libpthread-stubs') +depends=('gtk3' 'libqalculate' 'granite' 'glib2' 'libgee' 'gtksourceview3' 'libsoup' ) optdepends=() -makedepends=('vala' 'git' 'cmake') +makedepends=('vala' 'git' 'meson') provides=("nasc") conflicts=("nasc" "nasc-bzr") install="${pkgname%-*}.install" @@ -17,25 +17,18 @@ source=('git+https://github.com/parnold-x/nasc') sha256sums=('SKIP') pkgver() { - cd ${pkgname%-*} + cd ${_pkgname} git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } build() { - cd ${pkgname%-*} - - if [[ -d build ]]; then - rm -rf build - fi - mkdir build && cd build - cmake -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_INSTALL_PREFIX=/usr .. - make + cd ${_pkgname} + meson build --prefix=/usr + ninja -v -C build } package() { - cd ${_pkgname}/build - make DESTDIR="${pkgdir}" install - mv "${pkgdir}/usr/bin/com.github.parnold-x.nasc" "${pkgdir}/usr/bin/nasc" + cd ${_pkgname} + DESTDIR="$pkgdir" ninja -v -C build install } - |