314/402: gnu: sushi: Update package definition.

[guix-commits]

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

commit f351b248625118247cb5ac63ec6d56f91a001e00
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Sat Aug 8 23:32:47 2020 -0400

    gnu: sushi: Update package definition.
    
    * gnu/packages/gnome.scm (sushi) [version]: Update to 3.34.0.
    [source]<origin>[sha256]: Modify base32.
    [arguments]<#:phases>['wrap-typelib]: Modify phase.
    [inputs]: Add glib and gtk+. Replace gdk-pixbuf with gdk-pixbuf+svg.
    Remove clutter, clutter-gst, clutter-gtk, libxml2 and neon.
    [synopsis]: Modify.
    
    Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
 gnu/packages/gnome.scm | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6b2fc3d..19a9cec 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1742,55 +1742,54 @@ masses.")
 (define-public sushi
   (package
     (name "sushi")
-    (version "3.32.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "02idvqjk76lii9xyg3b1yz4rw721709bdm5j8ikjym6amcghl0aj"))))
+    (version "3.34.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version) "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1zcr8wi5bgvvpb5ha1v96aiaz4vqqrsn6cvvalwzah6am85k78m8"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t
+     `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
        #:phases
        (modify-phases %standard-phases
          (add-after 'glib-or-gtk-wrap 'wrap-typelib
            (lambda* (#:key outputs #:allow-other-keys)
-             (let ((prog (string-append (assoc-ref outputs "out")
-                                        "/bin/sushi")))
+             (let* ((prog (string-append (assoc-ref outputs "out")
+                                         "/bin/sushi")))
                ;; Put existing typelibs before sushi's deps, so as to correctly
                ;; infer gdk-pixbuf
                (wrap-program prog
                  `("GI_TYPELIB_PATH" suffix (,(getenv "GI_TYPELIB_PATH"))))
                #t))))))
     (native-inputs
-     `(("glib:bin" ,glib "bin")
-       ("gettext" ,gettext-minimal)
+     `(("gettext" ,gettext-minimal)
+       ("glib:bin" ,glib "bin")
        ("gobject-introspection" ,gobject-introspection)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("clutter" ,clutter)
-       ("clutter-gst" ,clutter-gst)
-       ("clutter-gtk" ,clutter-gtk)
-       ("evince" ,evince)                         ; For file previewing.
+     `(("epoxy" ,libepoxy)
+       ("evince" ,evince)
        ("freetype" ,freetype)
-       ("gdk-pixbuf" ,gdk-pixbuf)
+       ("gdk-pixbuf" ,gdk-pixbuf+svg)
        ("gjs" ,gjs)
+       ("glib" ,glib)
        ("gst-plugins-base" ,gst-plugins-base)
        ("gstreamer" ,gstreamer)
-       ("gtksourceview" ,gtksourceview-3)
+       ("gtk+" ,gtk+)
+       ("gtksourceview" ,gtksourceview)
        ("harfbuzz" ,harfbuzz)
-       ("libepoxy" ,libepoxy)
        ("libmusicbrainz" ,libmusicbrainz)
-       ("libxml2" ,libxml2)
-       ("neon" ,neon)
        ("webkitgtk" ,webkitgtk)))
-    (synopsis "File previewer for the GNOME desktop")
+    (synopsis "File previewer")
     (description "Sushi is a DBus-activated service that allows applications to
 preview files on the GNOME desktop.")
     (home-page "https://gitlab.gnome.org/GNOME/sushi";)
+    ;; With added exception clause.
     (license license:gpl2+)))
 
 (define-public rygel