Switch to meson

2 files changed, 13 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1cacf5ce57ca..d9f0dbe36be7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,12 @@
-# Generated by mksrcinfo v8
-# Sun Dec 10 15:21:34 UTC 2017
 pkgbase = gnome-2048-git
 	pkgdesc = Obtain the 2048 tile
-	pkgver = 3.26.1.r220.27eac00
+	pkgver = 3.31.4+30+g9179407
 	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/2048
 	arch = x86_64
 	license = GPL
 	makedepends = git
-	makedepends = intltool
+	makedepends = meson
 	makedepends = appstream-glib
 	makedepends = yelp-tools
 	makedepends = vala
@@ -16,8 +14,7 @@ pkgbase = gnome-2048-git
 	depends = libgnome-games-support
 	provides = gnome-2048
 	conflicts = gnome-2048
-	options = !libtool
-	source = git+https://git.gnome.org/browse/gnome-2048
+	source = git+https://gitlab.gnome.org/GNOME/gnome-2048.git
 	md5sums = SKIP
 
 pkgname = gnome-2048-git
diff --git a/PKGBUILD b/PKGBUILD
index 8762f22ace2b..515d8c913fca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,38 +2,29 @@
 
 _name=gnome-2048
 pkgname=$_name-git
-pkgver=3.26.1.r220.27eac00
+pkgver=3.31.4+30+g9179407
 pkgrel=1
 pkgdesc="Obtain the 2048 tile"
-arch=('x86_64')
+arch=(x86_64)
 url="https://wiki.gnome.org/Apps/2048"
-license=('GPL')
-depends=('clutter-gtk' 'libgnome-games-support')
-makedepends=('git' 'intltool' 'appstream-glib' 'yelp-tools' 'vala')
-options=(!libtool)
+license=(GPL)
+depends=(clutter-gtk libgnome-games-support)
+makedepends=(git meson appstream-glib yelp-tools vala)
 provides=($_name)
 conflicts=($_name)
-source=("git+https://git.gnome.org/browse/$_name")
+source=("git+https://gitlab.gnome.org/GNOME/$_name.git")
 md5sums=('SKIP')
 
 pkgver() {
   cd $_name
-  v=$(grep AC_INIT configure.ac | cut -d[ -f3 | cut -d] -f1)
-  printf "%s.r%s.%s" $v $(git rev-list --count HEAD) $(git rev-parse --short HEAD)
-}
-
-prepare() {
-  cd $_name
-  ./autogen.sh NOCONFIGURE=1
+  git describe --tags | sed 's/-/+/g'
 }
 
 build() {
-  cd $_name
-  ./configure --prefix=/usr --disable-schemas-compile
-  make
+  arch-meson $_name build -D b_pie='false'
+  ninja -C build
 }
 
 package() {
-  cd $_name
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -C build install
 }