diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-05-08 10:41:07 -0300 |
|---|---|---|
| committer | TBK <tbk@jjtc.eu> | 2019-05-28 13:43:36 +0200 |
| commit | e6e99df194fc9cd8f6c7e497850e5f509adca8d4 (patch) | |
| tree | 15caa5e7680e8541bb25af53c2eb6e21dbcaa882 | |
| parent | 7b9af7fc90a456968f258e3c417a20808345994a (diff) | |
| download | aports-e6e99df194fc9cd8f6c7e497850e5f509adca8d4.tar.bz2 aports-e6e99df194fc9cd8f6c7e497850e5f509adca8d4.tar.xz | |
testing/zbar: update to 0.23
- Upgrade
- Replaces py2 binding with py3
Closes: GH-7699
| -rw-r--r-- | testing/zbar/APKBUILD | 22 | ||||
| -rw-r--r-- | testing/zbar/imagemagick7.patch | 23 |
2 files changed, 10 insertions, 35 deletions
diff --git a/testing/zbar/APKBUILD b/testing/zbar/APKBUILD index d4e725d36c..05cb5b923b 100644 --- a/testing/zbar/APKBUILD +++ b/testing/zbar/APKBUILD @@ -2,26 +2,25 @@ # Contributor: Diego Queiroz <diego.queiroz@gmail.com> # Maintainer: Diego Queiroz <diego.queiroz@gmail.com> pkgname=zbar -pkgver=0.22 +pkgver=0.23 pkgrel=0 pkgdesc="Port of ZBAR BAR CODE READER" url="http://zbar.sourceforge.net/" arch="all" license="LGPL-2.0-or-later" -depends="py-gobject" -makedepends="imagemagick-dev gtk+-dev py-gtk-dev qt5-qtx11extras-dev - lcms2-dev python2-dev automake autoconf libtool xmlto docbook-xsl - libxv-dev" +depends="py3-gobject3" +makedepends="imagemagick-dev gtk+-dev qt5-qtx11extras-dev lcms2-dev + automake autoconf libtool xmlto docbook-xsl libxv-dev python3-dev" subpackages=" $pkgname-dev $pkgname-doc lib$pkgname:zbarlibs lib${pkgname}qt:qtlibs lib${pkgname}gtk:gtklibs - py2-${pkgname}:py" + py3-${pkgname}:py + " source=" $pkgname-$pkgver.tar.gz::https://github.com/mchehab/zbar/archive/$pkgver.tar.gz - imagemagick7.patch " prepare() { @@ -30,7 +29,7 @@ prepare() { } build() { - ./configure --prefix=/usr --disable-video + ./configure --prefix=/usr --disable-video --with-python=python3 make } @@ -62,10 +61,9 @@ gtklibs() { py() { depends="" - pkgdesc="python2 bindings for ZBar" + pkgdesc="python3 bindings for ZBar" mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/python2* "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib } -sha512sums="bef1078f7fe0c943e2ca7348f45e3bb5744e807c5135051fccf2c4499d52515558e98f61620e2ef2c993f35b8104d886d0639b7f0e6f8979caa5dcc49df7c931 zbar-0.22.tar.gz -64d97d3c7e3aa0227dea7e152ad70ebb1612b5944cfbbb18c4c77ea5498b0a995d70a9e8953eb6bf93357e38af573b64f8e5020e4f586f6bbdb3f527fc5a6bc5 imagemagick7.patch" +sha512sums="bc2667a2a5a5f2e9fd3f39e57bf1d7f860b20a0b5faffc38791d222a6ff0414aff880295ce5ccb92acce7250503f2a7f48ac12651cf82cfb1933b302da26e393 zbar-0.23.tar.gz" diff --git a/testing/zbar/imagemagick7.patch b/testing/zbar/imagemagick7.patch deleted file mode 100644 index b3cbf1e5c4..0000000000 --- a/testing/zbar/imagemagick7.patch +++ /dev/null @@ -1,23 +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 - |