- up to 26.3

[packages/emacs.git] / imagemagick7.patch

diff --git a/imagemagick7.patch b/imagemagick7.patch
index 199219b4d15ff2dbe325114192420a1241dd5522..1fbaf221a8b3331d210be1a5a488987a024b4b5f 100644 (file)
--- a/imagemagick7.patch
+++ b/imagemagick7.patch
@@ -1,14 +1,14 @@
 --- emacs-25.1/configure.ac~   2016-07-25 09:08:36.000000000 +0200
 +++ emacs-25.1/configure.ac    2016-12-25 13:00:06.594562908 +0100
-@@ -2413,7 +2413,7 @@
-   if test "${with_imagemagick}" != "no"; then
+@@ -2524,7 +2524,7 @@ if test "${HAVE_X11}" = "yes" || test "$
      ## 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"
-+    IMAGEMAGICK_MODULE="MagickWand >= 6.3.5 MagickWand != 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"
++    IMAGEMAGICK_MODULE="MagicWand >= 6.3.5 Wand != 6.8.2"
      EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
-     AC_SUBST(IMAGEMAGICK_CFLAGS)
-     AC_SUBST(IMAGEMAGICK_LIBS)
+ 
+     if test $HAVE_IMAGEMAGICK = yes; then
 --- emacs-24.3/src/image.c~    2016-12-25 12:47:48.000000000 +0100
 +++ emacs-24.3/src/image.c     2016-12-25 12:52:35.931084598 +0100
 @@ -7618,14 +7618,14 @@