summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael Scholer2018-09-16 16:14:15 +0200
committerRaphael Scholer2018-09-16 16:14:15 +0200
commitd62a9af7f3d198efd1e4c428a96dba8a3c92bd7b (patch)
treeb3a58c91404e6657ee8c05a9878d1f36d222f1a8
parentffa8d0441373a9ec7a140d00768127052da0a42f (diff)
downloadaur-d62a9af7f3d198efd1e4c428a96dba8a3c92bd7b.tar.gz
Upstream update - Change build system
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
2 files changed, 10 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 08f104329468..fc7f748137fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
pkgbase = desktoggle-git
pkgdesc = Hide all windows and show the desktop.
- pkgver = 1.5.1.r2.gf1e3060
+ pkgver = 1.6.r0.gfcc6bf2
pkgrel = 1
url = https://github.com/rscholer/desktoggle
arch = i686
arch = x86_64
license = GPL3
- makedepends = asciidoc
makedepends = git
+ makedepends = meson
depends = libx11
provides = desktoggle
conflicts = desktoggle
diff --git a/PKGBUILD b/PKGBUILD
index 0fc25abfffdd..2d50bf6dc0d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Raphael Scholer <rascholer@gmail.com>
_pkgname=desktoggle
pkgname=${_pkgname}-git
-pkgver=1.5.1.r2.gf1e3060
+pkgver=1.6.r0.gfcc6bf2
pkgrel=1
pkgdesc='Hide all windows and show the desktop.'
arch=('i686' 'x86_64')
@@ -9,23 +9,27 @@ url="https://github.com/rscholer/${_pkgname}"
license=('GPL3')
conflicts=("${_pkgname}")
provides=("${_pkgname}")
-makedepends=('asciidoc' 'git')
+makedepends=('git' 'meson')
depends=('libx11')
source=("git+${url}")
sha256sums=('SKIP')
build() {
cd "${_pkgname}"
- make
+
+ arch-meson build
+ ninja -C build
}
pkgver() {
cd "${_pkgname}"
+
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
package() {
cd "${_pkgname}"
- make DESTDIR="${pkgdir}" prefix="/usr" install
+
+ DESTDIR="${pkgdir}" meson install -C build
}
# vim:set ts=2 sw=2 et: