From patchwork Thu Jul 20 18:41:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 51870 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0723727BBE2; Thu, 20 Jul 2023 19:45:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7CA0327BBEA for ; Thu, 20 Jul 2023 19:45:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qMYeJ-0002Ap-LC; Thu, 20 Jul 2023 14:45:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qMYe6-0002A8-IJ for guix-patches@gnu.org; Thu, 20 Jul 2023 14:45:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qMYe6-0003DH-93 for guix-patches@gnu.org; Thu, 20 Jul 2023 14:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qMYe6-0002eS-4z for guix-patches@gnu.org; Thu, 20 Jul 2023 14:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64751] [PATCH core-updates 4/4] gnu: imagemagick/stable: Sync with imagemagick Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Jul 2023 18:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64751 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64751@debbugs.gnu.org Cc: Saku Laesvuori Received: via spool by 64751-submit@debbugs.gnu.org id=B64751.16898786569999 (code B ref 64751); Thu, 20 Jul 2023 18:45:02 +0000 Received: (at 64751) by debbugs.gnu.org; 20 Jul 2023 18:44:16 +0000 Received: from localhost ([127.0.0.1]:59885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMYdL-0002bD-Vu for submit@debbugs.gnu.org; Thu, 20 Jul 2023 14:44:16 -0400 Received: from vmi571514.contaboserver.net ([75.119.130.101]:54014 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMYdK-0002ay-Fo for 64751@debbugs.gnu.org; Thu, 20 Jul 2023 14:44:14 -0400 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id A61E434012E; Thu, 20 Jul 2023 20:44:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1689878655; bh=3/80cM1dFHNtMo8Et1haJ6aMqmeydJwHK9cwRfXe+U4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YrXed7HJewsdzVTS8ANyDNxKF76sHvzdKJYd9s4hlN0IfxHJJl8Sztt0hWKPgXAIw jMRaPQvFhiPANxJnlcRusrM6EjyMVNvf93Ce5lc2Q+a4j69LAJ282TvFX+gDZqjLHp dTnEa0OacuqjrCkT6wrPfot+vnRBjJMTkfG4Fcis= Date: Thu, 20 Jul 2023 21:41:27 +0300 Message-ID: <20230720184404.14172-2-saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230720184404.14172-1-saku@laesvuori.fi> References: <20230720184404.14172-1-saku@laesvuori.fi> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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