[bug#64751] [PATCH core-updates 4/4] gnu: imagemagick/stable: Sync with imagemagick

[Saku Laesvuori via Guix-patches via <guix-patches@gnu.org>]

* gnu/packages/imagemagick (imagemagick/stable): Apply modifications from
  imagemagick.
  (imagemagick): Remove upstreamed modifications.
---
Upstreamed means "moved to the inherited package" here. I am not sure is
this obvious/good wording as upstreaming normally means sending the
modifications to another project.

 gnu/packages/imagemagick.scm | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index 82ac9f5107..c87ea0d11d 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -65,14 +65,15 @@ (define-public imagemagick/stable
      ;; 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")
+     (version "6.9.12-91")
      (source (origin
                (method url-fetch)
                (uri (string-append "mirror://imagemagick/ImageMagick-" version
                                    ".tar.xz"))
                (sha256
                 (base32
-                 "0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql"))))
+                 "0didbs10i9zb4dgripa851j7fivxb9jar7l3vvxz6i4kn6xvdv7r"))
+               (patches (search-patches "imagemagick-Fix-tests.patch"))))
      (build-system gnu-build-system)
      (arguments
       (list
@@ -80,10 +81,7 @@ (define-public imagemagick/stable
 
                            ;; 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
+       #:tests? #t
        #:phases #~(modify-phases %standard-phases
                     (add-before 'build 'pre-build
                       (lambda* _
@@ -121,6 +119,7 @@ (define-public imagemagick/stable
                    libtiff
                    libpng
                    libjpeg-turbo
+                   libwebp
                    pango
                    freetype
                    bzip2
@@ -141,23 +140,7 @@ (define-public imagemagick/stable
 (define-public imagemagick
   (package
     (inherit imagemagick/stable)
-    (properties (alist-delete 'hidden? (package-properties imagemagick/stable)))
-    ;; 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.12-91")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://imagemagick/ImageMagick-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "0didbs10i9zb4dgripa851j7fivxb9jar7l3vvxz6i4kn6xvdv7r"))
-              (patches (search-patches "imagemagick-Fix-tests.patch"))))
-    (inputs (cons libwebp (package-inputs imagemagick/stable)))
-    (arguments
-     (append (package-arguments imagemagick/stable)
-             '(#:tests? #t)))))
+    (properties (alist-delete 'hidden? (package-properties imagemagick/stable)))))
 
 (define-public perl-image-magick
   (package
-- 
2.41.0