18/18: gnu: ImageMagick: Absorb grafted replacement.

[guix-commits]

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

commit 0374a08f777381d206e66e02c0c0032d3d7b9535
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Fri Mar 12 13:59:07 2021 -0500

    gnu: ImageMagick: Absorb grafted replacement.
    
    * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.12-2.
    [replacement]: Remove field.
    (imagemagick/fixed): Remove variable.
---
 gnu/packages/imagemagick.scm | 59 ++------------------------------------------
 1 file changed, 2 insertions(+), 57 deletions(-)

diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index 8f6eddc..75f5efb 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -50,15 +50,14 @@
     ;; The 7 release series has an incompatible API, while the 6 series is 
still
     ;; maintained. Don't update to 7 until we've made sure that the ImageMagick
     ;; users are ready for the 7-series API.
-    (version "6.9.11-48")
-    (replacement imagemagick/fixed)
+    (version "6.9.12-2")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://imagemagick/ImageMagick-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql"))))
+               "17da5zihz58qm41y61sbvw626m5xfwr2nzszlikrvxyq1j1q7asa"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch"
@@ -127,60 +126,6 @@ transform images, adjust image colors, apply various 
special effects, or draw
 text, lines, polygons, ellipses and Bézier curves.")
     (license (license:fsf-free 
"http://www.imagemagick.org/script/license.php";))))
 
-(define-public imagemagick/fixed
-  (package
-    (inherit imagemagick)
-    (name "imagemagick")
-    (version "6.9.12-2g") ;; 'g' for 'guix', appended character to retain
-    ;; version length so grafting works properly.
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://imagemagick/ImageMagick-"
-                                  "6.9.12-2" ;; Hardcode version here since we
-                                  ;; had to change it up there.
-                                  ".tar.xz"))
-              (sha256
-               (base32
-                "17da5zihz58qm41y61sbvw626m5xfwr2nzszlikrvxyq1j1q7asa"))))
-    (arguments
-     `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch"
-
-                           ;; Do not embed the build date in binaries.
-                           "--enable-reproducible-build")
-
-       ;; FIXME: The test suite succeeded before version 6.9.6-2.
-       ;; Try enabling it again with newer releases.
-       #:tests? #f
-       #:phases (modify-phases %standard-phases
-                  (add-before
-                   'build 'pre-build
-                   (lambda* (#:key outputs #:allow-other-keys)
-                     (substitute* "Makefile"
-                       ;; Clear the `LIBRARY_PATH' setting, which otherwise
-                       ;; interferes with our own use.
-                       (("^LIBRARY_PATH[[:blank:]]*=.*$")
-                        "")
-
-                       ;; Since the Makefile overrides $docdir, modify it to
-                       ;; refer to what we want.
-                       (("^DOCUMENTATION_PATH[[:blank:]]*=.*$")
-                        (let ((doc (assoc-ref outputs "doc")))
-                          (string-append "DOCUMENTATION_PATH = "
-                                         doc "/share/doc/"
-                                         ,name "-" ,version "\n"))))
-                     #t))
-                  (add-before
-                   'configure 'strip-configure-xml
-                   (lambda _
-                     (substitute* "config/configure.xml.in"
-                       ;; Do not record 'configure' arguments in the
-                       ;; configure.xml file that gets installed: That would
-                       ;; include --docdir, and thus retain a reference to the
-                       ;; 'doc' output.
-                       (("@CONFIGURE_ARGS@")
-                        "not recorded"))
-                     #t)))))))
-
 (define-public perl-image-magick
   (package
     (name "perl-image-magick")