bye bye nm-gtk and libnma was split off

2 files changed, 8 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e62ddcc99f2b..e223bb978b75 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = network-manager-applet-git
 	pkgdesc = Applet for managing network connections
-	pkgver = 1.8.21.dev.r47.ga0c31ed5
+	pkgver = 1.8.25.dev.r20.g74183667
 	pkgrel = 1
 	url = http://www.gnome.org/projects/NetworkManager/
 	arch = i686
@@ -23,6 +23,7 @@ pkgbase = network-manager-applet-git
 	depends = mobile-broadband-provider-info
 	depends = libnm-git
 	depends = iso-codes
+	depends = libnma
 	options = emptydirs
 	source = git+https://gitlab.gnome.org/GNOME/network-manager-applet.git
 	sha256sums = SKIP
@@ -46,22 +47,3 @@ pkgname = nm-connection-editor-git
 	conflicts = nm-connection-editor
 	replaces = nm-connection-editor
 
-pkgname = libnm-gtk-git
-	pkgdesc = NetworkManager GUI client library (legacy)
-	depends = libnm-glib
-	depends = gtk3
-	depends = iso-codes
-	depends = libgudev
-	provides = libnm-gtk
-	conflicts = libnm-gtk
-
-pkgname = libnma-git
-	pkgdesc = NetworkManager GUI client library
-	depends = libnm
-	depends = gcr
-	depends = gtk3
-	depends = iso-codes
-	depends = mobile-broadband-provider-info
-	provides = libnma
-	conflicts = libnma
-
diff --git a/PKGBUILD b/PKGBUILD
index 015279f2d98e..6a2989c09d0d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,17 @@
 # Maintainer: ksj <podhorsky.ksj@gmail.com>
 # Contributor: kasa <biuta.jr@gmail.com>
 # Contributor: L42y <423300@gmail.com>
-
+# Maintainer: Solomon Choina <shlomochoina@gmail.com>
 
 pkgbase=network-manager-applet-git
-pkgname=(network-manager-applet-git nm-connection-editor-git libnm-gtk-git libnma-git)
-pkgver=1.8.21.dev.r47.ga0c31ed5
+pkgname=(network-manager-applet-git nm-connection-editor-git)
+pkgver=1.8.25.dev.r20.g74183667
 pkgrel=1
 pkgdesc="Applet for managing network connections"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 url="http://www.gnome.org/projects/NetworkManager/"
-depends=(libnm gcr libgudev gtk3 mobile-broadband-provider-info libnm-git iso-codes)
+depends=(libnm gcr libgudev gtk3 mobile-broadband-provider-info libnm-git iso-codes libnma)
 makedepends=(meson libsecret libnotify gtk3 libnm gtk-doc intltool gobject-introspection git)
 options=('emptydirs')
 source=(git+https://gitlab.gnome.org/GNOME/network-manager-applet.git)
@@ -26,8 +26,7 @@ pkgver() {
 build() {
 
 	arch-meson network-manager-applet build \
-    -Dgtk_doc=false \
-	  -Dlibnm_gtk=true \
+    -Dgtk_doc=true \
     -Dintrospection=true \
     -Dld_gc=true \
     -Dteam=true \
@@ -60,20 +59,7 @@ package_network-manager-applet-git() {
   depends=(nm-connection-editor libnm libmm-glib libnotify libsecret)
 
   DESTDIR="${pkgdir}" ninja -C build install
-        ### 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
-
-      ### Split libnm-gtk
-     _pick libnm-gtk "$pkgdir"/usr/include/libnm-gtk
-     _pick libnm-gtk "$pkgdir"/usr/lib/girepository-1.0/NMGtk-*
-     _pick libnm-gtk "$pkgdir"/usr/lib/libnm-gtk.*
-     _pick libnm-gtk "$pkgdir"/usr/lib/pkgconfig/libnm-gtk.pc
-     _pick libnm-gtk "$pkgdir"/usr/share/gir-1.0/NMGtk-*
+  
       ### 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
@@ -92,20 +78,4 @@ package_nm-connection-editor-git() {
    mv nm-connection-editor/* "$pkgdir"
 }
 
-package_libnma-git() {
-    pkgdesc="NetworkManager GUI client library"
-    depends=(libnm gcr gtk3 iso-codes mobile-broadband-provider-info)
-     provides=("libnma")
-     conflicts=("libnma")
-    mv libnma/* "$pkgdir"
-}
-
-package_libnm-gtk-git() {
-  pkgdesc="NetworkManager GUI client library (legacy)"
-  depends=(libnm-glib gtk3 iso-codes libgudev)
-  provides=("libnm-gtk")
-  conflicts=("libnm-gtk")
-  mv libnm-gtk/* "$pkgdir"
-}
-