Oops! I forgot that I could remove the #:phases section and autotools
native-inputs in exempi since we're using the tarball. Fixed in the
attached patch.
On Wed, Jul 15, 2015 at 11:28 PM, David Hashe <david.ha...@dhashe.com>
wrote:
> Thanks to everyone for the reviews!
>
> I got boost working and changed everything that was requested. I've
> attached updated patches for both.
>
> Thanks,
> David
>
>
> On Wed, Jul 15, 2015 at 11:15 AM, Mark H Weaver <m...@netris.org> wrote:
>
>> David Hashe <david.ha...@dhashe.com> writes:
>>
>> > The attached patches add Eye of GNOME and one of its dependencies,
>> > exempi. The Eye of GNOME (eog) patch depends on the exempi patch.
>>
>> I agree with the comments by Ricardo and 宋文武, and have a few
>> additional comments:
>>
>> > From cf0f69390f00852b9971e88e5e817ca540264d88 Mon Sep 17 00:00:00 2001
>> > From: David Hashe <david.ha...@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 <wi...@pobox.com>
>> > ;;; Copyright © 2015 Ludovic Courtès <l...@gnu.org>
>> > ;;; Copyright © 2015 Ricardo Wurmus <rek...@elephly.net>
>> > +;;; Copyright © 2015 David Hashe <david.ha...@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"))
>> > + (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))))
>>
>> If we had used the git checkout, the file-name should end with
>> "-checkout", but we should use the release tarball instead.
>>
>> > + (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))))
>>
>> Autogen/autoreconf/bootstrap phases should always go after 'unpack' (or
>> in this case, after 'fix-autogen'), *not* before 'configure'. The
>> reason is that there are some other phases (patch-usr-bin-file and
>> patch-source-shebangs) which should have access to the generated files.
>> For example, letting 'patch-usr-bin-file' patch the generated
>> 'configure' is important on some platforms.
>>
>> However, this is moot because you should use the release tarball.
>>
>> Can you send updated patches?
>>
>> Thanks,
>> Mark
>>
>
>
> On Wed, Jul 15, 2015 at 11:15 AM, Mark H Weaver <m...@netris.org> wrote:
>
>> David Hashe <david.ha...@dhashe.com> writes:
>>
>> > The attached patches add Eye of GNOME and one of its dependencies,
>> > exempi. The Eye of GNOME (eog) patch depends on the exempi patch.
>>
>> I agree with the comments by Ricardo and 宋文武, and have a few
>> additional comments:
>>
>> > From cf0f69390f00852b9971e88e5e817ca540264d88 Mon Sep 17 00:00:00 2001
>> > From: David Hashe <david.ha...@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 <wi...@pobox.com>
>> > ;;; Copyright © 2015 Ludovic Courtès <l...@gnu.org>
>> > ;;; Copyright © 2015 Ricardo Wurmus <rek...@elephly.net>
>> > +;;; Copyright © 2015 David Hashe <david.ha...@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"))
>> > + (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))))
>>
>> If we had used the git checkout, the file-name should end with
>> "-checkout", but we should use the release tarball instead.
>>
>> > + (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))))
>>
>> Autogen/autoreconf/bootstrap phases should always go after 'unpack' (or
>> in this case, after 'fix-autogen'), *not* before 'configure'. The
>> reason is that there are some other phases (patch-usr-bin-file and
>> patch-source-shebangs) which should have access to the generated files.
>> For example, letting 'patch-usr-bin-file' patch the generated
>> 'configure' is important on some platforms.
>>
>> However, this is moot because you should use the release tarball.
>>
>> Can you send updated patches?
>>
>> Thanks,
>> Mark
>>
>
>
From 1e49fead6bbe909271792794d0f67491b413a983 Mon Sep 17 00:00:00 2001
From: David Hashe <david.ha...@dhashe.com>
Date: Wed, 15 Jul 2015 23:15:45 -0500
Subject: [PATCH] gnu: Add exempi.
* gnu/packages/freedesktop.scm (exempi): New variable.
---
gnu/packages/freedesktop.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index eeb97cd..e0bd27d 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Andy Wingo <wi...@pobox.com>
;;; Copyright © 2015 Ludovic Courtès <l...@gnu.org>
;;; Copyright © 2015 Ricardo Wurmus <rek...@elephly.net>
+;;; Copyright © 2015 David Hashe <david.ha...@dhashe.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -39,6 +40,8 @@
#:use-module (gnu packages glib) ;intltool
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
+ #:use-module (gnu packages boost)
+ #:use-module (gnu packages compression)
#:use-module (gnu packages doxygen)
#:use-module (gnu packages libffi))
@@ -232,3 +235,30 @@ 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 "2.2.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://libopenraw.freedesktop.org/download/";
+ name "-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags (list (string-append "--with-boost="
+ (assoc-ref %build-inputs "boost")))))
+ (native-inputs
+ `(("boost" ,boost))) ; tests
+ (inputs
+ `(("expat" ,expat)
+ ("zlib" ,zlib)))
+ (home-page "https://wiki.freedesktop.org/libopenraw/Exempi";)
+ (synopsis "XMP metadata handling library")
+ (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
