git » modemmanager.git » commit ce531a8

diff --git a/PKGBUILD b/PKGBUILD
index d4b5fbf..e3a3682 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=modemmanager
 pkgname=(modemmanager libmm-glib)
-pkgver=1.16.10
+pkgver=1.18.0
 pkgrel=1
 pkgdesc="Mobile broadband modem management service"
 arch=(x86_64)
@@ -11,9 +11,9 @@ url="https://www.freedesktop.org/wiki/Software/ModemManager/"
 license=(GPL2 LGPL2.1)
 depends=(systemd libgudev polkit ppp libqmi libmbim
          mobile-broadband-provider-info)
-makedepends=(gtk-doc gobject-introspection vala autoconf-archive git)
+makedepends=(gtk-doc gobject-introspection vala meson git bash-completion)
 checkdepends=(python-gobject python-dbus)
-_commit=2306e5b233205b40c1559c5c14e3f57308dfa2fe  # tags/1.16.10
+_commit=4ccbfcd0167b5e6134eba5da34c33b8b0b5b1619  # tags/1.18.0
 source=("git+https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -24,50 +24,51 @@ pkgver() {
 
 prepare() {
   cd ModemManager
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd ModemManager
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --sbindir=/usr/bin \
-    --with-dbus-sys-dir=/usr/share/dbus-1/system.d \
-    --with-udev-base-dir=/usr/lib/udev \
-    --with-polkit=permissive \
-    --with-systemd-journal \
-    --with-systemd-suspend-resume \
-    --enable-compile-warnings=yes \
-    --enable-gtk-doc \
-    --disable-static
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  local meson_args=(
+    -D dbus_policy_dir=/usr/share/dbus-1/system.d
+    -D polkit=permissive
+    -D dist_version="\"$pkgver-$pkgrel\""
+    -D vapi=true
+    -D gtk_doc=true
+  )
 
-  make
+  arch-meson ModemManager build "${meson_args[@]}"
+  meson compile -C build
 }
 
 check() {
-  cd ModemManager
-  make -k check
+  # Tests don't work yet
+  : meson test -C build --print-errorlogs
+}
+
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
 }
 
 package_modemmanager() {
   depends+=(libmm-glib.so libg{lib,object,io,module}-2.0.so libsystemd.so libgudev-1.0.so
             libqmi-glib.so libmbim-glib.so)
   optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
-  options=(!emptydirs)
 
-  cd ModemManager
-  make DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" -C libmm-glib uninstall
-  make DESTDIR="$pkgdir" -C vapi uninstall
+  meson install -C build --destdir "$pkgdir"
 
-  # Some stuff to move is left over
-  mv "$pkgdir/usr/include" ..
-  mv "$pkgdir/usr/lib/pkgconfig" ..
+  cd "$pkgdir"
+  _pick libmm usr/include
+  _pick libmm usr/lib/girepository-1.0
+  _pick libmm usr/lib/libmm-glib.so*
+  _pick libmm usr/lib/pkgconfig
+  _pick libmm usr/share/gir-1.0
+  _pick libmm usr/share/gtk-doc/html/libmm-glib
+  _pick libmm usr/share/vala
 }
 
 package_libmm-glib() {
@@ -75,11 +76,7 @@ package_libmm-glib() {
   depends=(libg{lib,object,io}-2.0.so)
   provides=(libmm-glib.so)
 
-  install -d "$pkgdir/usr/lib"
-  mv include "$pkgdir/usr"
-  mv pkgconfig "$pkgdir/usr/lib"
-
-  cd ModemManager
-  make DESTDIR="$pkgdir" -C libmm-glib install
-  make DESTDIR="$pkgdir" -C vapi install
+  mv libmm/* "$pkgdir"
 }
+
+# vim:set sw=2 et: