Re: [PATCH] gnu: Add exempi and eog.

[宋文武 <iyzsong@gmail.com>]

David Hashe <david.hashe@dhashe.com> writes:

> Hello Guix,
>
> The attached patches add Eye of GNOME and one of its dependencies, exempi.
> The Eye of GNOME (eog) patch depends on the exempi patch.
>
> Thanks,
> David
> From cf0f69390f00852b9971e88e5e817ca540264d88 Mon Sep 17 00:00:00 2001
> From: David Hashe <david.hashe@dhashe.com>
> Date: Wed, 15 Jul 2015 01:02:02 -0500
> Subject: [PATCH] gnu: Add exempi.
>
> * gnu/packages/freedesktop.scm (exempi): New variable.
> ---
>  gnu/packages/freedesktop.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 45 insertions(+)
>
> diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
> index eeb97cd..93a4470 100644
> --- a/gnu/packages/freedesktop.scm
> +++ b/gnu/packages/freedesktop.scm
> @@ -4,6 +4,7 @@
>  ;;; Copyright © 2015 Andy Wingo <wingo@pobox.com>
>  ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
>  ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
> +;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -40,6 +41,7 @@
>    #:use-module (gnu packages xdisorg)
>    #:use-module (gnu packages xorg)
>    #:use-module (gnu packages doxygen)
> +  #:use-module (gnu packages compression)
>    #:use-module (gnu packages libffi))
>  
>  (define-public xdg-utils
> @@ -232,3 +234,46 @@ display server running on Linux kernel modesetting and evdev input devices, an X
>  application, or a wayland client itself.  The clients can be traditional
>  applications, X servers (rootless or fullscreen) or other display servers.")
>      (license license:x11)))
> +
> +(define-public exempi
> +    (package
> +      (name "exempi")
> +      (version (string-append "2.2.2"))
Remove 'string-append'.
> +      (source (origin
> +               (method git-fetch)
> +               (uri (git-reference
> +                     (url "http://anongit.freedesktop.org/git/exempi.git")
> +                     (commit version)))
> +               (sha256
> +                (base32
> +                 "1z25wij89fn86bm38d9ahhzfq8a2sgxaphdc4lrpyq87dgb766q9"))
> +               (file-name (string-append name "-" version))))
I looked ArchLinux, and it use release tallbar from:
  <http://libopenraw.freedesktop.org/download/>.
> +      (build-system gnu-build-system)
> +      (arguments
> +        ;; FIXME: tests depend on boost, but unable to find headers when
> +        ;; used as an input
> +       `(#:configure-flags '("--disable-unittest")
> +         #:phases (alist-cons-after
> +                     'unpack 'fix-autogen
> +                     (lambda _
> +                     (substitute* "autogen.sh"
> +                      ;; autogen.sh tries to run configure before we
> +                      ;; are able to patch it
> +                      (("^.*topsrcdir/configure.*$") "")))
> +                   (alist-cons-before
> +                    'configure 'autogen
> +                    (lambda _
> +                     (zero? (system* "./autogen.sh")))
> +                     %standard-phases))))
> +      (native-inputs
> +       `(("autoconf" ,(autoconf-wrapper))
> +         ("automake" ,automake)
> +         ("libtool" ,libtool)))
> +      (inputs
> +      `(("expat" ,expat)
> +        ("zlib" ,zlib)))
> +      (home-page "https://wiki.freedesktop.org/libopenraw/Exempi")
> +      (synopsis "XMP metadata handling")
Missing 'library' at EOL.
> +      (description "Exempi is an implementation of the Extensible Metadata
> +Platform (XMP), which enables embedding metadata in PDF and image formats.")
> +      (license license:bsd-3)))
> -- 
> 1.9.1
>
> From 5fe8a80ba9979d75f02426d1153932c77087f7c3 Mon Sep 17 00:00:00 2001
> From: David Hashe <david.hashe@dhashe.com>
> Date: Wed, 15 Jul 2015 01:06:53 -0500
> Subject: [PATCH] gnu: Add eog.
>
> * gnu/packages/gnome.scm (eog): New variable.
> ---
>  gnu/packages/gnome.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 51 insertions(+)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 879c27e..be342e3 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -61,6 +61,7 @@
>    #:use-module (gnu packages lua)
>    #:use-module (gnu packages image)
>    #:use-module (gnu packages perl)
> +  #:use-module (gnu packages photo)
>    #:use-module (gnu packages pkg-config)
>    #:use-module (gnu packages pulseaudio)
>    #:use-module (gnu packages python)
> @@ -3001,3 +3002,53 @@ which can read a large number of file formats.")
>     (description "Rhythmbox is a music playing application for GNOME.  It
>  supports playlists, song ratings, and any codecs installed through gstreamer.")
>     (license license:gpl2+)))
> +
> +(define-public eog
> + (package
> +   (name "eog")
> +   (version "3.16.2")
> +   (source (origin
> +            (method url-fetch)
> +            (uri (string-append "mirror://gnome/sources/" name "/"
> +                                (version-major+minor version) "/"
> +                                name "-" version ".tar.xz"))
> +            (sha256
> +             (base32
> +              "0frw1b5jix9pffznav5s7ajjx91a8rv5lf4sjvjv3fw65mbnhbw0"))))
> +   (build-system glib-or-gtk-build-system)
> +   (arguments
> +    `(#:phases
> +      (modify-phases %standard-phases
> +        (add-after
> +         'install 'wrap-eog
> +         (lambda* (#:key inputs outputs #:allow-other-keys)
> +           (let ((out               (assoc-ref outputs "out"))
> +                 (gi-typelib-path   (getenv "GI_TYPELIB_PATH")))
> +             (wrap-program (string-append out "/bin/eog")
> +               `("GI_TYPELIB_PATH"        ":" prefix (,gi-typelib-path))))
> +           #t)))))
> +   (propagated-inputs
> +    `(("dconf" ,dconf)))
> +   (native-inputs
> +    `(("intltool" ,intltool)
> +      ("glib" ,glib "bin")
> +      ("gobject-introspection" ,gobject-introspection)
> +      ("pkg-config" ,pkg-config)))
> +   (inputs
> +    `(("gnome-desktop" ,gnome-desktop)
> +      ("shared-mime-info" ,shared-mime-info)
> +      ("itstool" ,itstool)
> +      ("adwaita-icon-theme" ,adwaita-icon-theme)
> +      ("exempi" ,exempi)
> +      ("lcms" ,lcms)
> +      ("libexif" ,libexif)
> +      ("libpeas" ,libpeas)
> +      ("libjpeg" ,libjpeg)
> +      ("librsvg" ,librsvg)
> +      ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
> +      ("gtk+" ,gtk+)))
> +   (home-page "https://wiki.gnome.org/Apps/EyeOfGnome")
> +   (synopsis "Eye of GNOME is the GNOME image viewer")
I think 'GNOME image viewer' should be enough.
> +   (description "Eye of GNOME is the GNOME image viewer.  It
> +supports image conversion, rotation, and slideshows.")
> +   (license license:gpl2+)))
> -- 
> 1.9.1
Otherwise, look good to me!