guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

15/18: gnu: libtiff: Absorb grafted replacement.


From: guix-commits
Subject: 15/18: gnu: libtiff: Absorb grafted replacement.
Date: Fri, 12 Mar 2021 15:06:43 -0500 (EST)

lfam pushed a commit to branch wip-next-release
in repository guix.

commit 652b99ae6b3a2f7584f18e30f1e045de5ec1202d
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Fri Mar 12 13:55:41 2021 -0500

    gnu: libtiff: Absorb grafted replacement.
    
    * gnu/packages/image.scm (libtiff): Update to 4.2.0.
    [replacement]: Remove field.
    (libtiff/fixed): Remove variable.
---
 gnu/packages/image.scm | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 4f249b7..3ba9084 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -581,7 +581,7 @@ extracting icontainer icon files.")
 (define-public libtiff
   (package
    (name "libtiff")
-   (version "4.1.0")
+   (version "4.2.0")
    (source
      (origin
        (method url-fetch)
@@ -589,8 +589,7 @@ extracting icontainer icon files.")
                            version ".tar.gz"))
        (sha256
         (base32
-         "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax"))))
-   (replacement libtiff/fixed)
+         "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b"))))
    (build-system gnu-build-system)
    (outputs '("out"
               "doc"))                           ;1.3 MiB of HTML documentation
@@ -613,27 +612,6 @@ collection of tools for doing simple manipulations of TIFF 
images.")
                                   "See COPYRIGHT in the distribution."))
    (home-page "http://www.simplesystems.org/libtiff/";)))
 
-(define-public libtiff/fixed
-  (package
-    (inherit libtiff)
-    (name "libtiff")
-    (version "4.2.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://download.osgeo.org/libtiff/tiff-";
-                           version ".tar.gz"))
-       (sha256
-        (base32
-         "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b"))))
-    (arguments
-     ;; Instead of using --docdir, this package has its own --with-docdir.
-     `(#:configure-flags (list (string-append "--with-docdir="
-                                              (assoc-ref %outputs "doc")
-                                              "/share/doc/"
-                                              ,name "-" ,version)
-                               "--disable-static")))))
-
 (define-public leptonica
   (package
     (name "leptonica")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]