[packages/zbar] - fix building with ImageMagick 7 - rel 19

[baggins]

commit 3a8230c3c015da69018263cbf1ddb840fe256b2c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Dec 20 09:23:27 2016 +0100

    - fix building with ImageMagick 7
    - rel 19

 imagemagick7.patch | 22 ++++++++++++++++++++++
 zbar.spec          |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/zbar.spec b/zbar.spec
index ebcc986..00a80c8 100644
--- a/zbar.spec
+++ b/zbar.spec
@@ -8,7 +8,7 @@ Summary:	ZBar Bar Code Reader
 Summary(pl.UTF-8):	ZBar - czytnik kodów paskowych
 Name:		zbar
 Version:	0.10
-Release:	18
+Release:	19
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/zbar/%{name}-%{version}.tar.bz2
@@ -18,6 +18,7 @@ Patch1:		%{name}-link.patch
 Patch2:		%{name}-npapi.patch
 Patch3:		zbar_use_libv4l.patch
 Patch4:		%{name}-ac.patch
+Patch5:		imagemagick7.patch
 URL:		http://zbar.sourceforge.net/
 BuildRequires:	ImageMagick-devel >= 1:6.2.6
 BuildRequires:	QtCore-devel >= 4
@@ -230,6 +231,7 @@ Wtyczka ZBar dla przeglądarek WWW.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}
diff --git a/imagemagick7.patch b/imagemagick7.patch
new file mode 100644
index 0000000..40bd7d7
--- /dev/null
+++ b/imagemagick7.patch
@@ -0,0 +1,22 @@
+--- zbar-0.10/configure.ac~	2016-12-20 09:17:33.000000000 +0100
++++ zbar-0.10/configure.ac	2016-12-20 09:21:38.906665127 +0100
+@@ -333,7 +333,7 @@
+ dnl double check ImageMagick install (bug #2582232)
+       CPPFLAGS_save="$CPPFLAGS"
+       CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS"
+-      AC_CHECK_HEADER([wand/MagickWand.h],
++      AC_CHECK_HEADER([MagickWand/MagickWand.h],
+         [have_IM="yes"],
+         [have_IM="broken"])
+       CPPFLAGS="$CPPFLAGS_save"])])
+--- zbar-0.10/zbarimg/zbarimg.c.orig	2016-12-20 09:18:15.924187996 +0100
++++ zbar-0.10/zbarimg/zbarimg.c	2016-12-20 09:20:27.679129140 +0100
+@@ -44,7 +44,7 @@
+ #endif
+ 
+ #ifdef HAVE_IMAGEMAGICK
+-# include <wand/MagickWand.h>
++# include <MagickWand/MagickWand.h>
+ 
+ /* ImageMagick frequently changes API names - just use the original
+  * (more stable?) names to match GraphicsMagick
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zbar.git/commitdiff/3a8230c3c015da69018263cbf1ddb840fe256b2c