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

[Jan Steffens]

    Date: Thursday, February 7, 2019 @ 12:10:34
  Author: heftig
Revision: 345595

1.8.20-1: remove libnm-gtk

Modified:
  network-manager-applet/trunk/PKGBUILD

----------+
 PKGBUILD |   25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-07 11:59:58 UTC (rev 345594)
+++ PKGBUILD	2019-02-07 12:10:34 UTC (rev 345595)
@@ -6,16 +6,16 @@
 # Contributor: Will Rea <sillywilly at gmail.com>
 
 pkgbase=network-manager-applet
-pkgname=(network-manager-applet nm-connection-editor libnma libnm-gtk)
+pkgname=(network-manager-applet nm-connection-editor libnma)
 pkgdesc="Applet for managing network connections"
 url="https://wiki.gnome.org/Projects/NetworkManager/"
-pkgver=1.8.19dev+21+geebf7f95
+pkgver=1.8.20
 pkgrel=1
 arch=(x86_64)
 license=(GPL LGPL)
 makedepends=(libsecret libnotify libmm-glib intltool gobject-introspection git gtk-doc meson
-             libnm-glib libgudev gtk3 mobile-broadband-provider-info iso-codes gcr)
-_commit=eebf7f958f0ccb15877496e5ce66ed8a0bd9e297  # merge-requests/31/head
+             libnm gcr gtk3 iso-codes mobile-broadband-provider-info)
+_commit=59e2b0db628ea5adb73bea0d69212e9f34f02d11  # tags/1.8.20^0
 source=("git+https://gitlab.gnome.org/GNOME/network-manager-applet.git#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -29,7 +29,7 @@
 }
 
 build() {
-  arch-meson $pkgbase build -D selinux=false -D libnm_gtk=true
+  arch-meson $pkgbase build -D selinux=false
   ninja -C build
 }
 
@@ -61,13 +61,6 @@
   _pick libnma "$pkgdir"/usr/share/glib-2.0/schemas
   _pick libnma "$pkgdir"/usr/share/gtk-doc/html/libnma
 
-### 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
@@ -79,7 +72,7 @@
 
 package_nm-connection-editor() {
   pkgdesc="NetworkManager GUI connection editor and widgets"
-  depends=(libnma libnm-gtk)
+  depends=(libnma)
   conflicts=('libnm-gtk<1.8.18-1')
   replaces=('libnm-gtk<1.8.18-1')
   mv nm-connection-editor/* "$pkgdir"
@@ -90,9 +83,3 @@
   depends=(libnm gcr gtk3 iso-codes mobile-broadband-provider-info)
   mv libnma/* "$pkgdir"
 }
-
-package_libnm-gtk() {
-  pkgdesc="NetworkManager GUI client library (legacy)"
-  depends=(libnm-glib gtk3 iso-codes libgudev)
-  mv libnm-gtk/* "$pkgdir"
-}