Re: [PATCH 5/7] gnu: Add gnome-disk-utility.

[Maxim Cournoyer]

Hi David,

David Craven <address@hidden> writes:

> * gnu/packages/gnome.scm (gnome-disk-utility): New variable.
> ---
>  gnu/packages/gnome.scm | 50 
> ++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 50 insertions(+)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 5fbd0c111..955ac610a 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -321,6 +321,56 @@ Gnome project.  It includes xml2po tool which makes it 
> easier to translate
>  and keep up to date translations of documentation.")
>      (license license:gpl2+))) ; xslt under lgpl
>  
> +(define-public gnome-disk-utility
> +  (package
> +    (name "gnome-disk-utility")
> +    (version "3.22.1")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "mirror://gnome/sources/" name "/"
> +                                  (version-major+minor version) "/"
> +                                  name "-" version ".tar.xz"))
> +              (sha256
> +               (base32
> +                "1hqynlcgwm72il2rdml98gcarz0alsgxs5xf6ww2x0czaj3s3953"))))
> +    (build-system gnu-build-system)
> +    (native-inputs
> +     `(("glib:bin" ,glib "bin")
> +       ("intltool" ,intltool)
> +       ("pkg-config" ,pkg-config)
> +       ("docbook-xml" ,docbook-xml)
> +       ("docbook-xsl" ,docbook-xsl)
> +       ("libxslt" ,libxslt)))
> +    (inputs
> +     `(("glib" ,glib)
> +       ("appstream-glib" ,appstream-glib)
> +       ("gnome-settings-daemon" ,gnome-settings-daemon)
> +       ("gtk+" ,gtk+)
> +       ("libcanberra" ,libcanberra)
> +       ("libdvdread" ,libdvdread)
> +       ("libnotify" ,libnotify)
> +       ("libpwquality" ,libpwquality)
> +       ("libsecret" ,libsecret)
> +       ("udisks" ,udisks)))
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-before 'configure 'fix-docbook
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (substitute* "doc/man/Makefile.in"
> +               
> (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl";)
> +                (string-append (assoc-ref inputs "docbook-xsl")
> +                               "/xml/xsl/docbook-xsl-"
> +                               ,(package-version docbook-xsl)
> +                               "/manpages/docbook.xsl")))
> +             (setenv "XML_CATALOG_FILES"
> +                     (string-append (assoc-ref inputs "docbook-xml")
> +                                    "/xml/dtd/docbook/catalog.xml")))))))

I think it would be more elegant to pass the XML_CATALOG_FILES variable
by using the #;make-flags keyworded argument. XML_CATALOG_FILES can also
contain both the xml & xsl catalogs (the items are to be space
separated), which means no substitute* call are needed. See the commit
aef5055ff9 which does that.

> +    (home-page "https://git.gnome.org/browse/gnome-disk-utility";)
> +    (synopsis "Disk management utility for GNOME")
> +    (description "Disk management utility for GNOME.")
> +    (license license:gpl2)))

This should be gpl2+ (see files headers, such as:
https://git.gnome.org/browse/gnome-disk-utility/tree/src/disks/gduapplication.c)

> +
>  (define-public gcr
>    (package
>      (name "gcr")

Thanks for this contribution!

Maxim

signature.asc
Description: PGP signature