From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH] gnu: Move giflib to (gnu packages image). Date: Tue, 30 Sep 2014 00:00:06 +0400 Message-ID: <8761g6ci49.fsf_-_@gmail.com> References: <87wq8scc81.fsf@gmail.com> <8761gbluy0.fsf@gnu.org> <87h9zvd2kx.fsf@gmail.com> <87zjdned7y.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYhD4-0002kX-Vc for guix-devel@gnu.org; Mon, 29 Sep 2014 16:06:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XYhD0-0006s2-SO for guix-devel@gnu.org; Mon, 29 Sep 2014 16:06:14 -0400 In-Reply-To: <87zjdned7y.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Thu, 25 Sep 2014 21:01:37 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s (2014-09-25 23:01 +0400) wrote: > Alex Kost skribis: [...] >>> Actually this should probably go to (gnu packages image), which is home >>> for all its friends. >> >> OK, initially I wanted to put it there, but then I found that =E2=80=9Cg= iflib=E2=80=9D >> is in a separate file, so I thought that maybe "image.scm" contains some >> special image libraries. >> >> If =E2=80=9Cgiflib=E2=80=9D also should be put in "image.scm", please do= n't move it >> there before I push these imlib2/giblib commits :-) > > Fine. :-) If I understood correctly, =E2=80=9Cgiflib=E2=80=9D should be in "image.scm= ", right? I have also added myself to the copyright lines as I forgot to do it when I pushed =E2=80=9Cimlib2=E2=80=9D and =E2=80=9Cgiblib=E2=80=9D there. = OK? --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Move-giflib-to-gnu-packages-image.patch Content-Transfer-Encoding: quoted-printable >From 80dce06f9e3b96607ea6d949ee655ede1a96d50b Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Mon, 29 Sep 2014 23:46:12 +0400 Subject: [PATCH] gnu: Move giflib to (gnu packages image). * gnu/packages/giflib.scm: Remove. Move the contents to (gnu packages imag= e). * gnu-system.am (GNU_SYSTEM_MODULES): Remove giflib file name. * gnu/packages/emacs.scm: Remove giflib module name. * gnu/packages/image.scm (giflib): New variable. --- gnu-system.am | 1 - gnu/packages/emacs.scm | 1 - gnu/packages/giflib.scm | 76 ---------------------------------------------= ---- gnu/packages/image.scm | 55 +++++++++++++++++++++++++++++++++-- 4 files changed, 53 insertions(+), 80 deletions(-) delete mode 100644 gnu/packages/giflib.scm diff --git a/gnu-system.am b/gnu-system.am index 9cac7ec..64ce1d8 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -99,7 +99,6 @@ GNU_SYSTEM_MODULES =3D \ gnu/packages/geeqie.scm \ gnu/packages/gettext.scm \ gnu/packages/ghostscript.scm \ - gnu/packages/giflib.scm \ gnu/packages/gimp.scm \ gnu/packages/gkrellm.scm \ gnu/packages/gl.scm \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6e42d0a..1b90bad 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -34,7 +34,6 @@ #:use-module (gnu packages xorg) #:use-module (gnu packages lesstif) #:use-module (gnu packages image) - #:use-module (gnu packages giflib) #:use-module (gnu packages linux) #:use-module (gnu packages version-control) #:use-module (gnu packages imagemagick) diff --git a/gnu/packages/giflib.scm b/gnu/packages/giflib.scm deleted file mode 100644 index 849586e..0000000 --- a/gnu/packages/giflib.scm +++ /dev/null @@ -1,76 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2014 Mark H Weaver -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages giflib) - #:use-module (guix licenses) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module (srfi srfi-1) - #:use-module (gnu packages xorg) - #:use-module (gnu packages perl)) - -(define-public giflib - (package - (name "giflib") - (version "4.2.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/giflib/giflib-" - (first (string-split version #\.)) - ".x/giflib-" version ".tar.bz2")) - (sha256 - (base32 "0rmp7ipzk42r841bggd7bfqk4p8qsssbp4wcck4qnz7p4rkxbj= 0a")))) - (build-system gnu-build-system) - (outputs '("bin" ; utility programs - "out")) ; library - (inputs `(("libx11" ,libx11) - ("libice" ,libice) - ("libsm" ,libsm) - ("perl" ,perl))) - (arguments - `(#:phases (alist-cons-after - 'unpack 'disable-html-doc-gen - (lambda _ - (substitute* "doc/Makefile.in" - (("^all: allhtml manpages") ""))) - (alist-cons-after - 'install 'install-manpages - (lambda* (#:key outputs #:allow-other-keys) - (let* ((bin (assoc-ref outputs "bin")) - (man1dir (string-append bin "/share/man/man1"))) - (mkdir-p man1dir) - (for-each (lambda (file) - (let ((base (basename file))) - (format #t "installing `~a' to `~a'~%" - base man1dir) - (copy-file file - (string-append - man1dir "/" base)))) - (find-files "doc" "\\.1")))) - %standard-phases)))) - (synopsis "Tools and library for working with GIF images") - (description - "giflib is a library for reading and writing GIF images. It is API a= nd -ABI compatible with libungif which was in wide use while the LZW compressi= on -algorithm was patented. Tools are also included to convert, manipulate, -compose, and analyze GIF images.") - (home-page "http://giflib.sourceforge.net/") - (license x11))) - -;;; giflib.scm ends here diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0e79942..1b15be3 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1,5 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2013 Andreas Enge +;;; Copyright =C2=A9 2014 Mark H Weaver +;;; Copyright =C2=A9 2014 Alex Kost ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,12 +26,13 @@ #:use-module (gnu packages xml) #:use-module (gnu packages ghostscript) ;lcms #:use-module (gnu packages xorg) - #:use-module (gnu packages giflib) + #:use-module (gnu packages perl) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) - #:use-module (guix build-system cmake)) + #:use-module (guix build-system cmake) + #:use-module (srfi srfi-1)) =20 (define-public libpng (package @@ -216,6 +219,54 @@ error-resilience, a Java-viewer for j2k-images, ...") (home-page "http://jbig2dec.sourceforge.net/") (license license:bsd-2))) =20 +(define-public giflib + (package + (name "giflib") + (version "4.2.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/giflib/giflib-" + (first (string-split version #\.)) + ".x/giflib-" version ".tar.bz2")) + (sha256 + (base32 "0rmp7ipzk42r841bggd7bfqk4p8qsssbp4wcck4qnz7p4rkxbj= 0a")))) + (build-system gnu-build-system) + (outputs '("bin" ; utility programs + "out")) ; library + (inputs `(("libx11" ,libx11) + ("libice" ,libice) + ("libsm" ,libsm) + ("perl" ,perl))) + (arguments + `(#:phases (alist-cons-after + 'unpack 'disable-html-doc-gen + (lambda _ + (substitute* "doc/Makefile.in" + (("^all: allhtml manpages") ""))) + (alist-cons-after + 'install 'install-manpages + (lambda* (#:key outputs #:allow-other-keys) + (let* ((bin (assoc-ref outputs "bin")) + (man1dir (string-append bin "/share/man/man1"))) + (mkdir-p man1dir) + (for-each (lambda (file) + (let ((base (basename file))) + (format #t "installing `~a' to `~a'~%" + base man1dir) + (copy-file file + (string-append + man1dir "/" base)))) + (find-files "doc" "\\.1")))) + %standard-phases)))) + (synopsis "Tools and library for working with GIF images") + (description + "giflib is a library for reading and writing GIF images. It is API a= nd +ABI compatible with libungif which was in wide use while the LZW compressi= on +algorithm was patented. Tools are also included to convert, manipulate, +compose, and analyze GIF images.") + (home-page "http://giflib.sourceforge.net/") + (license license:x11))) + (define-public imlib2 (package (name "imlib2") --=20 2.1.0 --=-=-=--