Switch to meson

2 files changed, 19 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d28e605ff866..94d6e7fdc9d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,40 +1,36 @@
 # Generated by mksrcinfo v8
-# Mon May  1 14:21:07 UTC 2017
+# Thu Nov  1 08:38:28 UTC 2018
 pkgbase = pantheon-mail-git
 	pkgdesc = The Pantheon Mail Client
-	pkgver = r2876.e1bb88dc
+	pkgver = r118.ace22983
 	pkgrel = 1
 	url = https://github.com/elementary/mail
-	arch = i686
 	arch = x86_64
 	license = GPL3
-	makedepends = cmake
 	makedepends = git
 	makedepends = gnome-doc-utils
 	makedepends = gobject-introspection
 	makedepends = granite-git
 	makedepends = intltool
+	makedepends = meson
 	makedepends = vala
 	depends = cairo
+	depends = evolution-data-server
+	depends = folks
 	depends = gcr
 	depends = gdk-pixbuf2
 	depends = glib2
-	depends = glibc
-	depends = gmime
 	depends = gtk3
-	depends = libaccounts-glib
 	depends = libcanberra
 	depends = libgee
-	depends = libgsignon-glib
 	depends = libsecret
 	depends = libxml2
 	depends = pango
 	depends = sqlite
-	depends = webkitgtk
+	depends = webkit2gtk
 	depends = libgranite.so
 	provides = pantheon-mail
 	conflicts = pantheon-mail
-	replaces = pantheon-mail-bzr
 	source = pantheon-mail::git+https://github.com/elementary/mail.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 19eca5be9b38..815fe9d2f8a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,23 @@
 # Contributor: Riley Trautman <asonix@tamu.edu>
 
 pkgname=pantheon-mail-git
-pkgver=r3159.274ab16b
+pkgver=r118.ace22983
 pkgrel=1
 pkgdesc='The Pantheon Mail Client'
 arch=('x86_64')
 url='https://github.com/elementary/mail'
 license=('GPL3')
-depends=('cairo' 'gcr' 'gdk-pixbuf2' 'glib2' 'glibc' 'gmime' 'gtk3'
-         'libaccounts-glib' 'libcanberra' 'libgee' 'libgsignon-glib'
-         'libsecret' 'libxml2' 'pango' 'sqlite' 'webkit2gtk'
-         'libgranite.so')
-makedepends=('cmake' 'git' 'gnome-doc-utils' 'gobject-introspection'
-             'granite-git' 'intltool' 'vala')
+depends=(
+  'cairo' 'evolution-data-server' 'folks' 'gcr' 'gdk-pixbuf2' 'glib2' 'gtk3'
+  'libcanberra' 'libgee' 'libsecret' 'libxml2' 'pango' 'sqlite' 'webkit2gtk'
+  'libgranite.so'
+)
+makedepends=(
+  'git' 'gnome-doc-utils' 'gobject-introspection' 'granite-git' 'intltool'
+  'meson' 'vala'
+)
 provides=('pantheon-mail')
 conflicts=('pantheon-mail')
-replaces=('pantheon-mail-bzr')
 source=('pantheon-mail::git+https://github.com/elementary/mail.git')
 sha256sums=('SKIP')
 
@@ -26,31 +28,13 @@ pkgver() {
   echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-  cd pantheon-mail
-
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build
-}
-
 build() {
-  cd pantheon-mail/build
-
-  cmake .. \
-    -DCMAKE_BUILD_TYPE='Release' \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DDESKTOP_UPDATE='FALSE' \
-    -DGSETTINGS_COMPILE='FALSE' \
-    -DGSETTINGS_COMPILE_IN_PLACE='FALSE'
-  make
+  arch-meson pantheon-mail build
+  ninja -C build
 }
 
 package() {
-  cd pantheon-mail/build
-
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -C build install
 }
 
 # vim: ts=2 sw=2 et: