me
/
guix
Archived
1
0
Fork 0
Code

gnu: gd: Update to 2.3.2. 

* gnu/packages/gd.scm (gd): Update to 2.3.2.
[arguments]: Adjust comment on custom 'disable-failing-test phase.
master
Efraim Flashner 2021-03-15 11:22:37 +02:00
parent 001fc29b43
commit 0ca7e19093
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/gd.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
@ -42,7 +42,7 @@
;; Note: With libgd.org now pointing to github.com, genuine old ;; Note: With libgd.org now pointing to github.com, genuine old
;; tarballs are no longer available. Notably, versions 2.0.x are ;; tarballs are no longer available. Notably, versions 2.0.x are
;; missing. ;; missing.
(version "2.3.0") (version "2.3.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -50,7 +50,7 @@
version "/libgd-" version ".tar.xz")) version "/libgd-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0n5czhxzinvjvmhkf5l9fwjdx5ip69k5k7pj6zwb6zs1k9dibngc")) "1yypywkh8vphcy4qqpf51kxpb0a3r7rjqk3fc61rpn70hiq092j7"))
(patches (search-patches "gd-fix-tests-on-i686.patch" (patches (search-patches "gd-fix-tests-on-i686.patch"
"gd-brect-bounds.patch")))) "gd-brect-bounds.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -61,15 +61,14 @@
#:configure-flags '("--disable-static") #:configure-flags '("--disable-static")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; This test is known to fail on i686-linux: ;; This test is known to fail on most architectures:
;; https://github.com/libgd/libgd/issues/359 ;; https://github.com/libgd/libgd/issues/359
;; TODO Replace this substitution with an upstream bug fix. ;; TODO Replace this substitution with an upstream bug fix.
(add-after 'unpack 'disable-failing-test (add-after 'unpack 'disable-failing-test
(lambda _ (lambda _
(substitute* "tests/gdimagegrayscale/basic.c" (substitute* "tests/gdimagegrayscale/basic.c"
(("return gdNumFailures\\(\\)") (("return gdNumFailures\\(\\)")
"return 0")) "return 0")))))))
#t)))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs