Switch gala-git over to meson

2 files changed, 17 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index abd6575f8b87..bca648180731 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Tue May 23 19:12:45 UTC 2017
+# Mon Mar 26 20:13:00 UTC 2018
 pkgbase = gala-git
 	pkgdesc = The Pantheon Window Manager
-	pkgver = 0.3.0.r96.66b5d4a
+	pkgver = 0.3.0.r169.a71e8c1
 	pkgrel = 1
 	url = https://github.com/elementary/gala
-	arch = i686
 	arch = x86_64
 	groups = pantheon-unstable
 	license = GPL3
@@ -13,6 +12,7 @@ pkgbase = gala-git
 	makedepends = gnome-common
 	makedepends = granite-git
 	makedepends = intltool
+	makedepends = meson
 	makedepends = vala
 	depends = atk
 	depends = bamf
@@ -43,7 +43,6 @@ pkgbase = gala-git
 	provides = gala
 	provides = libgala.so
 	conflicts = gala
-	replaces = gala-bzr
 	source = git+https://github.com/elementary/gala.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 1823e96605c8..abab6a5048a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=gala-git
-pkgver=0.3.0.r96.66b5d4a
+pkgver=0.3.0.r169.a71e8c1
 pkgrel=1
 pkgdesc='The Pantheon Window Manager'
 arch=('x86_64')
@@ -13,10 +13,9 @@ depends=('atk' 'bamf' 'cairo' 'gdk-pixbuf2' 'glib2' 'glibc' 'gnome-desktop'
          'libxdamage' 'libxext' 'libxfixes' 'libxi' 'libxrandr' 'libxtst'
          'mesa' 'mutter' 'pango' 'plank' 'wayland'
          'libgranite.so')
-makedepends=('git' 'gnome-common' 'granite-git' 'intltool' 'vala')
+makedepends=('git' 'gnome-common' 'granite-git' 'intltool' 'meson' 'vala')
 provides=('gala' 'libgala.so')
 conflicts=('gala')
-replaces=('gala-bzr')
 source=('git+https://github.com/elementary/gala.git')
 sha256sums=('SKIP')
 
@@ -26,19 +25,24 @@ pkgver() {
   git describe --tags | sed 's/-/.r/; s/-g/./'
 }
 
+prepare() {
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build
+}
+
 build() {
-  cd gala
+  cd build
 
-  ./autogen.sh \
-    --prefix='/usr' \
-    --disable-schemas-compile
-  make
+  arch-meson ../gala
+  ninja
 }
 
 package() {
-  cd gala
+  cd build
 
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja install
 }
 
 # vim: ts=2 sw=2 et: