diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-02-18 20:32:08 -0500 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:44:57 +0200 |
| commit | 6d7f9294dd62ef428d7ce79ef299b536fab0da30 (patch) | |
| tree | ceda84d35377b04f9b73b75db4ff55663d4cceda /gnu/packages/gd.scm | |
| parent | 048750fa614dc4ecd32552a362bbef2912539dc8 (diff) | |
| download | guix-6d7f9294dd62ef428d7ce79ef299b536fab0da30.tar guix-6d7f9294dd62ef428d7ce79ef299b536fab0da30.tar.gz | |
gnu: gd: Update to 2.3.3.
* gnu/packages/gd.scm (gd): Update to 2.3.3.
[source]: Remove obsolete gd-Revert-fix-303-gdlib.pc.patch patch.
[arguments] Use gexps.
<phases>: Remove disable-failing-test phase. Add remove-libtool-archives
phase.
* gnu/packages/patches/gd-Revert-fix-303-gdlib.pc.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
Change-Id: I8cddf29d123ca0b66cc0540666c875039e753482
Diffstat (limited to 'gnu/packages/gd.scm')
| -rw-r--r-- | gnu/packages/gd.scm | 57 |
1 files changed, 28 insertions, 29 deletions
diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 149b82468c..21ad1579ec 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,38 +44,36 @@ ;; Note: With libgd.org now pointing to github.com, genuine old ;; tarballs are no longer available. Notably, versions 2.0.x are ;; missing. - (version "2.3.2") + (version "2.3.3") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/libgd/libgd/releases/download/gd-" - version "/libgd-" version ".tar.xz")) - (sha256 - (base32 - "1yypywkh8vphcy4qqpf51kxpb0a3r7rjqk3fc61rpn70hiq092j7")) - (patches - (search-patches "gd-fix-tests-on-i686.patch" - "gd-brect-bounds.patch" - ;; Drop when - ;; https://github.com/libgd/libgd/issues/691 - ;; is solved. - "gd-Revert-fix-303-gdlib.pc.patch")))) + (method url-fetch) + (uri (string-append + "https://github.com/libgd/libgd/releases/download/gd-" + version "/libgd-" version ".tar.xz")) + (sha256 + (base32 + "0qas3q9xz3wgw06dm2fj0i189rain6n60z1vyq50d5h7wbn25s1z")) + (patches + (search-patches "gd-fix-tests-on-i686.patch" + "gd-brect-bounds.patch")))) (build-system gnu-build-system) (arguments - ;; As recommended by github.com/libgd/libgd/issues/278 to fix rounding - ;; issues on aarch64 and other architectures. - `(#:make-flags '("CFLAGS=-ffp-contract=off") - #:configure-flags '("--disable-static") - #:phases - (modify-phases %standard-phases - ;; This test is known to fail on most architectures: - ;; https://github.com/libgd/libgd/issues/359 - ;; TODO Replace this substitution with an upstream bug fix. - (add-after 'unpack 'disable-failing-test - (lambda _ - (substitute* "tests/gdimagegrayscale/basic.c" - (("return gdNumFailures\\(\\)") - "return 0"))))))) + ;; As recommended by github.com/libgd/libgd/issues/278 to fix rounding + ;; issues on aarch64 and other architectures. + (list #:make-flags #~(list "CFLAGS=-ffp-contract=off") + #:configure-flags #~(list "--disable-static") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'remove-libtool-archives + ;; Libtool archives lists the whole transitive dependencies, + ;; which is unnecessary unless producing static archives and + ;; leads to overlinking, e.g. causing the configure script of + ;; texlive-bin to fail due to looking for a transitive jpeg + ;; library. + (lambda _ + (for-each delete-file + (find-files (string-append #$output "/lib") + "\\.la$"))))))) (native-inputs (list pkg-config)) (inputs |