From ae96639603396c57fe85577e818e65a96bb52bd4 Mon Sep 17 00:00:00 2001 From: Gaute Hope Date: Wed, 15 Nov 2017 13:43:17 +0100 Subject: [PATCH] move to cmake --- .SRCINFO | 7 ++++--- PKGBUILD | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 17e1a54..8299471 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Tue Oct 17 13:59:08 UTC 2017 +# Wed Nov 15 12:43:08 UTC 2017 pkgbase = astroid-git pkgdesc = a graphical threads-with-tags style, lightweight and fast, email client for notmuch, inspired by sup and others - pkgver = v0.10.2.r0.gaa8789f + pkgver = v0.10.2.r48.gfaf2776 pkgrel = 1 url = https://github.com/astroidmail/astroid install = astroid.install @@ -10,7 +10,8 @@ pkgbase = astroid-git arch = i686 license = GPL checkdepends = notmuch-runtime - makedepends = meson + makedepends = cmake + makedepends = ninja makedepends = git makedepends = pkg-config makedepends = python-gobject diff --git a/PKGBUILD b/PKGBUILD index 07e0850..c05ade0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Gaute Hope _pkgname=astroid pkgname=$_pkgname-git -pkgver=v0.10.2.r0.gaa8789f +pkgver=v0.10.2.r48.gfaf2776 pkgrel=1 epoch= pkgdesc="a graphical threads-with-tags style, lightweight and fast, email client for notmuch, inspired by sup and others" @@ -10,7 +10,7 @@ url="https://github.com/astroidmail/astroid" license=('GPL') groups=() depends=('notmuch' 'boost' 'boost-libs' 'gmime' 'gtkmm3' 'webkitgtk' 'libsass' 'libpeas' 'gobject-introspection') -makedepends=('meson' 'git' 'pkg-config' 'python-gobject') +makedepends=('cmake' 'ninja' 'git' 'pkg-config' 'python-gobject') checkdepends=('notmuch-runtime') optdepends=('gvim: default editor' 'emacs: can be used as editor' @@ -28,15 +28,16 @@ md5sums=('SKIP') build() { cd "$srcdir/astroid" - LC_ALL=C meson build --prefix=/usr --buildtype release + mkdir -p build cd build + cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release ninja } check() { cd "$srcdir/astroid" cd build - meson test + ninja test } package() {