summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Gauduin2018-05-29 17:18:00 +0200
committerMaxime Gauduin2018-05-29 17:18:00 +0200
commita0049b49285426635f83d537a3527aa2bf950267 (patch)
tree3cdf7e111aee832a97fa7b14b933aa41491b03c8
parentb0bf8a28d7d553268b4d050162e9edacd81fb28a (diff)
downloadaur-a0049b49285426635f83d537a3527aa2bf950267.tar.gz
Switch to meson
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD27
2 files changed, 8 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 655c34db56d..a6973757342 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
# Generated by mksrcinfo v8
-# Mon May 1 15:44:26 UTC 2017
+# Tue May 29 15:17:59 UTC 2018
pkgbase = cerbere-git
pkgdesc = The Pantheon Watchdog
- pkgver = r107.c11a2af
+ pkgver = r117.e44a9dd
pkgrel = 1
url = https://github.com/elementary/cerbere
- arch = i686
arch = x86_64
groups = pantheon-unstable
license = GPL2
- makedepends = cmake
makedepends = git
+ makedepends = meson
makedepends = vala
depends = dconf
depends = glib2
@@ -18,7 +17,6 @@ pkgbase = cerbere-git
depends = libgee
provides = cerbere
conflicts = cerbere
- replaces = cerbere-bzr
source = git+https://github.com/elementary/cerbere.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 04a84046b15..848fd1c2e24 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
pkgname=cerbere-git
-pkgver=r107.c11a2af
+pkgver=r117.e44a9dd
pkgrel=1
pkgdesc='The Pantheon Watchdog'
arch=('x86_64')
@@ -9,10 +9,9 @@ url='https://github.com/elementary/cerbere'
license=('GPL2')
groups=('pantheon-unstable')
depends=('dconf' 'glib2' 'glibc' 'libgee')
-makedepends=('cmake' 'git' 'vala')
+makedepends=('git' 'meson' 'vala')
provides=('cerbere')
conflicts=('cerbere')
-replaces=('cerbere-bzr')
source=('git+https://github.com/elementary/cerbere.git')
sha256sums=('SKIP')
@@ -22,29 +21,13 @@ pkgver() {
echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
}
-prepare() {
- cd cerbere
-
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir build
-}
-
build() {
- cd cerbere/build
-
- cmake .. \
- -DCMAKE_BUILD_TYPE='Release' \
- -DCMAKE_INSTALL_PREFIX='/usr' \
- -DGSETTINGS_COMPILE='OFF'
- make
+ arch-meson cerbere build
+ ninja -C build
}
package() {
- cd cerbere/build
-
- make DESTDIR="${pkgdir}" install
+ DESTDIR="${pkgdir}" ninja -C build install
}
# vim: ts=2 sw=2 et: