[arch-commits] Commit in geocode-glib/trunk (PKGBUILD)

[Jan de Groot]

    Date: Friday, September 15, 2017 @ 14:12:45
  Author: jgc
Revision: 305603

upgpkg: geocode-glib 3.25.4.1-1

Modified:
  geocode-glib/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-15 13:48:22 UTC (rev 305602)
+++ PKGBUILD	2017-09-15 14:12:45 UTC (rev 305603)
@@ -3,7 +3,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=geocode-glib
-pkgver=3.24.0
+pkgver=3.25.4.1
 pkgrel=1
 pkgdesc="Helper library for geocoding services"
 url="https://git.gnome.org/browse/geocode-glib/"
@@ -10,12 +10,18 @@
 arch=(i686 x86_64)
 license=(LGPL)
 depends=(glib2 json-glib libsoup)
-makedepends=(intltool gobject-introspection git gtk-doc autoconf-archive)
+makedepends=(intltool gobject-introspection git gtk-doc meson)
 options=(!emptydirs)
-_commit=aa513ab2a33039382023f3dbffea2604ad5af0f3  # tags/3.24.0^0
+_commit=a811227fce460f3ac319f689ff927ab37427b84b  # tags/3.25.4.1^0
 source=("git+https://git.gnome.org/browse/geocode-glib#commit=$_commit")
 sha256sums=('SKIP')
 
+check() {
+  cd build
+  # Needs sv_SE.utf8, will not pass in chroot
+  #meson test
+}
+
 pkgver() {
   cd $pkgname
   git describe --tags | sed 's/-/+/g'
@@ -22,19 +28,19 @@
 }
 
 prepare() {
+  mkdir build
   cd $pkgname
-  sed -i 's/gnome/Adwaita/g' icons/Makefile.am
-  NOCONFIGURE=1 ./autogen.sh
+  sed -i 's/gnome/Adwaita/' icons/meson.build
 }
 
 build() {
-  cd $pkgname
-  ./configure --prefix=/usr --enable-gtk-doc --disable-Werror
-  make
+  cd build
+  meson setup --prefix=/usr --buildtype=release -Denable-installed-tests=false ../$pkgname
+  ninja
 }
 
 package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
+  cd build
+  DESTDIR="$pkgdir" ninja install
 }