[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] gnu: exiv2: Move to (gnu packages image).
|
From: |
Alex Kost |
|
Subject: |
[PATCH 1/2] gnu: exiv2: Move to (gnu packages image). |
|
Date: |
Fri, 2 Dec 2016 12:51:32 +0300 |
* gnu/packages/geeqie.scm (exiv2): Move to...
* gnu/packages/image.scm: ... here.
* gnu/packages/gnome.scm: Adjust the used modules.
* gnu/packages/gnunet.scm: Likewise.
* gnu/packages/gps.scm: Likewise.
---
gnu/packages/geeqie.scm | 33 ---------------------------------
gnu/packages/gnome.scm | 1 -
gnu/packages/gnunet.scm | 1 -
gnu/packages/gps.scm | 2 +-
gnu/packages/image-viewers.scm | 2 +-
gnu/packages/image.scm | 35 +++++++++++++++++++++++++++++++++++
6 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/geeqie.scm b/gnu/packages/geeqie.scm
index 509819e..bc922d5 100644
--- a/gnu/packages/geeqie.scm
+++ b/gnu/packages/geeqie.scm
@@ -31,39 +31,6 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages xml))
-(define-public exiv2 ; XXX: move elsewhere?
- (package
- (name "exiv2")
- (version "0.25")
- (source (origin
- (method url-fetch)
- (uri (list (string-append "http://www.exiv2.org/exiv2-";
- version ".tar.gz")
- (string-append "https://fossies.org/linux/misc/exiv2-";
- version ".tar.gz")))
- (sha256
- (base32
- "197g6vgcpyf9p2cwn5p5hb1r714xsk1v4p96f5pv1z8mi9vzq2y8"))))
- (build-system gnu-build-system)
- (arguments '(#:tests? #f)) ; no `check' target
- (propagated-inputs
- `(("expat" ,expat)
- ("zlib" ,zlib)))
- (native-inputs
- `(("intltool" ,intltool)))
- (home-page "http://www.exiv2.org/";)
- (synopsis "Library and command-line utility to manage image metadata")
- (description
- "Exiv2 is a C++ library and a command line utility to manage image
-metadata. It provides fast and easy read and write access to the Exif, IPTC
-and XMP metadata of images in various formats.")
-
- ;; Files under `xmpsdk' are a copy of Adobe's XMP SDK, licensed under the
- ;; 3-clause BSD license: <http://www.adobe.com/devnet/xmp/sdk/eula.html>.
- ;; The core is GPLv2+:
- ;; <https://launchpad.net/ubuntu/precise/+source/exiv2/+copyright>.
- (license l:gpl2+)))
-
(define-public geeqie
(package
(name "geeqie")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3aa0f56..e7798e9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -97,7 +97,6 @@
#:use-module (gnu packages scanner)
#:use-module (gnu packages ssh)
#:use-module (gnu packages xml)
- #:use-module (gnu packages geeqie)
#:use-module (gnu packages gl)
#:use-module (gnu packages compression)
#:use-module (gnu packages tex)
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 1eb2670..5d1baa8 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -29,7 +29,6 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
- #:use-module (gnu packages geeqie)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index da5485e..bc0f3ed 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -27,7 +27,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages compression)
#:use-module (gnu packages docbook)
- #:use-module (gnu packages geeqie) ;exiv2
+ #:use-module (gnu packages image)
#:use-module (gnu packages xml)
#:use-module (gnu packages gtk)
#:use-module (gnu packages qt))
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 4be0ebb..eb25c11 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -20,10 +20,10 @@
#:use-module (guix build-system gnu)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
- #:use-module (gnu packages geeqie)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages image)
#:use-module (gnu packages pkg-config))
(define-public viewnior
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 3f9a2b2..35abe9e 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1,4 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2013 Ludovic Courtès <address@hidden>
;;; Copyright © 2013, 2015, 2016 Andreas Enge <address@hidden>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2014, 2015 Alex Kost <address@hidden>
@@ -40,6 +41,7 @@
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
+ #:use-module (gnu packages glib)
#:use-module (gnu packages graphics)
#:use-module (gnu packages maths)
#:use-module (gnu packages mcrypt)
@@ -788,6 +790,39 @@ channels.")
"Libmng is the MNG (Multiple-image Network Graphics) reference library.")
(license license:bsd-3)))
+(define-public exiv2
+ (package
+ (name "exiv2")
+ (version "0.25")
+ (source (origin
+ (method url-fetch)
+ (uri (list (string-append "http://www.exiv2.org/exiv2-";
+ version ".tar.gz")
+ (string-append "https://fossies.org/linux/misc/exiv2-";
+ version ".tar.gz")))
+ (sha256
+ (base32
+ "197g6vgcpyf9p2cwn5p5hb1r714xsk1v4p96f5pv1z8mi9vzq2y8"))))
+ (build-system gnu-build-system)
+ (arguments '(#:tests? #f)) ; no `check' target
+ (propagated-inputs
+ `(("expat" ,expat)
+ ("zlib" ,zlib)))
+ (native-inputs
+ `(("intltool" ,intltool)))
+ (home-page "http://www.exiv2.org/";)
+ (synopsis "Library and command-line utility to manage image metadata")
+ (description
+ "Exiv2 is a C++ library and a command line utility to manage image
+metadata. It provides fast and easy read and write access to the Exif, IPTC
+and XMP metadata of images in various formats.")
+
+ ;; Files under `xmpsdk' are a copy of Adobe's XMP SDK, licensed under the
+ ;; 3-clause BSD license: <http://www.adobe.com/devnet/xmp/sdk/eula.html>.
+ ;; The core is GPLv2+:
+ ;; <https://launchpad.net/ubuntu/precise/+source/exiv2/+copyright>.
+ (license license:gpl2+)))
+
(define-public devil
(package
(name "devil")
--
2.10.2