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

[Jan Steffens]

    Date: Tuesday, June 5, 2018 @ 20:00:52
  Author: heftig
Revision: 325941

3.26.0-1

Modified:
  geocode-glib/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-05 19:48:39 UTC (rev 325940)
+++ PKGBUILD	2018-06-05 20:00:52 UTC (rev 325941)
@@ -3,7 +3,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=geocode-glib
-pkgver=3.25.4.1
+pkgver=3.26.0
 pkgrel=1
 pkgdesc="Helper library for geocoding services"
 url="https://git.gnome.org/browse/geocode-glib/"
@@ -11,17 +11,10 @@
 license=(LGPL)
 depends=(glib2 json-glib libsoup)
 makedepends=(intltool gobject-introspection git gtk-doc meson)
-options=(!emptydirs)
-_commit=a811227fce460f3ac319f689ff927ab37427b84b  # tags/3.25.4.1^0
-source=("git+https://git.gnome.org/browse/geocode-glib#commit=$_commit")
+_commit=da3cf65f09dbfbf0fe417e20b469d146255d5234  # tags/3.26.0^0
+source=("git+https://gitlab.gnome.org/GNOME/geocode-glib.git#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'
@@ -28,19 +21,22 @@
 }
 
 prepare() {
-  mkdir build
   cd $pkgname
   sed -i 's/gnome/Adwaita/' icons/meson.build
 }
 
 build() {
+  arch-meson $pkgname build -D enable-installed-tests=false
+  ninja -C build
+}
+
+check() {
   cd build
-  meson setup --prefix=/usr --buildtype=release -Denable-installed-tests=false ../$pkgname
-  ninja
+  # Needs sv_SE.utf8, will not pass in chroot
+  #meson test
 }
 
 package() {
-  cd build
-  DESTDIR="$pkgdir" ninja install
+  DESTDIR="$pkgdir" ninja -C build install
 }