all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Saku Laesvuori via Guix-patches via <guix-patches@gnu.org>
To: 64751@debbugs.gnu.org
Cc: Saku Laesvuori <saku@laesvuori.fi>
Subject: [bug#64751] [PATCH core-updates 4/4] gnu: imagemagick/stable: Sync with imagemagick
Date: Thu, 20 Jul 2023 21:41:27 +0300	[thread overview]
Message-ID: <20230720184404.14172-2-saku@laesvuori.fi> (raw)
In-Reply-To: <20230720184404.14172-1-saku@laesvuori.fi>

* 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





  reply	other threads:[~2023-07-20 18:45 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-20 18:37 [bug#64751] [PATCH core-updates 1/4] gnu: imagemagick: Update to 6.9.12-91 Saku Laesvuori via Guix-patches via
2023-07-20 18:40 ` [bug#64751] [PATCH core-updates 2/4] gnu: imagemagick: Fix converting webp images Saku Laesvuori via Guix-patches via
2023-07-20 18:40   ` bug#48018: " Saku Laesvuori via Bug reports for GNU Guix
2023-07-20 18:41 ` [bug#64751] [PATCH core-updates 3/4] gnu: imagemagick: Update package style Saku Laesvuori via Guix-patches via
2023-07-20 18:41   ` Saku Laesvuori via Guix-patches via [this message]
2024-01-21 23:05 ` bug#64751: [PATCH core-updates 1/4] gnu: imagemagick: Update to 6.9.12-91 Maxim Cournoyer
  -- strict thread matches above, loose matches on Subject: below --
2021-04-25 13:38 bug#48018: ImageMagick’s ‘convert’ fails to delegate to ‘dwebp’ Ludovic Courtès
2023-11-06 11:07 ` bug#48018: reviewed, checked and re-based the previous commit Wicki Gabriel (wicg)
2024-01-03 22:20   ` Maxim Cournoyer
2024-01-04 13:13     ` bug#48018: ImageMagick’s ‘convert’ fails to delegate to ‘dwebp’ Simon South
2024-01-04 17:51       ` Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230720184404.14172-2-saku@laesvuori.fi \
    --to=guix-patches@gnu.org \
    --cc=64751@debbugs.gnu.org \
    --cc=saku@laesvuori.fi \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.