bug#25967: 25.1; Support for ImageMagick 7

[Paul Eggert <eggert@cs.ucla.edu>]

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

Glenn Morris wrote:
> http://lists.gnu.org/archive/html/emacs-devel/2017-01/msg00180.html
> 
> Maybe it is MS-Windows-specific though, I haven't examined it.

It looks quite MS-Windows-specific, unfortunately.

> In the meantime, configure should explicitly reject versions > 6, to
> avoid confusion.

That's easy enough; I installed the attached.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Do-not-use-ImageMagick-7-and-later.patch --]
[-- Type: text/x-patch; name="0001-Do-not-use-ImageMagick-7-and-later.patch", Size: 1002 bytes --]

From bc78bd0be41a2438a522df9fa3f46b64589403dc Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 24 Jul 2017 15:13:26 -0700
Subject: [PATCH] Do not use ImageMagick 7 and later

Suggested by Glenn Morris (Bug#25967#15).
* configure.ac (IMAGEMAGICK_MODULE): Reject 7 and later.
---
 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 5e6dbda..648da99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2507,7 +2507,8 @@ AC_DEFUN
   if test "${with_imagemagick}" != "no"; then
     ## 6.3.5 is the earliest version known to work; see Bug#17339.
     ## 6.8.2 makes Emacs crash; see Bug#13867.
-    IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2"
+    ## 7 and later have not been ported to; See Bug#25967.
+    IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2 Wand < 7"
     EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
 
     if test $HAVE_IMAGEMAGICK = yes; then
-- 
2.7.4