From e0f0722c58692109f270ffef1d0a67964dfa2980 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 06:47:22 -0400
Subject: [PATCH 62/75] gnu: network-manager-applet: Update package definition.

* gnu/packages/gnome.scm (network-manager-applet) [version]: Update
to 1.18.0.
[source]<origin>[sha256]: Modify base32.
[native-inputs]: Add desktop-file-utils and libxml2. Remove gtk-doc.
[propagated-inputs]: Remove dbus-glib. Move gtk+, network-manager and
libnma to ...
[inputs]: ... here. Add libappindicator, appstream-glib, glib,
and glib-networking.
[synopsis]: Modify.
[description]: Modify.
---
 gnu/packages/gnome.scm | 58 +++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e996acf096..78170f9609 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8799,44 +8799,44 @@ settings for different service providers in different countries.")
 (define-public network-manager-applet
   (package
     (name "network-manager-applet")
-    (version "1.16.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/network-manager-applet/"
-                                  (version-major+minor version) "/"
-                                  "network-manager-applet-" version ".tar.xz"))
-              (sha256
-               (base32
-                "1rf3nm0hjcy9f8ajb4vmvwy503w8yj8d4daxkcb7w7i7b92qmyfn"))))
+    (version "1.18.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/network-manager-applet/"
+                       (version-major+minor version) "/"
+                       "network-manager-applet-" version ".tar.xz"))
+       (sha256
+        (base32 "12xiy8g8qk18jvxvn78mvq03zvzp06bww49na765jjw0rq541fyx"))))
     (build-system meson-build-system)
     (arguments
-     '(#:glib-or-gtk? #t))
+     `(#:glib-or-gtk? #t))   ; To wrap binaries and/or compile schemas
     (native-inputs
-     `(("intltool" ,intltool)
-       ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
+     `(("desktop-file-vaildate" ,desktop-file-utils)
+       ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
-       ("gtk-doc" ,gtk-doc)
-       ("pkg-config" ,pkg-config)))
-    (propagated-inputs
-     ;; libnm-gtk.pc refers to all these.
-     `(("dbus-glib" ,dbus-glib)
-       ("gtk+" ,gtk+)
-       ("network-manager" ,network-manager)
-       ;; nm-applet need by org.gnome.nm-applet.gschema.xml
-       ("libnma" ,libnma)))
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)
+       ("xmllint" ,libxml2)))
     (inputs
-     `(("gcr" ,gcr)
-       ("libgudev" ,libgudev)
+     `(("appindicator" ,libappindicator)
+       ("appstream-util" ,appstream-glib)
+       ("glib" ,glib)
+       ("glib-networking" ,glib-networking)
+       ("gtk+" ,gtk+)
+       ("gudev" ,libgudev)
+       ("jansson" ,jansson)
+       ("libnm" ,network-manager)
+       ("libnma" ,libnma)
        ("libnotify" ,libnotify)
        ("libsecret" ,libsecret)
        ("libselinux" ,libselinux)
-       ("jansson" ,jansson) ; for team support
-       ("modem-manager" ,modem-manager)))
-    (synopsis "Applet for managing network connections")
+       ("mm-glib" ,modem-manager)))
+    (synopsis "Applet for NetworkManager")
+    (description "Network-Manager-Applet is a tray applet and an advanced
+network connection editor.")
     (home-page "https://wiki.gnome.org/Projects/NetworkManager")
-    (description
-     "This package contains a systray applet for NetworkManager.  It displays
-the available networks and allows users to easily switch between them.")
     (license license:gpl2+)))
 
 (define-public libxml++
-- 
2.27.0