12/19: gnu: gnome-boxes: Update package definition.

[guix-commits]

dannym pushed a commit to branch wip-desktop
in repository guix.

commit 46c53e4a0d596fa63cf0203abf9e9bb31b0ce854
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Tue Aug 4 09:41:32 2020 -0400

    gnu: gnome-boxes: Update package definition.
    
    * gnu/packages/gnome.scm (gnome-boxes): Update package definition.
    [outputs]: New output "help".
    [arguments]<#:configure-flags>[-Drdp]: Remove flag.
    <#:phases>['skip-gtk-update-icon-cache]: New phase.
    ['move-help]: New phase.
    [native-inputs]: Add gobject-introspection and python-wrapper.
    [inputs]: Add appstream-glib and freerdp.
    [propagated-inputs]: Add glib and glib-networking.
    [synopsis]: Modify.
    [description]: Modify.
    
    Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
 gnu/packages/gnome.scm | 80 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 54 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 72fa261..fe21f55 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12785,52 +12785,80 @@ integrate seamlessly with the GNOME desktop.")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/gnome-boxes/"
-                           (version-major+minor version) "/"
-                           "gnome-boxes-" version ".tar.xz"))
+       (uri
+        (string-append "mirror://gnome/sources/gnome-boxes/"
+                       (version-major+minor version) "/"
+                       "gnome-boxes-" version ".tar.xz"))
        (sha256
         (base32 "1khvyhgd3p41fvvknga1hdl0p1ks4kj4cwsiaw28v1sy6nzclm2c"))))
     (build-system meson-build-system)
+    (outputs '("out" "help"))
     (arguments
-     '(#:glib-or-gtk? #t
-       #:configure-flags (list "-Drdp=false"
-                               (string-append "-Dc_link_args=-Wl,-rpath="
-                                              (assoc-ref %outputs "out")
-                                              "/lib/gnome-boxes"))))
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
+       #:configure-flags
+       (list
+        ;; For run-path validation.
+        (string-append "-Dc_link_args=-Wl,-rpath="
+                       (assoc-ref %outputs "out")
+                       "/lib/gnome-boxes"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'skip-gtk-update-icon-cache
+           (lambda _
+             (substitute* "build-aux/post_install.py"
+               (("gtk-update-icon-cache")
+                "true"))
+             #t))
+         (add-after 'install 'move-help
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (help (assoc-ref outputs "help")))
+               (mkdir-p (string-append help "/share"))
+               (rename-file
+                (string-append out "/share/help")
+                (string-append help "/share/help"))
+               #t))))))
     (native-inputs
-     `(("glib:bin" ,glib "bin")             ; for glib-compile-resources
-       ("gtk+:bin" ,gtk+ "bin")             ; for gtk-update-icon-cache
-       ("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
-       ("itstool" ,itstool)
+     `(("desktop-file-utils" ,desktop-file-utils)
+       ("glib:bin" ,glib "bin")
+       ("gobject-introspection" ,gobject-introspection)
        ("intltool" ,intltool)
-       ("vala" ,vala)
-       ("pkg-config" ,pkg-config)))
+       ("itstool" ,itstool)
+       ("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)
+       ("vala" ,vala)))
     (inputs
-     `(("libarchive" ,libarchive)
+     `(("appstream-util" ,appstream-glib)
        ("gtk" ,gtk+)
        ("gtk-vnc" ,gtk-vnc)
+       ("gudev" ,libgudev)
+       ("libarchive" ,libarchive)
        ("libosinfo" ,libosinfo)
        ("libsecret" ,libsecret)
        ("libsoup" ,libsoup)
        ("libusb" ,libusb)
        ("libvirt" ,libvirt)
        ("libvirt-glib" ,libvirt-glib)
-       ("libxml" ,libxml2)
-       ("spice-gtk" ,spice-gtk)
+       ("libxml2" ,libxml2)
        ("sparql-query" ,sparql-query)
+       ("spice-gtk" ,spice-gtk)
+       ("tracker" ,tracker)
        ("vte" ,vte)
        ("webkitgtk" ,webkitgtk)
-       ("tracker" ,tracker)
-       ("libgudev" ,libgudev)))
-    (home-page "https://wiki.gnome.org/Apps/Boxes";)
-    (synopsis "View, access, and manage remote and virtual systems")
+       ("winpr" ,freerdp)))
+    (propagated-inputs
+     `(("glib" ,glib)
+       ("glib-networking" ,glib-networking)))
+    (synopsis "Virtualization made simple")
     (description "GNOME Boxes is a simple application to view, access, and
 manage remote and virtual systems.")
-    (license (list
-              ;; For data/icons/empty-boxes.png.
-              license:cc-by2.0
-              ;; For all others.
-              license:lgpl2.0+))))
+    (home-page "https://wiki.gnome.org/Apps/Boxes";)
+    (license
+     (list
+      ;; Icons
+      license:cc-by2.0
+      ;; Others.
+      license:lgpl2.0+))))
 
 (define-public geary
   (package