[arch-commits] Commit in network-manager-applet/trunk (PKGBUILD)

[Jan Steffens]

    Date: Thursday, January 25, 2018 @ 11:36:56
  Author: heftig
Revision: 315440

1.8.11dev+12+ga37483c1-1

Modified:
  network-manager-applet/trunk/PKGBUILD

----------+
 PKGBUILD |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-25 11:33:02 UTC (rev 315439)
+++ PKGBUILD	2018-01-25 11:36:56 UTC (rev 315440)
@@ -10,7 +10,7 @@
 pkgname=(nm-connection-editor network-manager-applet)
 pkgdesc="Applet for managing network connections"
 url="https://wiki.gnome.org/Projects/NetworkManager/"
-pkgver=1.8.11dev+7+ga52ccb2f
+pkgver=1.8.11dev+12+ga37483c1
 pkgrel=1
 arch=(x86_64)
 license=(GPL2 LGPL2.1)
@@ -17,7 +17,7 @@
 depends=(libnm-glib libgudev gtk3 mobile-broadband-provider-info iso-codes gcr)
 makedepends=(libsecret libnotify libmm-glib intltool gobject-introspection git gtk-doc meson)
 options=(!emptydirs)
-_commit=a52ccb2fe170558fc0aab4dd1d15ba8808b10951  # master
+_commit=a37483c1a364ef3cc1cfa29e7ad51ca108d75674  # master
 source=("git+https://git.gnome.org/browse/network-manager-applet#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -27,15 +27,12 @@
 }
 
 prepare() {
-  mkdir -p build nma/etc/xdg nma/usr/bin \
-    nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet}
   cd $pkgbase
 }
 
 build() {
-  cd build
-  arch-meson ../$pkgbase -Dselinux=false
-  ninja
+  arch-meson $pkgbase build -Dselinux=false
+  ninja -C build
 }
 
 check() {
@@ -49,11 +46,13 @@
   conflicts=(libnm-gtk)
   replaces=(libnm-gtk)
 
-  cd build
-  DESTDIR="$pkgdir" ninja install
+  DESTDIR="$pkgdir" ninja -C build install
 
 ### Split network-manager-applet
-  cd ../nma
+  mkdir -p nma/etc/xdg nma/usr/bin \
+    nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet}
+
+  cd nma
   mv "$pkgdir"/etc/xdg/autostart etc/xdg/
   mv "$pkgdir"/usr/bin/nm-applet usr/bin/
   mv "$pkgdir"/usr/share/GConf usr/share/