diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-09-01 11:34:59 +0200 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-09-07 11:38:27 +0200 |
| commit | bec5aa9b41ac8100f03b5c847a2b1781c881dee6 (patch) | |
| tree | a4985e2bf2c6fb1dc392bd097d79f609004b1b17 | |
| parent | 2e3d9e2f1de6823ce9f45d36d8329c678ceeea4d (diff) | |
testing/viewnior: use abuild-meson & meson compile/test/install
| -rw-r--r-- | main/xorg-server/APKBUILD | 1 | ||||
| -rw-r--r-- | testing/viewnior/APKBUILD | 21 |
2 files changed, 6 insertions, 16 deletions
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 74182340f2c..d6fbfcb552b 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -97,6 +97,7 @@ build() { _fontroot="/usr/share/fonts" abuild-meson \ + --sysconfdir=/etc/X11 \ -Dxorg=true \ -Dxephyr=true \ -Dxwayland=true \ diff --git a/testing/viewnior/APKBUILD b/testing/viewnior/APKBUILD index d67603ed040..7aef482dcd0 100644 --- a/testing/viewnior/APKBUILD +++ b/testing/viewnior/APKBUILD @@ -3,34 +3,23 @@ pkgname=viewnior _pkgname=Viewnior pkgver=1.7 -pkgrel=2 +pkgrel=3 pkgdesc="A fast and simple image viewer" url="http://siyanpanayotov.com/project/viewnior" arch="all" -license="GPL-3.0" -depends="" +license="GPL-3.0-or-later" makedepends="gnome-common meson ninja gtk+2.0-dev exiv2-dev desktop-file-utils" subpackages="$pkgname-lang $pkgname-doc" source="https://github.com/hellosiyan/$_pkgname/archive/$pkgname-$pkgver.tar.gz" - builddir="$srcdir"/$_pkgname-$pkgname-$pkgver -prepare() { - cd "$builddir" - mkdir builddir -} - build() { - cd "$builddir" - meson builddir \ - --prefix=/usr \ - --buildtype=plain - ninja -C builddir + abuild-meson builddir + meson compile ${JOBS:+-j ${JOBS}} -C builddir } package() { - cd "$builddir" - DESTDIR="$pkgdir" ninja -C builddir install + DESTDIR="$pkgdir" meson install --no-rebuild -C builddir } sha512sums="5ba17d7b5ceeffa65b04213f179c1439b09ac44e412e0750dde159b118a714f28d3a290509a402b234e4e7ba5b185fc73eef65d418598f344911e4e2c1373fe5 viewnior-1.7.tar.gz" |