[PATCH 0/2] ImageMagick 7

[PATCH 0/2] ImageMagick 7

[Leo Famulari]

I'd like to use these patches to create an imagemagick-updates branch
where we can test the update to the API-incompatible ImageMagick 7
series.

This is some information about the differences between the 6 and 7 APIs
here:
https://www.imagemagick.org/script/porting.php

Any packages that aren't ready for the 7-series API can be changed to
use the 'imagemagick-6' package instead of the 'imagemagick' packages.

John Darrington (1):
  gnu: Update imagemagick to version 7.0.4-3.

Leo Famulari (1):
  gnu: Add imagemagick-6.

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

-- 
2.11.0

[PATCH 1/2] gnu: Update imagemagick to version 7.0.4-3.

[Leo Famulari]

From: John Darrington <jmd@gnu.org>

* gnu/packages/imagemagick.scm: Update to version 7.0.4-3
---
 gnu/packages/imagemagick.scm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index d654c3be2..d191ea76b 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -43,17 +43,14 @@
 (define-public imagemagick
   (package
     (name "imagemagick")
-    ;; 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.7-3")
+    (version "7.0.4-3")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://imagemagick/ImageMagick-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "18cibh5rmxddwpsrpzjd4sbim80g5w36zhl8bw582nw39cs6f5w0"))))
+               "1i4z8lw2i4vk9gg5av50k2maf2nx6rzdm7l8jg0c5lc2788fl2dw"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch")
-- 
2.11.0

[PATCH 2/2] gnu: Add imagemagick-6.

[Leo Famulari]

* gnu/packages/imagemagick.scm (imagemagick-6): New variable.
---
 gnu/packages/imagemagick.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm
index d191ea76b..9fe999887 100644
--- a/gnu/packages/imagemagick.scm
+++ b/gnu/packages/imagemagick.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -113,6 +113,20 @@ 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"))))
 
+;;; The ImageMagick 6 series is still maintained, in parallel with 7. We keep it
+;;; around for packages that have not adapted to the 7-series API. See
+;;; <https://www.imagemagick.org/script/porting.php> for more information.
+(define-public imagemagick-6
+  (package (inherit imagemagick)
+    (version "6.9.7-3")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://imagemagick/ImageMagick-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "18cibh5rmxddwpsrpzjd4sbim80g5w36zhl8bw582nw39cs6f5w0"))))))
+
 (define-public perl-image-magick
   (package
     (name "perl-image-magick")
-- 
2.11.0

Re: [PATCH 0/2] ImageMagick 7

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> I'd like to use these patches to create an imagemagick-updates branch
> where we can test the update to the API-incompatible ImageMagick 7
> series.
>
> This is some information about the differences between the 6 and 7 APIs
> here:
> https://www.imagemagick.org/script/porting.php
>
> Any packages that aren't ready for the 7-series API can be changed to
> use the 'imagemagick-6' package instead of the 'imagemagick' packages.
>
> John Darrington (1):
>   gnu: Update imagemagick to version 7.0.4-3.
>
> Leo Famulari (1):
>   gnu: Add imagemagick-6.

A new branch and jobset with these two patches is a good idea (there are
only 110 dependents, which is reasonable for hydra.)

Thanks for taking care of that!

Ludo’.

Re: [PATCH 0/2] ImageMagick 7

[Leo Famulari]

On Tue, Jan 10, 2017 at 12:03:22AM +0100, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
> > John Darrington (1):
> >   gnu: Update imagemagick to version 7.0.4-3.
> >
> > Leo Famulari (1):
> >   gnu: Add imagemagick-6.
> 
> A new branch and jobset with these two patches is a good idea (there are
> only 110 dependents, which is reasonable for hydra.)

I've just started the evaluation:

https://hydra.gnu.org/jobset/gnu/imagemagick-updates

Re: [PATCH 0/2] ImageMagick 7

[Leo Famulari]

Hydra finished evaluating the imagemagick-updates branch on
x86_64-linux:

https://hydra.gnu.org/eval/109433?full=1&compare=master#tabs-now-fail

It's a surprisingly small number of failures! But, I wonder how many
packages that use ImageMagick use the "command-line API" and actually
test it.

So, I think we should carefully check each package that uses ImageMagick
directly to see if they are ready. We can check their commit logs and
bug trackers for anything related to ImageMagick.

It's a short list, and I'll start looking into a2ps and awesome:

$ guix package -s . | recsel -e "dependencies ~ 'imagemagick'" -p name,location
name: a2ps
location: gnu/packages/pretty-print.scm:40:2

name: awesome
location: gnu/packages/wm.scm:498:2

name: dblatex
location: gnu/packages/docbook.scm:174:2

name: discrover
location: gnu/packages/bioinformatics.scm:2045:2

name: emacs-w3m
location: gnu/packages/emacs.scm:746:2

name: enblend-enfuse
location: gnu/packages/photo.scm:222:2

name: fbida
location: gnu/packages/pdf.scm:698:2

name: lilypond
location: gnu/packages/music.scm:584:2

name: perl-image-magick
location: gnu/packages/imagemagick.scm:120:2

name: python-matplotlib
location: gnu/packages/python.scm:3605:2

name: python2-matplotlib
location: gnu/packages/python.scm:3736:4

name: skribilo
location: gnu/packages/skribilo.scm:32:2

name: synfig
location: gnu/packages/animation.scm:60:2

Re: [PATCH 0/2] ImageMagick 7

[Leo Famulari]

On Wed, Jan 11, 2017 at 03:18:38PM -0500, Leo Famulari wrote:
> So, I think we should carefully check each package that uses ImageMagick
> directly to see if they are ready. We can check their commit logs and
> bug trackers for anything related to ImageMagick.

> name: a2ps

a2ps uses the `convert` program from ImageMagick, and its use pre-dates
ImageMagick 7.

> name: awesome

Awesome also uses `convert`, and this code is from 2009.

So, they need to stay with ImageMagick 6 for now.

Re: [PATCH 0/2] ImageMagick 7

[John Darrington]

[-- Attachment #1: Type: text/plain, Size: 1073 bytes --]

On Thu, Jan 12, 2017 at 05:11:03PM -0500, Leo Famulari wrote:
     On Wed, Jan 11, 2017 at 03:18:38PM -0500, Leo Famulari wrote:
     > So, I think we should carefully check each package that uses ImageMagick
     > directly to see if they are ready. We can check their commit logs and
     > bug trackers for anything related to ImageMagick.
     
     > name: a2ps
     
     a2ps uses the `convert` program from ImageMagick, and its use pre-dates
     ImageMagick 7.
     
     > name: awesome
     
     Awesome also uses `convert`, and this code is from 2009.
     
     So, they need to stay with ImageMagick 6 for now.

So far as I'm aware, the "convert" program's interface has not changed between 6 and 7
so unless we know of a particular problem, I don't see why they could not move to vers
7 immediately.

J'

-- 
Avoid eavesdropping.  Send strong encrypted email.
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [PATCH 0/2] ImageMagick 7

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]

On Fri, Jan 13, 2017 at 06:13:41AM +0100, John Darrington wrote:
> On Thu, Jan 12, 2017 at 05:11:03PM -0500, Leo Famulari wrote:
>      On Wed, Jan 11, 2017 at 03:18:38PM -0500, Leo Famulari wrote:
>      > So, I think we should carefully check each package that uses ImageMagick
>      > directly to see if they are ready. We can check their commit logs and
>      > bug trackers for anything related to ImageMagick.
>      
>      > name: a2ps
>      
>      a2ps uses the `convert` program from ImageMagick, and its use pre-dates
>      ImageMagick 7.
>      
>      > name: awesome
>      
>      Awesome also uses `convert`, and this code is from 2009.
>      
>      So, they need to stay with ImageMagick 6 for now.
> 
> So far as I'm aware, the "convert" program's interface has not changed between 6 and 7
> so unless we know of a particular problem, I don't see why they could not move to vers
> 7 immediately.

The version 7 porting guide lists the changed and removed options of the
`convert` program:

https://www.imagemagick.org/script/porting.php#cli

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 0/2] ImageMagick 7

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]

On Wed, Jan 11, 2017 at 03:18:38PM -0500, Leo Famulari wrote:
> Hydra finished evaluating the imagemagick-updates branch on
> x86_64-linux:
> 
> https://hydra.gnu.org/eval/109433?full=1&compare=master#tabs-now-fail
> 
> It's a surprisingly small number of failures! But, I wonder how many
> packages that use ImageMagick use the "command-line API" and actually
> test it.
> 
> So, I think we should carefully check each package that uses ImageMagick
> directly to see if they are ready. We can check their commit logs and
> bug trackers for anything related to ImageMagick.
> 
> It's a short list, and I'll start looking into a2ps and awesome:

Hydra is chronically low on disk space. We don't have the resources to
keep the historical substitutes for the imagemagick-updates branch's
jobset [0], which hasn't seen any activity in a couple months.

I'll delete the jobset in the next day or so unless there is more work
on this task.

Since the upstream maintainers will support ImageMagick 6 for at least
~9 more years, I think it's fine to stick with 6 while other distros
with more volunteer-power evaluate which packages are able to use the
new API.

[0]
https://hydra.gnu.org/jobset/gnu/imagemagick-updates

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]