x11-wm/windowmaker/files/windowmaker-0.95.8-imagemagick7.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35

imagemagick 7.0 now uses MagickWand/
---
 m4/wm_imgfmt_check.m4 | 2 +-
 wrlib/load_magick.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
index 5dd9ec7f..14e52bb3 100644
--- a/m4/wm_imgfmt_check.m4
+++ b/m4/wm_imgfmt_check.m4
@@ -312,7 +312,7 @@ AS_IF([test "x$enable_magick" = "xno"],
               dnl
               dnl The library was found, check if header is available and compiles
               wm_save_CFLAGS="$CFLAGS"
-              AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"],
+              AS_IF([wm_fn_lib_try_compile "MagickWand/MagickWand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"],
                   [wm_cv_libchk_magick="$wm_cv_libchk_magick_cflags % $wm_cv_libchk_magick_libs"],
                   [AC_MSG_ERROR([found MagickWand library but could not compile its header])])
               CFLAGS="$wm_save_CFLAGS"])dnl
diff --git a/wrlib/load_magick.c b/wrlib/load_magick.c
index 3e809ba2..1edbebc3 100644
--- a/wrlib/load_magick.c
+++ b/wrlib/load_magick.c
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include <wand/MagickWand.h>
+#include <MagickWand/MagickWand.h>
 
 #include "wraster.h"
 #include "imgformat.h"
-- 
2.13.0