[Emacs-diffs] emacs-24 r117056: Require ImageMagick >= 6.3.5, due to PixelSetMagickColor.

[Paul Eggert]

------------------------------------------------------------
revno: 117056
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17339
committer: Paul Eggert <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-05-03 14:06:04 -0700
message:
  Require ImageMagick >= 6.3.5, due to PixelSetMagickColor.
  
  * configure.ac (IMAGEMAGICK_MODULE): Bump prereq from 6.2.8 to 6.3.5.
  A more-complicated fix would be to remove uses of PixelSetMagickColor,
  introduced in ImageMagick 6.3.5 (Sept. 2007).
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-05-02 19:34:03 +0000
+++ b/ChangeLog 2014-05-03 21:06:04 +0000
@@ -1,3 +1,10 @@
+2014-05-03  Paul Eggert  <address@hidden>
+
+       Require ImageMagick >= 6.3.5, due to PixelSetMagickColor (Bug#17339).
+       * configure.ac (IMAGEMAGICK_MODULE): Bump prereq from 6.2.8 to 6.3.5.
+       A more-complicated fix would be to remove uses of PixelSetMagickColor,
+       introduced in ImageMagick 6.3.5 (Sept. 2007).
+
 2014-05-02  Paul Eggert  <address@hidden>
 
        Consult libpng-config more consistently (Bug#17339).

=== modified file 'configure.ac'
--- a/configure.ac      2014-05-02 19:34:03 +0000
+++ b/configure.ac      2014-05-03 21:06:04 +0000
@@ -2225,11 +2225,9 @@
 HAVE_IMAGEMAGICK=no
 if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test 
"${HAVE_W32}" = "yes"; then
   if test "${with_imagemagick}" != "no"; then
-    ## 6.2.8 is the earliest version known to work, but earlier versions
-    ## might work - let us know if you find one.
-    ## 6.0.7 does not work.  See bug#7955.
+    ## 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.2.8 Wand != 6.8.2"
+    IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2"
     PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, 
:)
     AC_SUBST(IMAGEMAGICK_CFLAGS)
     AC_SUBST(IMAGEMAGICK_LIBS)