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

[Felix Yan]

    Date: Monday, May 27, 2019 @ 03:56:46
  Author: felixonmars
Revision: 470889

upgpkg: zbar 0.23-1

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

--------------------+
 PKGBUILD           |   22 +++++++---------------
 imagemagick7.patch |   22 ----------------------
 2 files changed, 7 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-27 03:56:21 UTC (rev 470888)
+++ PKGBUILD	2019-05-27 03:56:46 UTC (rev 470889)
@@ -5,29 +5,21 @@
 
 pkgbase=zbar
 pkgname=(zbar zbar-gtk zbar-qt python2-zbar)
-pkgver=0.22
+pkgver=0.23
 pkgrel=1
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
 url="https://github.com/mchehab/zbar"
 license=('LGPL')
-makedepends=('libmagick' 'libxv' 'v4l-utils' 'qt5-x11extras' 'pygtk' 'python' 'xmlto' 'docbook-xsl')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/mchehab/zbar/archive/$pkgver.tar.gz"
-        imagemagick7.patch)
-sha512sums=('bef1078f7fe0c943e2ca7348f45e3bb5744e807c5135051fccf2c4499d52515558e98f61620e2ef2c993f35b8104d886d0639b7f0e6f8979caa5dcc49df7c931'
-            '43987414a6432b9e7da329f5a416f389d29bfc3417a6edc65a46b2677ade7dbb8c150df90c8b42464a6cb17c4732509fb8d3672387dafe9fd17a5def78a5ef63')
+makedepends=('gtk3' 'libmagick' 'libxv' 'v4l-utils' 'qt5-x11extras' 'pygtk' 'python' 'xmlto' 'docbook-xsl')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/mchehab/zbar/archive/$pkgver.tar.gz")
+sha512sums=('bc2667a2a5a5f2e9fd3f39e57bf1d7f860b20a0b5faffc38791d222a6ff0414aff880295ce5ccb92acce7250503f2a7f48ac12651cf82cfb1933b302da26e393')
 
-prepare() {
+build() {
   cd zbar-$pkgver
-  patch -p1 -i ../imagemagick7.patch
   autoreconf -vfi
-}
-
-build() {
-  cd zbar-$pkgver
-  PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig" \
   PYTHON="/usr/bin/python2" \
-  ./configure --prefix=/usr --with-qt --with-gtk CFLAGS="$CFLAGS -DNDEBUG"
+  ./configure --prefix=/usr --with-qt --with-gtk=gtk3 CFLAGS="$CFLAGS -DNDEBUG"
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
@@ -53,7 +45,7 @@
 }
 
 package_zbar-gtk() {
-  depends=('zbar' 'gtk2')
+  depends=('zbar' 'gtk3')
 
   cd zbar-$pkgver
   make DESTDIR="$pkgdir" install

Deleted: imagemagick7.patch
===================================================================
--- imagemagick7.patch	2019-05-27 03:56:21 UTC (rev 470888)
+++ imagemagick7.patch	2019-05-27 03:56:46 UTC (rev 470889)
@@ -1,22 +0,0 @@
---- 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