From c59d4373532863647b6d6e9d7e253b6cfdddc5ad Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 6 Aug 2020 16:46:06 -0400
Subject: [PATCH 37/44] gnu: gnome-settings-daemon: Update package definition.

* gnu/packages/gnome.scm (gnome-settings-daemon) [version]: Update
to 3.36.1.
[arguments]<#:configure-flags>['-Dudev_dir]: Modify flag.
[native-inputs]: Add python-dbusmock, gobject-introspection, umockdev
and which. Remove docbook-xml and docbook-xsl.
[inputs]: Add fontconfig, glib, gtk+, xorgproto, pango, eudev, libxext
and libxi. Remove libxtst.
[description]: Modify.
[home-page]: Modify.
[license]: Add lgpl2.1+.
---
 gnu/packages/gnome.scm | 109 +++++++++++++++++++++++------------------
 1 file changed, 60 insertions(+), 49 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fa5229313c..e44de72165 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6156,72 +6156,83 @@ online services for numerous locations.")
 (define-public gnome-settings-daemon
   (package
     (name "gnome-settings-daemon")
-    (version "3.34.1")
+    (version "3.36.1")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/" name "/"
-                           (version-major+minor version) "/"
-                           name "-" version ".tar.xz"))
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
        (sha256
-        (base32
-         "07y1gbicz0pbxmdgwrdzyc4byy30wfwpbqgvnx27gnpqmc5s50cr"))))
+        (base32 "0jzf2nznpcrjqq7fjwk66kw8a6x87kgbdjidc2msaqmm379xncry"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
        #:configure-flags
-       (list (string-append "-Dudev_dir="
-                            (assoc-ref %outputs "out")
-                            "/lib/udev/rules.d/")
-             "-Dsystemd=false"
-             ;; Otherwise, the RUNPATH will lack the final path component.
-             (string-append "-Dc_link_args=-Wl,-rpath="
-                            (assoc-ref %outputs "out")
-                            "/lib/gnome-settings-daemon-3.0"))
-       ;; Color management test can't reach the colord system service.
-       #:tests? #f))
+       (list
+        (string-append "-Dudev_dir="
+                       (assoc-ref %outputs "out")
+                       "/lib/udev")
+        "-Dsystemd=false"
+        ;; Otherwise, the RUNPATH will lack the final path component.
+        (string-append "-Dc_link_args=-Wl,-rpath="
+                       (assoc-ref %outputs "out")
+                       "/lib/gnome-settings-daemon-3.0"))))
     (native-inputs
-     `(("glib:bin" ,glib "bin")     ; for glib-mkenums
-       ("pkg-config" ,pkg-config)
+     `(("dbusmock" ,python-dbusmock)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
        ("intltool" ,intltool)
-       ("xsltproc" ,libxslt)
-       ("libxml2" ,libxml2)                       ;for XML_CATALOG_FILES
-       ("docbook-xml" ,docbook-xml-4.2)
-       ("docbook-xsl" ,docbook-xsl)))
+       ("pkg-config" ,pkg-config)
+       ("umockdev" ,umockdev)
+       ("which" ,which)
+       ("xmllint" ,libxml2)
+       ("xsltproc" ,libxslt)))
     (inputs
-     `(("alsa-lib" ,alsa-lib)
+     `(("alsa" ,alsa-lib)
        ("colord" ,colord)
-       ("libgudev" ,libgudev)
-       ("upower" ,upower)
-       ("polkit" ,polkit)
-       ("pulseaudio" ,pulseaudio)
-       ("libcanberra" ,libcanberra)
-       ("libx11" ,libx11)
-       ("libxtst" ,libxtst)
-       ("lcms" ,lcms)
-       ("libnotify" ,libnotify)
-       ("geoclue" ,geoclue)
+       ("cups" ,cups)
+       ("fontconfig" ,fontconfig)
+       ("gcr" ,gcr)
        ("geocode-glib" ,geocode-glib)
-       ("libgweather" ,libgweather)
+       ("glib" ,glib)
        ("gnome-desktop" ,gnome-desktop)
-       ("nss" ,nss)
-       ("cups" ,cups)
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
-       ("libwacom" ,libwacom)
+       ("gtk+" ,gtk+)
+       ("gudev" ,libgudev)
+       ("gweather" ,libgweather)
+       ("kbproto" ,xorgproto)
+       ("lcms" ,lcms)
+       ("libcanberra" ,libcanberra)
+       ("libgeoclue" ,geoclue)
+       ("libnm" ,network-manager)
+       ("libnotify" ,libnotify)
+       ("libpulse" ,pulseaudio)
        ("librsvg" ,librsvg)
-       ("xf86-input-wacom" ,xf86-input-wacom)
+       ("libwacom" ,libwacom)
+       ("mm-glib" ,modem-manager)
+       ("nss" ,nss)
+       ("pango" ,pango)
+       ("polkit" ,polkit)
+       ("udev" ,eudev)
+       ("upower-glib" ,upower)
        ("wayland" ,wayland)
-       ("network-manager" ,network-manager)
-       ("gcr" ,gcr)
-       ("modem-manager" ,modem-manager)))
-    (home-page "https://www.gnome.org")
+       ("x11" ,libx11)
+       ("xext" ,libxext)
+       ("xf86-input-wacom" ,xf86-input-wacom)
+       ("xi" ,libxi)))
     (synopsis "GNOME settings daemon")
-    (description
-     "This package contains the daemon responsible for setting the various
-parameters of a GNOME session and the applications that run under it.  It
-handles settings such keyboard layout, shortcuts, and accessibility, clipboard
-settings, themes, mouse settings, and startup of other daemons.")
-    (license license:gpl2+)))
+    (description "GNOME-Settings-Daemon contains the daemon responsible for
+setting the various parameters of a GNOME session and the applications that run
+under it.")
+    (home-page "https://gitlab.gnome.org/GNOME/gnome-settings-daemon")
+    (license
+     (list
+      ;; Library
+      license:lgpl2.1+
+      ;; Others
+      license:gpl2+))))
 
 (define-public totem-pl-parser
   (package
-- 
2.28.0