From d60da39dd714e8e94397ff3b6856d8ad436b14e5 Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 13 Sep 2018 00:30:29 +0200 Subject: [PATCH] zbar: rebuild for ImageMagick-7.0.8.11. --- srcpkgs/zbar/patches/imagemagick-7.patch | 11 +++++++++++ srcpkgs/zbar/template | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/zbar/patches/imagemagick-7.patch diff --git a/srcpkgs/zbar/patches/imagemagick-7.patch b/srcpkgs/zbar/patches/imagemagick-7.patch new file mode 100644 index 00000000000..a0d5299b0ba --- /dev/null +++ b/srcpkgs/zbar/patches/imagemagick-7.patch @@ -0,0 +1,11 @@ +--- zbarimg/zbarimg.c.orig 2018-09-13 17:48:15.659285113 +0200 ++++ zbarimg/zbarimg.c 2018-09-13 17:54:59.436644182 +0200 +@@ -38,7 +38,7 @@ + #include + + #include +-#include ++#include + + /* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels. + * (still not sure this check is quite right... diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template index 661af031a24..1e0d517604b 100644 --- a/srcpkgs/zbar/template +++ b/srcpkgs/zbar/template @@ -1,9 +1,9 @@ # Template file for 'zbar' pkgname=zbar version=0.10 -revision=5 +revision=6 build_style=gnu-configure -configure_args="$(vopt_with qt) --with-gtk" +configure_args="ac_cv_header_wand_MagickWand_h=yes $(vopt_with qt) --with-gtk" hostmakedepends="automake pkg-config libtool gettext-devel python $(vopt_if qt 'qt-qmake qt-host-tools') glib-devel" makedepends="libmagick-devel libXv-devel pygtk-devel $(vopt_if qt qt-devel) v4l-utils-devel"