gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-25 16:02:33 +01:00
Code Issues Projects Releases Wiki Activity

Drop support for Imagemagick version < 7

Browse Source 
Had to do a few modifications to get WM to build with Imagemagick 7.

Attached is the diff from the latest git checkout.

Cheers,
Stig
This commit is contained in:
Stig-Ørjan Smelror
2019-02-12 17:43:18 +01:00
committed by Carlos R. Mafra
parent 5a95631091
commit 1dace5699f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
m4/wm_imgfmt_check.m4
View File

@@ -312,7 +312,7 @@ AS_IF([test "x$enable_magick" = "xno"],
dnl dnl
dnl The library was found, check if header is available and compiles dnl The library was found, check if header is available and compiles
wm_save_CFLAGS="$CFLAGS" 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"], [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])]) [AC_MSG_ERROR([found MagickWand library but could not compile its header])])
CFLAGS="$wm_save_CFLAGS"])dnl CFLAGS="$wm_save_CFLAGS"])dnl

2
wrlib/load_magick.c
View File

@@ -22,7 +22,7 @@
#include "config.h" #include "config.h"
#include <wand/MagickWand.h> #include <MagickWand/MagickWand.h>
#include "wraster.h" #include "wraster.h"
#include "imgformat.h" #include "imgformat.h"