1.8.21dev+3+gb4c365b1

2 files changed, 99 insertions, 91 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 670dd4ca0345..4b8a67148c55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = network-manager-applet-indicator
-	pkgdesc = Latest nm-applet with Appindicator/StatusNotifierItem support from Gnome GitLab
-	pkgver = 1.8.19+dev+17+g57ef36bf
-	pkgrel = 2
-	url = https://aur.archlinux.org/packages/network-manager-applet-indicator/
-	arch = i686
+	pkgdesc = Applet for managing network connections, with Appindicator/StatusNotifierItem support from GNOME GitLab
+	pkgver = 1.8.21dev+3+gb4c365b1
+	pkgrel = 1
+	url = https://wiki.gnome.org/Projects/NetworkManager/
 	arch = x86_64
-	license = GPL2
-	license = LGPL2.1
+	license = GPL
+	license = LGPL
 	makedepends = libsecret
 	makedepends = libnotify
 	makedepends = libmm-glib
@@ -14,31 +13,42 @@ pkgbase = network-manager-applet-indicator
 	makedepends = gobject-introspection
 	makedepends = git
 	makedepends = gtk-doc
-	depends = libnm-glib
-	depends = libgudev
-	depends = gtk3
-	depends = mobile-broadband-provider-info
-	depends = iso-codes
+	makedepends = meson
+	makedepends = libnm
+	makedepends = gcr
+	makedepends = gtk3
+	makedepends = iso-codes
+	makedepends = mobile-broadband-provider-info
 	depends = libappindicator-gtk3
-	conflicts = nm-connection-editor
-	options = !emptydirs
-	source = git+https://gitlab.gnome.org/GNOME/network-manager-applet.git/
+	source = git+https://gitlab.gnome.org/GNOME/network-manager-applet.git#commit=b4c365b136e25e69c3550a9984f8f3cbec4bc073
 	sha256sums = SKIP
 
-pkgname = nm-connection-editor-indicator
-	pkgdesc = NetworkManager GUI connection editor and widgets, with AppIndicator
-	provides = libnm-gtk=1.8.19+dev+17+g57ef36bf-2
-	provides = libnma=1.8.19+dev+17+g57ef36bf-2
-	provides = nm-connection-editor=1.8.19+dev+17+g57ef36bf-2
-	conflicts = libnm-gtk
-	replaces = libnm-gtk
-
 pkgname = network-manager-applet-indicator
 	depends = nm-connection-editor
 	depends = libmm-glib
 	depends = libnotify
 	depends = libsecret
+	depends = networkmanager
 	depends = libappindicator-gtk3
-	provides = network-manager-applet=1.8.19+dev+17+g57ef36bf-2
+	provides = network-manager-applet=1.8.21dev+3+gb4c365b1-1
 	conflicts = network-manager-applet
 
+pkgname = nm-connection-editor-indicator
+	pkgdesc = NetworkManager GUI connection editor and widgets, with AppIndicator
+	depends = libnma-indicator
+	provides = nm-connection-editor=1.8.21dev+3+gb4c365b1-1
+	conflicts = nm-connection-editor
+	conflicts = libnm-gtk<1.8.18-1
+	replaces = libnm-gtk<1.8.18-1
+
+pkgname = libnma-indicator
+	pkgdesc = NetworkManager GUI client library, with AppIndicator
+	depends = libnm
+	depends = gcr
+	depends = gtk3
+	depends = iso-codes
+	depends = mobile-broadband-provider-info
+	depends = libappindicator-gtk3
+	provides = libnma-indicator-1.8.21dev+3+gb4c365b1-1
+	conflicts = libnma
+
diff --git a/PKGBUILD b/PKGBUILD
index 052f09e2e2a8..76db312b3e2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,99 +1,97 @@
-# $Id$
-# Maintainer: Michael Greene <mgreene@securityinnovation.com>
+# Maintainer:  Devin Cofer <ranguvar[AT]ranguvar[DOT]io>
+# Contributor: Michael Greene <mgreene@securityinnovation.com>
+# Contributor: Nikita Tarasov <nikatar@disroot.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 # Contributor: Tor Krill <tor@krill.nu>
 # Contributor: Will Rea <sillywilly@gmail.com>
-# Additional participation: Nikita Tarasov <nikatar@disroot.org>
 
 pkgbase=network-manager-applet-indicator
-pkgname=(nm-connection-editor-indicator network-manager-applet-indicator)
-pkgdesc="Latest nm-applet with Appindicator/StatusNotifierItem support from Gnome GitLab"
-url="https://aur.archlinux.org/packages/network-manager-applet-indicator/"
-pkgver=1.8.19+dev+17+g57ef36bf
-pkgrel=2
-arch=(i686 x86_64)
-license=(GPL2 LGPL2.1)
-depends=(libnm-glib libgudev gtk3 mobile-broadband-provider-info iso-codes libappindicator-gtk3)
-makedepends=(libsecret libnotify libmm-glib intltool gobject-introspection git gtk-doc)
-conflicts=("nm-connection-editor")
-options=(!emptydirs)
-source=("git+https://gitlab.gnome.org/GNOME/network-manager-applet.git/")
+pkgname=(network-manager-applet-indicator nm-connection-editor-indicator libnma-indicator)
+pkgdesc="Applet for managing network connections, with Appindicator/StatusNotifierItem support from GNOME GitLab"
+url="https://wiki.gnome.org/Projects/NetworkManager/"
+pkgver=1.8.21dev+3+gb4c365b1
+pkgrel=1
+arch=(x86_64)
+license=(GPL LGPL)
+depends=(libappindicator-gtk3)
+makedepends=(libsecret libnotify libmm-glib intltool gobject-introspection git gtk-doc meson
+             libnm gcr gtk3 iso-codes mobile-broadband-provider-info)
+#source=("git+https://gitlab.gnome.org/GNOME/network-manager-applet.git")
+_commit=b4c365b136e25e69c3550a9984f8f3cbec4bc073  # bg/wifi-dialog-free
+source=("git+https://gitlab.gnome.org/GNOME/network-manager-applet.git#commit=$_commit")
 sha256sums=('SKIP')
 
 pkgver() {
   cd ${pkgbase%-indicator}
-  git describe --tags | sed 's/-/+/g'
+  git describe --tags | sed 's/-dev/dev/;s/-/+/g'
 }
 
 prepare() {
-  mkdir -p nma/etc/xdg nma/usr/bin \
-    nma/usr/share/{applications,icons/hicolor/22x22/apps,man/man1,nm-applet}
   cd ${pkgbase%-indicator}
-  NOCONFIGURE=1 ./autogen.sh
   sed -i -e 's/Exec=nm-applet/Exec=nm-applet --indicator/' nm-applet.desktop.in
 }
 
 build() {
-  cd ${pkgbase%-indicator}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    runstatedir=/run \
-    --sbindir=/usr/bin \
-    --libexecdir=/usr/lib/NetworkManager \
-    --disable-maintainer-mode \
-    --disable-static \
-    --enable-gtk-doc \
-    --enable-introspection \
-    --enable-ld-gc \
-    --with-team \
-    --with-wwan \
-    --with-appindicator \
-    --without-selinux
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
+  arch-meson ${pkgbase%-indicator} build -Dselinux=false -Dappindicator=yes
+  ninja -C build
 }
 
 check() {
-  cd ${pkgbase%-indicator}
-  make -k check
+  meson test -C build
 }
 
-package_nm-connection-editor-indicator() {
-  pkgdesc="NetworkManager GUI connection editor and widgets, with AppIndicator"
-  provides=("libnm-gtk=${pkgver}-${pkgrel}" "libnma=${pkgver}-${pkgrel}" "nm-connection-editor=${pkgver}-${pkgrel}")
-  conflicts=(libnm-gtk)
-  replaces=(libnm-gtk)
+_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
+}
 
-  cd ${pkgbase%-indicator}
-  make DESTDIR="$pkgdir" install
+package_network-manager-applet-indicator() {
+  depends=(nm-connection-editor libmm-glib libnotify libsecret networkmanager libappindicator-gtk3)
+  provides=(network-manager-applet=$pkgver-$pkgrel)
+  conflicts=(network-manager-applet)
 
-### Split network-manager-applet-indicator
-  cd ../nma
-  mv "$pkgdir"/etc/xdg/autostart etc/xdg/
-  mv "$pkgdir"/usr/bin/nm-applet usr/bin/
-  mv "$pkgdir"/usr/share/GConf usr/share/
+  DESTDIR="$pkgdir" meson install -C build
 
-  cd usr/share
-  mv "$pkgdir"/usr/share/applications/nm-applet.desktop applications/
-  mv "$pkgdir"/usr/share/man/man1/nm-applet.1 man/man1/
+### Split libnma
+  _pick libnma "$pkgdir"/usr/include/libnma
+  _pick libnma "$pkgdir"/usr/lib/girepository-1.0/NMA-*
+  _pick libnma "$pkgdir"/usr/lib/libnma.*
+  _pick libnma "$pkgdir"/usr/lib/pkgconfig/libnma.pc
+  _pick libnma "$pkgdir"/usr/share/gir-1.0/NMA-*
+  _pick libnma "$pkgdir"/usr/share/glib-2.0/schemas
+  _pick libnma "$pkgdir"/usr/share/gtk-doc/html/libnma
 
-  cd icons/hicolor/22x22
-  mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{adhoc,mb-roam,wwan-tower}.png apps/
-  mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{secure,vpn-active}-lock.png apps/
-  mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-{signal,tech}-*.png apps/
-  mv "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-*connecting*.png apps/
+### Split nm-connection-editor
+  _pick nm-connection-editor "$pkgdir"/usr/bin/nm-connection-editor
+  _pick nm-connection-editor "$pkgdir"/usr/share/applications/nm-connection-editor.desktop
+  _pick nm-connection-editor "$pkgdir"/usr/share/icons/hicolor/22x22/apps/nm-device-wwan.png
+  _pick nm-connection-editor "$pkgdir"/usr/share/locale
+  _pick nm-connection-editor "$pkgdir"/usr/share/man/man1/nm-connection-editor.1
+  _pick nm-connection-editor "$pkgdir"/usr/share/metainfo
 }
 
-package_network-manager-applet-indicator() {
-    depends=(nm-connection-editor libmm-glib libnotify libsecret libappindicator-gtk3)
-    provides=(network-manager-applet=$pkgver-$pkgrel)
-    conflicts=(network-manager-applet)
-    mv nma/* "$pkgdir"
+package_nm-connection-editor-indicator() {
+  pkgdesc="NetworkManager GUI connection editor and widgets, with AppIndicator"
+  depends=(libnma-indicator)
+  provides=("nm-connection-editor=${pkgver}-${pkgrel}")
+  conflicts=('nm-connection-editor' 'libnm-gtk<1.8.18-1')
+  replaces=('libnm-gtk<1.8.18-1')
+
+  mv nm-connection-editor/* "$pkgdir"
+}
+
+package_libnma-indicator() {
+  pkgdesc="NetworkManager GUI client library, with AppIndicator"
+  depends=(libnm gcr gtk3 iso-codes mobile-broadband-provider-info libappindicator-gtk3)
+  provides=(libnma-indicator-${pkgver}-${pkgrel})
+  conflicts=(libnma)
+  mv libnma/* "$pkgdir"
 }