mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-20 12:58:08 +01:00
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
Description: Restore support for ImageMagick v6, as v7 not in Debian.
|
|
Origin: https://repo.or.cz/wmaker-crm.git/commitdiff/1dace56 (reversed)
|
|
Bug-Debian: https://bugs.debian.org/929825
|
|
Last-Update: 2020-04-05
|
|
|
|
--- a/m4/wm_imgfmt_check.m4
|
|
+++ b/m4/wm_imgfmt_check.m4
|
|
@@ -312,7 +312,7 @@
|
|
dnl
|
|
dnl The library was found, check if header is available and compiles
|
|
wm_save_CFLAGS="$CFLAGS"
|
|
- AS_IF([wm_fn_lib_try_compile "MagickWand/MagickWand.h" "MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"],
|
|
+ AS_IF([wm_fn_lib_try_compile "wand/magick_wand.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
|
|
--- a/wrlib/load_magick.c
|
|
+++ b/wrlib/load_magick.c
|
|
@@ -22,7 +22,7 @@
|
|
|
|
#include "config.h"
|
|
|
|
-#include <MagickWand/MagickWand.h>
|
|
+#include <wand/MagickWand.h>
|
|
|
|
#include "wraster.h"
|
|
#include "imgformat.h"
|