[arch-commits] Commit in zbar/repos/community-x86_64 (4 files)
Felix Yan
felixonmars at archlinux.org
Tue Feb 19 20:43:30 UTC 2019
Date: Tuesday, February 19, 2019 @ 20:43:29
Author: felixonmars
Revision: 434635
archrelease: copy trunk to community-x86_64
Added:
zbar/repos/community-x86_64/PKGBUILD
(from rev 434634, zbar/trunk/PKGBUILD)
zbar/repos/community-x86_64/imagemagick7.patch
(from rev 434634, zbar/trunk/imagemagick7.patch)
Deleted:
zbar/repos/community-x86_64/PKGBUILD
zbar/repos/community-x86_64/imagemagick7.patch
--------------------+
PKGBUILD | 205 +++++++++++++++++++++++++--------------------------
imagemagick7.patch | 44 +++++-----
2 files changed, 124 insertions(+), 125 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-02-19 20:43:11 UTC (rev 434634)
+++ PKGBUILD 2019-02-19 20:43:29 UTC (rev 434635)
@@ -1,103 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Marti Raudsepp <marti at juffo.org>
-# Contributor: Radu Andries <admiral0 at tuxfamily.org>
-# Contributor: Andy Weidenbaum <archbaum at gmail.com>
-
-pkgbase=zbar
-pkgname=(zbar zbar-gtk zbar-qt python2-zbar)
-pkgver=0.20
-pkgrel=3
-pkgdesc="Application and library for reading bar codes from various sources"
-arch=('x86_64')
-url="https://github.com/procxx/zbar"
-license=('LGPL')
-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
-}
-
-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"
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package_zbar() {
- depends=('libmagick' 'libsm' 'libxv' 'v4l-utils')
-
- cd zbar-$pkgver
- make DESTDIR="$pkgdir" install
-
- rm -r "$pkgdir"/usr/lib/libzbar{gtk,qt}.so* \
- "$pkgdir"/usr/lib/*.a \
- "$pkgdir"/usr/include/zbar/zbargtk.h \
- "$pkgdir"/usr/include/zbar/QZBar*.h \
- "$pkgdir"/usr/lib/pkgconfig/zbar-{gtk,qt}.pc \
- "$pkgdir"/usr/lib/python2.7 \
- "$pkgdir"/usr/bin/zbarcam-*
-}
-
-package_zbar-gtk() {
- depends=('zbar' 'gtk2')
-
- cd zbar-$pkgver
- make DESTDIR="$pkgdir" install
-
- mv "$pkgdir"/usr/include/zbar/zbargtk.h ./
-
- rm -r "$pkgdir"/usr/lib/libzbar{,qt}.so* \
- "$pkgdir"/usr/lib/*.a \
- "$pkgdir"/usr/include/zbar/*.h \
- "$pkgdir"/usr/include/zbar.h \
- "$pkgdir"/usr/lib/pkgconfig/zbar{,-qt}.pc \
- "$pkgdir"/usr/lib/python2.7 \
- "$pkgdir"/usr/share \
- "$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-qt}
-
- mv ./zbargtk.h "$pkgdir"/usr/include/zbar/
-}
-
-package_zbar-qt() {
- depends=('zbar' 'qt5-x11extras')
-
- cd zbar-$pkgver
- make DESTDIR="$pkgdir" install
-
- mv "$pkgdir"/usr/include/zbar/QZBar*.h ./
-
- rm -r "$pkgdir"/usr/lib/libzbar{,gtk}.so* \
- "$pkgdir"/usr/lib/*.a \
- "$pkgdir"/usr/include/zbar/*.h \
- "$pkgdir"/usr/include/zbar.h \
- "$pkgdir"/usr/lib/pkgconfig/zbar{,-gtk}.pc \
- "$pkgdir"/usr/lib/python2.7 \
- "$pkgdir"/usr/share \
- "$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-gtk}
-
- mv ./QZBar*.h "$pkgdir"/usr/include/zbar/
-}
-
-package_python2-zbar() {
- depends=('zbar-gtk' 'pygtk')
-
- cd zbar-$pkgver
- make DESTDIR="$pkgdir" install
-
- rm -r "$pkgdir"/usr/lib/*.so* \
- "$pkgdir"/usr/include \
- "$pkgdir"/usr/lib/pkgconfig \
- "$pkgdir"/usr/{bin,share}
-}
-
-# vim:set ts=2 sw=2 et:
Copied: zbar/repos/community-x86_64/PKGBUILD (from rev 434634, zbar/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-02-19 20:43:29 UTC (rev 434635)
@@ -0,0 +1,102 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Marti Raudsepp <marti at juffo.org>
+# Contributor: Radu Andries <admiral0 at tuxfamily.org>
+# Contributor: Andy Weidenbaum <archbaum at gmail.com>
+
+pkgbase=zbar
+pkgname=(zbar zbar-gtk zbar-qt python2-zbar)
+pkgver=0.21
+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=('148fbcdc3fc01c54087f92f746c92bd21ec37a7e0c27b0f48862f0ff0490d9a4b0954cf9cbc10a536d3bf559e13c8cb2670c1c9e6832ca70841107f3c5bb0210'
+ '43987414a6432b9e7da329f5a416f389d29bfc3417a6edc65a46b2677ade7dbb8c150df90c8b42464a6cb17c4732509fb8d3672387dafe9fd17a5def78a5ef63')
+
+prepare() {
+ 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"
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package_zbar() {
+ depends=('libmagick' 'libsm' 'libxv' 'v4l-utils')
+
+ cd zbar-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ rm -r "$pkgdir"/usr/lib/libzbar{gtk,qt}.so* \
+ "$pkgdir"/usr/lib/*.a \
+ "$pkgdir"/usr/include/zbar/zbargtk.h \
+ "$pkgdir"/usr/include/zbar/QZBar*.h \
+ "$pkgdir"/usr/lib/pkgconfig/zbar-{gtk,qt}.pc \
+ "$pkgdir"/usr/lib/python2.7 \
+ "$pkgdir"/usr/bin/zbarcam-*
+}
+
+package_zbar-gtk() {
+ depends=('zbar' 'gtk2')
+
+ cd zbar-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ mv "$pkgdir"/usr/include/zbar/zbargtk.h ./
+
+ rm -r "$pkgdir"/usr/lib/libzbar{,qt}.so* \
+ "$pkgdir"/usr/lib/*.a \
+ "$pkgdir"/usr/include/zbar/*.h \
+ "$pkgdir"/usr/include/zbar.h \
+ "$pkgdir"/usr/lib/pkgconfig/zbar{,-qt}.pc \
+ "$pkgdir"/usr/lib/python2.7 \
+ "$pkgdir"/usr/share \
+ "$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-qt}
+
+ mv ./zbargtk.h "$pkgdir"/usr/include/zbar/
+}
+
+package_zbar-qt() {
+ depends=('zbar' 'qt5-x11extras')
+
+ cd zbar-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ mv "$pkgdir"/usr/include/zbar/QZBar*.h ./
+
+ rm -r "$pkgdir"/usr/lib/libzbar{,gtk}.so* \
+ "$pkgdir"/usr/lib/*.a \
+ "$pkgdir"/usr/include/zbar/*.h \
+ "$pkgdir"/usr/include/zbar.h \
+ "$pkgdir"/usr/lib/pkgconfig/zbar{,-gtk}.pc \
+ "$pkgdir"/usr/lib/python2.7 \
+ "$pkgdir"/usr/share \
+ "$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-gtk}
+
+ mv ./QZBar*.h "$pkgdir"/usr/include/zbar/
+}
+
+package_python2-zbar() {
+ depends=('zbar-gtk' 'pygtk')
+
+ cd zbar-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ rm -r "$pkgdir"/usr/lib/*.so* \
+ "$pkgdir"/usr/include \
+ "$pkgdir"/usr/lib/pkgconfig \
+ "$pkgdir"/usr/{bin,share}
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: imagemagick7.patch
===================================================================
--- imagemagick7.patch 2019-02-19 20:43:11 UTC (rev 434634)
+++ imagemagick7.patch 2019-02-19 20:43:29 UTC (rev 434635)
@@ -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
Copied: zbar/repos/community-x86_64/imagemagick7.patch (from rev 434634, zbar/trunk/imagemagick7.patch)
===================================================================
--- imagemagick7.patch (rev 0)
+++ imagemagick7.patch 2019-02-19 20:43:29 UTC (rev 434635)
@@ -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
More information about the arch-commits
mailing list