[arch-commits] Commit in zbar/trunk (PKGBUILD imagemagick7.patch)

[Felix Yan]

    Date: Friday, March 23, 2018 @ 14:35:28
  Author: felixonmars
Revision: 311349

upgpkg: zbar 0.20-2

use new libmagick

Added:
  zbar/trunk/imagemagick7.patch
Modified:
  zbar/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   13 ++++++++-----
 imagemagick7.patch |   22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-23 14:35:07 UTC (rev 311348)
+++ PKGBUILD	2018-03-23 14:35:28 UTC (rev 311349)
@@ -7,17 +7,20 @@
 pkgbase=zbar
 pkgname=(zbar zbar-gtk zbar-qt python2-zbar)
 pkgver=0.20
-pkgrel=1
+pkgrel=2
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
 url="https://github.com/procxx/zbar"
 license=('LGPL')
-makedepends=('libmagick6' 'libxv' 'v4l-utils' 'qt5-x11extras' 'pygtk' 'python' 'xmlto' 'docbook-xsl')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/procxx/zbar/archive/$pkgver.tar.gz")
-md5sums=('e7c5edafc35f4c1eee5d9d56e0cfd9de')
+makedepends=('libmagick' 'libxv' 'v4l-utils' 'qt5-x11extras' 'pygtk' 'python' 'xmlto' 'docbook-xsl')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/procxx/zbar/archive/$pkgver.tar.gz"
+        imagemagick7.patch)
+sha512sums=('b013dc5f72f910e8e0dc73de1705684f76e5cb5b2026d48d3e149d3e8b46afdf273d06f32738c588c272218e95b5cd39d3c0b8be4eb9be17553504a13b11c144'
+            '43987414a6432b9e7da329f5a416f389d29bfc3417a6edc65a46b2677ade7dbb8c150df90c8b42464a6cb17c4732509fb8d3672387dafe9fd17a5def78a5ef63')
 
 prepare() {
   cd zbar-$pkgver
+  patch -p1 -i ../imagemagick7.patch
   autoreconf -vfi
 }
 
@@ -31,7 +34,7 @@
 }
 
 package_zbar() {
-  depends=('libmagick6' 'libsm' 'libxv' 'v4l-utils')
+  depends=('libmagick' 'libsm' 'libxv' 'v4l-utils')
 
   cd zbar-$pkgver
   make DESTDIR="$pkgdir" install

Added: imagemagick7.patch
===================================================================
--- imagemagick7.patch	                        (rev 0)
+++ imagemagick7.patch	2018-03-23 14:35:28 UTC (rev 311349)
@@ -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