>From 5015998104802fc512e89a4d84a508e25e788692 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 20 Mar 2014 04:05:09 -0400 Subject: [PATCH 1/3] gnu: netpbm: Reindent recipe. * gnu/packages/netpbm.scm (netpbm): Reindent. Fix dangling close parentheses. --- gnu/packages/netpbm.scm | 166 ++++++++++++++++++++++++------------------------ 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/gnu/packages/netpbm.scm b/gnu/packages/netpbm.scm index 01d672e..5875a93 100644 --- a/gnu/packages/netpbm.scm +++ b/gnu/packages/netpbm.scm @@ -35,93 +35,93 @@ (define-public netpbm (package - (name "netpbm") - (version "10.61.01") - (source (origin - (method url-fetch) - ;; The "super-stable" and "stable" versions do not compile - ;; with newer libpng; we need the "advanced" version. The tarball - ;; on the server is generated by sourceforge from the "advanced" - ;; branch of the subversion repository: - ;; svn checkout http://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced netpbm-version - (uri (string-append "http://www.multiprecision.org/guix/netpbm-" - version ".tar.xz")) - (sha256 (base32 - "10nwvxc85kr6vhlhhahagy7s9848bbixl54b0p4ppim4g0dl10jz")))) - (build-system gnu-build-system) - (inputs `(("ghostscript" ,ghostscript) - ("libjpeg" ,libjpeg) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("libxml2" ,libxml2) - ("zlib" ,zlib))) - (native-inputs + (name "netpbm") + (version "10.61.01") + (source (origin + (method url-fetch) + ;; The "super-stable" and "stable" versions do not compile + ;; with newer libpng; we need the "advanced" version. The tarball + ;; on the server is generated by sourceforge from the "advanced" + ;; branch of the subversion repository: + ;; svn checkout http://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced netpbm-version + (uri (string-append "http://www.multiprecision.org/guix/netpbm-" + version ".tar.xz")) + (sha256 (base32 + "10nwvxc85kr6vhlhhahagy7s9848bbixl54b0p4ppim4g0dl10jz")))) + (build-system gnu-build-system) + (inputs `(("ghostscript" ,ghostscript) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("libtiff" ,libtiff) + ("libxml2" ,libxml2) + ("zlib" ,zlib))) + (native-inputs `(("flex" ,flex) ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) - (arguments - `(#:phases - (alist-replace - 'configure - (lambda* (#:key #:allow-other-keys #:rest args) - (copy-file "config.mk.in" "config.mk") - (let ((f (open-file "config.mk" "a"))) - (display "CC=gcc\n" f) - (display "CFLAGS_SHLIB += -fPIC\n" f) - (display "TIFFLIB = libtiff.so\n" f) - (display "JPEGLIB = libjpeg.so\n" f) - (display "ZLIB = libz.so\n" f) - (close-port f) - ;; drop advertisement for non-free program - (substitute* "converter/ppm/Makefile" (("hpcdtoppm") "")) - ;; drop programs without license, see - ;; http://packages.debian.org/changelogs/pool/main/n/netpbm-free/netpbm-free_10.0-12.2/libnetpbm10.copyright - (substitute* "converter/pbm/Makefile" (("pbmto4425") "")) - (substitute* "converter/pbm/Makefile" (("pbmtoln03") "")) - (substitute* "converter/pbm/Makefile" (("pbmtolps") "")) - (substitute* "converter/pbm/Makefile" (("pbmtopk") "")) - (substitute* "converter/pbm/Makefile" (("pktopbm") "")) - (substitute* "converter/pgm/Makefile" (("spottopgm") "")) - (substitute* "converter/ppm/Makefile" (("ppmtopjxl") "")) - )) - (alist-replace - 'check - (lambda* (#:key #:allow-other-keys #:rest args) - (let ((check (assoc-ref %standard-phases 'check))) - ;; install temporarily into /tmp/netpbm - (system* "make" "package") - ;; remove test requiring X - (substitute* "test/all-in-place.test" (("pamx") "")) - ;; do not worry about non-existing file - (substitute* "test/all-in-place.test" (("^rm ") "rm -f ")) - ;; remove four tests that fail for unknown reasons - (substitute* "test/Test-Order" (("all-in-place.test") "")) - (substitute* "test/Test-Order" (("pnmpsnr.test") "")) - (substitute* "test/Test-Order" (("pnmremap1.test") "")) - (substitute* "test/Test-Order" (("gif-roundtrip.test") "")) - (apply check args))) - (alist-replace - 'install - (lambda* (#:key outputs make-flags #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (apply system* "make" "package" - (string-append "pkgdir=" out) make-flags) - ;; copy static library - (copy-file (string-append out "/link/libnetpbm.a") - (string-append out "/lib/libnetpbm.a")) - ;; remove superfluous folders and files - (system* "rm" "-r" (string-append out "/link")) - (system* "rm" "-r" (string-append out "/misc")) - (with-directory-excursion out - (for-each delete-file - '("config_template" "pkginfo" "README" "VERSION"))))) - %standard-phases))))) - (synopsis "Netpbm, a toolkit for manipulation of images") - (description - "Netpbm is a toolkit for the manipulation of graphic images, including + (arguments + `(#:phases + (alist-replace + 'configure + (lambda* (#:key #:allow-other-keys #:rest args) + (copy-file "config.mk.in" "config.mk") + (let ((f (open-file "config.mk" "a"))) + (display "CC=gcc\n" f) + (display "CFLAGS_SHLIB += -fPIC\n" f) + (display "TIFFLIB = libtiff.so\n" f) + (display "JPEGLIB = libjpeg.so\n" f) + (display "ZLIB = libz.so\n" f) + (close-port f) + ;; drop advertisement for non-free program + (substitute* "converter/ppm/Makefile" (("hpcdtoppm") "")) + ;; drop programs without license, see + ;; http://packages.debian.org/changelogs/pool/main/n/netpbm-free/netpbm-free_10.0-12.2/libnetpbm10.copyright + (substitute* "converter/pbm/Makefile" (("pbmto4425") "")) + (substitute* "converter/pbm/Makefile" (("pbmtoln03") "")) + (substitute* "converter/pbm/Makefile" (("pbmtolps") "")) + (substitute* "converter/pbm/Makefile" (("pbmtopk") "")) + (substitute* "converter/pbm/Makefile" (("pktopbm") "")) + (substitute* "converter/pgm/Makefile" (("spottopgm") "")) + (substitute* "converter/ppm/Makefile" (("ppmtopjxl") "")))) + (alist-replace + 'check + (lambda* (#:key #:allow-other-keys #:rest args) + (let ((check (assoc-ref %standard-phases 'check))) + ;; install temporarily into /tmp/netpbm + (system* "make" "package") + ;; remove test requiring X + (substitute* "test/all-in-place.test" (("pamx") "")) + ;; do not worry about non-existing file + (substitute* "test/all-in-place.test" (("^rm ") "rm -f ")) + ;; remove four tests that fail for unknown reasons + (substitute* "test/Test-Order" (("all-in-place.test") "")) + (substitute* "test/Test-Order" (("pnmpsnr.test") "")) + (substitute* "test/Test-Order" (("pnmremap1.test") "")) + (substitute* "test/Test-Order" (("gif-roundtrip.test") "")) + (apply check args))) + (alist-replace + 'install + (lambda* (#:key outputs make-flags #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (apply system* "make" "package" + (string-append "pkgdir=" out) + make-flags) + ;; copy static library + (copy-file (string-append out "/link/libnetpbm.a") + (string-append out "/lib/libnetpbm.a")) + ;; remove superfluous folders and files + (system* "rm" "-r" (string-append out "/link")) + (system* "rm" "-r" (string-append out "/misc")) + (with-directory-excursion out + (for-each delete-file + '("config_template" "pkginfo" "README" "VERSION"))))) + %standard-phases))))) + (synopsis "Netpbm, a toolkit for manipulation of images") + (description + "Netpbm is a toolkit for the manipulation of graphic images, including the conversion of images between a variety of different formats. There are over 300 separate tools in the package including converters for about 100 graphics formats.") - (license gpl2) - (home-page "http://netpbm.sourceforge.net/"))) + (license gpl2) + (home-page "http://netpbm.sourceforge.net/"))) -- 1.8.4