- fix building with ImageMagick 7

- rel 5

diff --git a/freeciv.spec b/freeciv.spec
index e6d1ed0fdab01268194e775116bc031ebe712eca..c076383ba9478acb49f0938d79c69281d431a486 100644 (file)
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -22,7 +22,7 @@ Summary(pl.UTF-8):    Niekomercyjny klon CIVilization
 Summary(pt_BR.UTF-8):  Clone do jogo Civilization
 Name:          freeciv
 Version:       2.4.4
-Release:       4
+Release:       5
 License:       GPL v2+
 Group:         X11/Applications/Games/Strategy
 Source0:       http://downloads.sourceforge.net/freeciv/%{name}-%{version}.tar.bz2
@@ -32,6 +32,7 @@ Source0:      http://downloads.sourceforge.net/freeciv/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-desktop.patch
 Patch2:                %{name}-ggz.patch
+Patch3:                imagemagick7.patch
 URL:           http://freeciv.wikia.com/
 %{?with_magickwand:BuildRequires:      ImageMagick-devel}
 %{?with_sdl:BuildRequires:     SDL_image-devel}
@@ -184,6 +185,7 @@ Ten pakiet zawiera server gry Freeciv.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 cp -f /usr/share/aclocal/glib-gettext.m4 m4/
 

diff --git a/imagemagick7.patch b/imagemagick7.patch
new file mode 100644 (file)
index 0000000..5f85947
--- /dev/null
+++ b/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- freeciv-2.4.4/m4/magickwand.m4~    2014-12-06 14:25:14.000000000 +0100
++++ freeciv-2.4.4/m4/magickwand.m4     2016-12-18 16:51:51.153456940 +0100
+@@ -68,7 +68,7 @@
+     LIBS="$WAND_LIBS $LIBS"
+ 
+     AC_MSG_CHECKING([for all development tools needed for MagickWand])
+-    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <wand/magick_wand.h>]],
++    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <MagickWand/MagickWand.h>]],
+ [MagickWand *mw = NewMagickWand();])], [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])
+ wand=no
+--- freeciv-2.4.4/common/mapimg.c~     2014-12-06 14:25:02.000000000 +0100
++++ freeciv-2.4.4/common/mapimg.c      2016-12-18 16:53:14.744430711 +0100
+@@ -18,7 +18,7 @@
+ #include <stdarg.h>
+ 
+ #ifdef HAVE_MAPIMG_MAGICKWAND
+-  #include <wand/MagickWand.h>
++  #include <MagickWand/MagickWand.h>
+ #endif /* HAVE_MAPIMG_MAGICKWAND */
+ 
+ /* utility */