gnu: netpbm: Switch to svn checkout.

* gnu/packages/netpbm.scm (netpbm): Use svn-fetch for the source instead
    of a separately hosted tarball.
This commit is contained in:
Andreas Enge 2015-01-23 23:27:20 +01:00
parent e066928977
commit 7d8379a767
1 changed files with 18 additions and 13 deletions

View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -26,26 +26,30 @@
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:select (gpl2)) #:use-module ((guix licenses) #:select (gpl2))
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix svn-download))
#:use-module (guix build-system gnu))
(define-public netpbm (define-public netpbm
(package (package
(name "netpbm") (name "netpbm")
(version "10.61.01") (version "10.61.01")
(source (origin (source (origin
(method url-fetch) (method svn-fetch)
;; The "super-stable" and "stable" versions do not compile ;; At the time of first packaging, the "super-stable" and
;; with newer libpng; we need the "advanced" version. The tarball ;; "stable" versions did not compile with newer libpng;
;; on the server is generated by sourceforge from the "advanced" ;; we needed the "advanced" version.
;; branch of the subversion repository: ;; The currently highest stable version is 10.47.53,
;; svn checkout http://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced netpbm-version ;; the currently highest advanced version is 10.69.4,
(uri (string-append "http://www.multiprecision.org/guix/netpbm-" ;; svn release 2397.
version ".tar.xz")) ;; To determine the correct release: "svn log version.mk".
(sha256 (base32 (uri (svn-reference
"10nwvxc85kr6vhlhhahagy7s9848bbixl54b0p4ppim4g0dl10jz")))) (url "http://svn.code.sf.net/p/netpbm/code/advanced")
(revision 1832)))
(sha256
(base32
"1mj1pqq18yj0yb6l24zfjls7axhqmiv0pvcaabl5xvc4a0dm543j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("ghostscript" ,ghostscript) (inputs `(("ghostscript" ,ghostscript)
("libjpeg" ,libjpeg) ("libjpeg" ,libjpeg)
@ -64,6 +68,7 @@
'configure 'configure
(lambda _ (lambda _
(copy-file "config.mk.in" "config.mk") (copy-file "config.mk.in" "config.mk")
(chmod "config.mk" #o664)
(let ((f (open-file "config.mk" "a"))) (let ((f (open-file "config.mk" "a")))
(display "CC=gcc\n" f) (display "CC=gcc\n" f)
(display "CFLAGS_SHLIB += -fPIC\n" f) (display "CFLAGS_SHLIB += -fPIC\n" f)