do it again

2 files changed, 53 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bca648180731..2d0862cc33dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Mar 26 20:13:00 UTC 2018
+# Sun Jan  6 17:55:36 UTC 2019
 pkgbase = gala-git
 	pkgdesc = The Pantheon Window Manager
-	pkgver = 0.3.0.r169.a71e8c1
+	pkgver = 0.3.0.r204.7f1e392
 	pkgrel = 1
 	url = https://github.com/elementary/gala
 	arch = x86_64
@@ -19,13 +19,13 @@ pkgbase = gala-git
 	depends = cairo
 	depends = gdk-pixbuf2
 	depends = glib2
-	depends = glibc
 	depends = gnome-desktop
 	depends = gtk3
 	depends = json-glib
 	depends = libdrm
 	depends = libgee
 	depends = libgl
+	depends = libgranite.so
 	depends = libx11
 	depends = libxcomposite
 	depends = libxdamage
@@ -35,11 +35,10 @@ pkgbase = gala-git
 	depends = libxrandr
 	depends = libxtst
 	depends = mesa
-	depends = mutter
+	depends = libmutter2
 	depends = pango
 	depends = plank
 	depends = wayland
-	depends = libgranite.so
 	provides = gala
 	provides = libgala.so
 	conflicts = gala
diff --git a/PKGBUILD b/PKGBUILD
index abab6a5048a9..02bb896d2e66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,55 @@
 # Maintainer: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=gala-git
-pkgver=0.3.0.r169.a71e8c1
+pkgver=0.3.0.r204.7f1e392
 pkgrel=1
 pkgdesc='The Pantheon Window Manager'
-arch=('x86_64')
+arch=(x86_64)
 url='https://github.com/elementary/gala'
-license=('GPL3')
-groups=('pantheon-unstable')
-depends=('atk' 'bamf' 'cairo' 'gdk-pixbuf2' 'glib2' 'glibc' 'gnome-desktop'
-         'gtk3' 'json-glib' 'libdrm' 'libgee' 'libgl' 'libx11' 'libxcomposite'
-         'libxdamage' 'libxext' 'libxfixes' 'libxi' 'libxrandr' 'libxtst'
-         'mesa' 'mutter' 'pango' 'plank' 'wayland'
-         'libgranite.so')
-makedepends=('git' 'gnome-common' 'granite-git' 'intltool' 'meson' 'vala')
-provides=('gala' 'libgala.so')
-conflicts=('gala')
-source=('git+https://github.com/elementary/gala.git')
-sha256sums=('SKIP')
+license=(GPL3)
+groups=(pantheon-unstable)
+depends=(
+  atk
+  bamf
+  cairo
+  gdk-pixbuf2
+  glib2
+  gnome-desktop
+  gtk3
+  json-glib
+  libdrm
+  libgee
+  libgl
+  libgranite.so
+  libx11
+  libxcomposite
+  libxdamage
+  libxext
+  libxfixes
+  libxi
+  libxrandr
+  libxtst
+  mesa
+  libmutter2
+  pango
+  plank
+  wayland
+)
+makedepends=(
+  git
+  gnome-common
+  granite-git
+  intltool
+  meson
+  vala
+)
+provides=(
+  gala
+  libgala.so
+)
+conflicts=(gala)
+source=(git+https://github.com/elementary/gala.git)
+sha256sums=(SKIP)
 
 pkgver() {
   cd gala
@@ -25,24 +57,13 @@ pkgver() {
   git describe --tags | sed 's/-/.r/; s/-g/./'
 }
 
-prepare() {
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build
-}
-
 build() {
-  cd build
-
-  arch-meson ../gala
-  ninja
+  arch-meson gala build
+  ninja -C build
 }
 
 package() {
-  cd build
-
-  DESTDIR="${pkgdir}" ninja install
+  DESTDIR="${pkgdir}" ninja -C build install
 }
 
 # vim: ts=2 sw=2 et: