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

2020-11-12 Thread Evangelos Foutras via arch-commits 
Date: Thursday, November 12, 2020 @ 10:07:24
  Author: foutrelis
Revision: 400468

upgpkg: zbar 0.23.1-5: Python 3.9 rebuild

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-12 10:07:21 UTC (rev 400467)
+++ PKGBUILD2020-11-12 10:07:24 UTC (rev 400468)
@@ -5,7 +5,7 @@
 
 pkgname=zbar
 pkgver=0.23.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
 url="https://github.com/mchehab/zbar;

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

2020-11-10 Thread Evangelos Foutras via arch-commits 
Date: Tuesday, November 10, 2020 @ 08:10:50
  Author: foutrelis
Revision: 400043

upgpkg: zbar 0.23.1-4: Python 3.9 rebuild

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-10 08:08:05 UTC (rev 400042)
+++ PKGBUILD2020-11-10 08:10:50 UTC (rev 400043)
@@ -5,7 +5,7 @@
 
 pkgname=zbar
 pkgver=0.23.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
 url="https://github.com/mchehab/zbar;

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

2020-11-09 Thread Felix Yan via arch-commits 
Date: Tuesday, November 10, 2020 @ 07:55:51
  Author: felixonmars
Revision: 400041

add workaround for python 3.9

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |3 +++
 1 file changed, 3 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-10 07:03:56 UTC (rev 400040)
+++ PKGBUILD2020-11-10 07:55:51 UTC (rev 400041)
@@ -24,6 +24,9 @@
 prepare() {
   cd zbar-$pkgver
   autoreconf -vfi
+
+  # Removed in Python 3.9. Ignored in Python 3.0+ anyway.
+  sed -i '/tp_print/d' python/enum.c
 }
 
 build() {

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

2020-11-07 Thread Antonio Rojas via arch-commits 
Date: Saturday, November 7, 2020 @ 22:44:35
  Author: arojas
Revision: 399603

imagemagick 7.0.10.37 rebuild

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-07 22:41:19 UTC (rev 399602)
+++ PKGBUILD2020-11-07 22:44:35 UTC (rev 399603)
@@ -5,7 +5,7 @@
 
 pkgname=zbar
 pkgver=0.23.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
 url="https://github.com/mchehab/zbar;

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

2020-06-29 Thread Felix Yan via arch-commits 
Date: Monday, June 29, 2020 @ 08:26:18
  Author: felixonmars
Revision: 390567

upgpkg: zbar 0.23.1-2: merge to a single zbar package

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |   98 +
 1 file changed, 16 insertions(+), 82 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-29 08:20:06 UTC (rev 390566)
+++ PKGBUILD2020-06-29 08:26:18 UTC (rev 390567)
@@ -3,105 +3,39 @@
 # Contributor: Radu Andries 
 # Contributor: Andy Weidenbaum 
 
-pkgbase=zbar
-pkgname=(zbar zbar-gtk zbar-qt python-zbar)
+pkgname=zbar
 pkgver=0.23.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
 url="https://github.com/mchehab/zbar;
 license=('LGPL')
-makedepends=('gtk3' 'imagemagick' 'libxv' 'v4l-utils' 'qt5-x11extras' 'python' 
'xmlto'
- 'docbook-xsl' 'gobject-introspection')
+depends=('dbus' 'imagemagick' 'libsm' 'libxv' 'v4l-utils')
+makedepends=('gtk3' 'qt5-x11extras' 'python' 'xmlto' 'docbook-xsl' 
'gobject-introspection')
+optdepends=('gtk3: for zbar-gtk'
+'qt5-x11extras: for zbar-qt'
+'python: for zbar python bindings')
+conflicts=('zbar-gtk' 'zbar-qt' 'python-zbar')
+provides=('zbar-gtk' 'zbar-qt' 'python-zbar')
+replaces=('zbar-gtk' 'zbar-qt' 'python-zbar')
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/mchehab/zbar/archive/$pkgver.tar.gz;)
 
sha512sums=('ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b')
 
-build() {
+prepare() {
   cd zbar-$pkgver
   autoreconf -vfi
-  ./configure --prefix=/usr --with-qt --with-gtk=gtk3 CFLAGS="$CFLAGS -DNDEBUG"
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
 }
 
-package_zbar() {
-  depends=('dbus' 'imagemagick' 'libsm' 'libxv' 'v4l-utils')
-
+build() {
   cd zbar-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -dm755 "$pkgdir"/usr/share/dbus-1/system.d
-  mv "$pkgdir"{/etc,/usr/share}/dbus-1/system.d/org.linuxtv.Zbar.conf
-
-  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/python3.8 \
-"$pkgdir"/usr/bin/zbarcam-* \
-"$pkgdir"/usr/share/gir-1.0 \
-"$pkgdir"/usr/lib/girepository-1.0
-
-  rmdir "$pkgdir"/etc{/dbus-1/system.d,/dbus-1,}
+  ./configure --prefix=/usr --with-qt --with-gtk=gtk3 
--with-dbusconfdir=/usr/share CFLAGS="$CFLAGS -DNDEBUG"
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
 }
 
-package_zbar-gtk() {
-  depends=('zbar' 'gtk3')
-
+package() {
   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/python3.8 \
-"$pkgdir"/usr/share/{doc,man} \
-"$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-qt} \
-"$pkgdir"/etc
-
-  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/python3.8 \
-"$pkgdir"/usr/share \
-"$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-gtk} \
-"$pkgdir"/etc \
-"$pkgdir"/usr/lib/girepository-1.0
-
-  mv ./QZBar*.h "$pkgdir"/usr/include/zbar/
-}
-
-package_python-zbar() {
-  depends=('python' 'zbar')
-
-  cd zbar-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  rm -r "$pkgdir"/usr/lib/*.so* \
-"$pkgdir"/usr/lib/*.a \
-"$pkgdir"/usr/include \
-"$pkgdir"/usr/lib/pkgconfig \
-"$pkgdir"/usr/{bin,share} \
-"$pkgdir"/etc \
-"$pkgdir"/usr/lib/girepository-1.0
-}
-
 # vim:set ts=2 sw=2 et:

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

2020-04-28 Thread Felix Yan via arch-commits 
Date: Tuesday, April 28, 2020 @ 08:56:00
  Author: felixonmars
Revision: 381780

upgpkg: zbar 0.23.1-1

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-28 08:42:59 UTC (rev 381779)
+++ PKGBUILD2020-04-28 08:56:00 UTC (rev 381780)
@@ -5,8 +5,8 @@
 
 pkgbase=zbar
 pkgname=(zbar zbar-gtk zbar-qt python-zbar)
-pkgver=0.23
-pkgrel=3
+pkgver=0.23.1
+pkgrel=1
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
 url="https://github.com/mchehab/zbar;
@@ -14,7 +14,7 @@
 makedepends=('gtk3' 'imagemagick' 'libxv' 'v4l-utils' 'qt5-x11extras' 'python' 
'xmlto'
  'docbook-xsl' 'gobject-introspection')
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/mchehab/zbar/archive/$pkgver.tar.gz;)
-sha512sums=('bc2667a2a5a5f2e9fd3f39e57bf1d7f860b20a0b5faffc38791d222a6ff0414aff880295ce5ccb92acce7250503f2a7f48ac12651cf82cfb1933b302da26e393')
+sha512sums=('ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b')
 
 build() {
   cd zbar-$pkgver

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

2020-03-17 Thread Felix Yan via arch-commits 
Date: Tuesday, March 17, 2020 @ 10:00:26
  Author: felixonmars
Revision: 377802

upgpkg: zbar 0.23-3

- enable gir
- build python3 instead of python2 bindings

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |   31 ++-
 1 file changed, 18 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-17 10:00:11 UTC (rev 377801)
+++ PKGBUILD2020-03-17 10:00:26 UTC (rev 377802)
@@ -4,14 +4,15 @@
 # Contributor: Andy Weidenbaum 
 
 pkgbase=zbar
-pkgname=(zbar zbar-gtk zbar-qt python2-zbar)
+pkgname=(zbar zbar-gtk zbar-qt python-zbar)
 pkgver=0.23
-pkgrel=2
+pkgrel=3
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
 url="https://github.com/mchehab/zbar;
 license=('LGPL')
-makedepends=('gtk3' 'imagemagick' 'libxv' 'v4l-utils' 'qt5-x11extras' 'pygtk' 
'python' 'xmlto' 'docbook-xsl')
+makedepends=('gtk3' 'imagemagick' 'libxv' 'v4l-utils' 'qt5-x11extras' 'python' 
'xmlto'
+ 'docbook-xsl' 'gobject-introspection')
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/mchehab/zbar/archive/$pkgver.tar.gz;)
 
sha512sums=('bc2667a2a5a5f2e9fd3f39e57bf1d7f860b20a0b5faffc38791d222a6ff0414aff880295ce5ccb92acce7250503f2a7f48ac12651cf82cfb1933b302da26e393')
 
@@ -18,7 +19,6 @@
 build() {
   cd zbar-$pkgver
   autoreconf -vfi
-  PYTHON="/usr/bin/python2" \
   ./configure --prefix=/usr --with-qt --with-gtk=gtk3 CFLAGS="$CFLAGS -DNDEBUG"
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
@@ -38,8 +38,10 @@
 "$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-*
+"$pkgdir"/usr/lib/python3.8 \
+"$pkgdir"/usr/bin/zbarcam-* \
+"$pkgdir"/usr/share/gir-1.0 \
+"$pkgdir"/usr/lib/girepository-1.0
 
   rmdir "$pkgdir"/etc{/dbus-1/system.d,/dbus-1,}
 }
@@ -57,8 +59,8 @@
 "$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/lib/python3.8 \
+"$pkgdir"/usr/share/{doc,man} \
 "$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-qt} \
 "$pkgdir"/etc
 
@@ -78,25 +80,28 @@
 "$pkgdir"/usr/include/zbar/*.h \
 "$pkgdir"/usr/include/zbar.h \
 "$pkgdir"/usr/lib/pkgconfig/zbar{,-gtk}.pc \
-"$pkgdir"/usr/lib/python2.7 \
+"$pkgdir"/usr/lib/python3.8 \
 "$pkgdir"/usr/share \
 "$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-gtk} \
-"$pkgdir"/etc
+"$pkgdir"/etc \
+"$pkgdir"/usr/lib/girepository-1.0
 
   mv ./QZBar*.h "$pkgdir"/usr/include/zbar/
 }
 
-package_python2-zbar() {
-  depends=('zbar-gtk' 'pygtk')
+package_python-zbar() {
+  depends=('python' 'zbar')
 
   cd zbar-$pkgver
   make DESTDIR="$pkgdir" install
 
   rm -r "$pkgdir"/usr/lib/*.so* \
+"$pkgdir"/usr/lib/*.a \
 "$pkgdir"/usr/include \
 "$pkgdir"/usr/lib/pkgconfig \
 "$pkgdir"/usr/{bin,share} \
-"$pkgdir"/etc
+"$pkgdir"/etc \
+"$pkgdir"/usr/lib/girepository-1.0
 }
 
 # vim:set ts=2 sw=2 et:

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

2019-10-31 Thread Antonio Rojas via arch-commits 
Date: Thursday, October 31, 2019 @ 08:02:05
  Author: arojas
Revision: 366116

imagemagick 7.0.9 rebuild

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-31 07:47:18 UTC (rev 366115)
+++ PKGBUILD2019-10-31 08:02:05 UTC (rev 366116)
@@ -6,12 +6,12 @@
 pkgbase=zbar
 pkgname=(zbar zbar-gtk zbar-qt python2-zbar)
 pkgver=0.23
-pkgrel=1
+pkgrel=2
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
 url="https://github.com/mchehab/zbar;
 license=('LGPL')
-makedepends=('gtk3' 'libmagick' 'libxv' 'v4l-utils' 'qt5-x11extras' 'pygtk' 
'python' 'xmlto' 'docbook-xsl')
+makedepends=('gtk3' 'imagemagick' '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')
 
@@ -25,7 +25,7 @@
 }
 
 package_zbar() {
-  depends=('dbus' 'libmagick' 'libsm' 'libxv' 'v4l-utils')
+  depends=('dbus' 'imagemagick' 'libsm' 'libxv' 'v4l-utils')
 
   cd zbar-$pkgver
   make DESTDIR="$pkgdir" install

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

2019-05-26 Thread Felix Yan via arch-commits 
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
===
--- PKGBUILD2019-05-27 03:56:21 UTC (rev 470888)
+++ PKGBUILD2019-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.0 +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.c2016-12-20 09:20:27.679129140 +0100
-@@ -44,7 +44,7 @@
- #endif
- 
- #ifdef HAVE_IMAGEMAGICK
--# include 
-+# include 
- 
- /* ImageMagick frequently changes API names - just use the original
-  * (more stable?) names to match GraphicsMagick

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

2019-03-27 Thread Felix Yan via arch-commits 
Date: Wednesday, March 27, 2019 @ 11:36:44
  Author: felixonmars
Revision: 444218

upgpkg: zbar 0.22-1

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-27 11:36:32 UTC (rev 444217)
+++ PKGBUILD2019-03-27 11:36:44 UTC (rev 444218)
@@ -5,8 +5,8 @@
 
 pkgbase=zbar
 pkgname=(zbar zbar-gtk zbar-qt python2-zbar)
-pkgver=0.21
-pkgrel=2
+pkgver=0.22
+pkgrel=1
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
 url="https://github.com/mchehab/zbar;
@@ -14,7 +14,7 @@
 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'
+sha512sums=('bef1078f7fe0c943e2ca7348f45e3bb5744e807c5135051fccf2c4499d52515558e98f61620e2ef2c993f35b8104d886d0639b7f0e6f8979caa5dcc49df7c931'
 
'43987414a6432b9e7da329f5a416f389d29bfc3417a6edc65a46b2677ade7dbb8c150df90c8b42464a6cb17c4732509fb8d3672387dafe9fd17a5def78a5ef63')
 
 prepare() {

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

2019-02-21 Thread Felix Yan via arch-commits 
Date: Thursday, February 21, 2019 @ 19:30:57
  Author: felixonmars
Revision: 435125

upgpkg: zbar 0.21-2

- fix file confliction (FS#61815)
- fix dbus file location

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |   18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-21 19:27:11 UTC (rev 435124)
+++ PKGBUILD2019-02-21 19:30:57 UTC (rev 435125)
@@ -6,7 +6,7 @@
 pkgbase=zbar
 pkgname=(zbar zbar-gtk zbar-qt python2-zbar)
 pkgver=0.21
-pkgrel=1
+pkgrel=2
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
 url="https://github.com/mchehab/zbar;
@@ -33,11 +33,14 @@
 }
 
 package_zbar() {
-  depends=('libmagick' 'libsm' 'libxv' 'v4l-utils')
+  depends=('dbus' 'libmagick' 'libsm' 'libxv' 'v4l-utils')
 
   cd zbar-$pkgver
   make DESTDIR="$pkgdir" install
 
+  install -dm755 "$pkgdir"/usr/share/dbus-1/system.d
+  mv "$pkgdir"{/etc,/usr/share}/dbus-1/system.d/org.linuxtv.Zbar.conf
+
   rm -r "$pkgdir"/usr/lib/libzbar{gtk,qt}.so* \
 "$pkgdir"/usr/lib/*.a \
 "$pkgdir"/usr/include/zbar/zbargtk.h \
@@ -45,6 +48,8 @@
 "$pkgdir"/usr/lib/pkgconfig/zbar-{gtk,qt}.pc \
 "$pkgdir"/usr/lib/python2.7 \
 "$pkgdir"/usr/bin/zbarcam-*
+
+  rmdir "$pkgdir"/etc{/dbus-1/system.d,/dbus-1,}
 }
 
 package_zbar-gtk() {
@@ -62,7 +67,8 @@
 "$pkgdir"/usr/lib/pkgconfig/zbar{,-qt}.pc \
 "$pkgdir"/usr/lib/python2.7 \
 "$pkgdir"/usr/share \
-"$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-qt}
+"$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-qt} \
+"$pkgdir"/etc
 
   mv ./zbargtk.h "$pkgdir"/usr/include/zbar/
 }
@@ -82,7 +88,8 @@
 "$pkgdir"/usr/lib/pkgconfig/zbar{,-gtk}.pc \
 "$pkgdir"/usr/lib/python2.7 \
 "$pkgdir"/usr/share \
-"$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-gtk}
+"$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-gtk} \
+"$pkgdir"/etc
 
   mv ./QZBar*.h "$pkgdir"/usr/include/zbar/
 }
@@ -96,7 +103,8 @@
   rm -r "$pkgdir"/usr/lib/*.so* \
 "$pkgdir"/usr/include \
 "$pkgdir"/usr/lib/pkgconfig \
-"$pkgdir"/usr/{bin,share}
+"$pkgdir"/usr/{bin,share} \
+"$pkgdir"/etc
 }
 
 # vim:set ts=2 sw=2 et:

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

2019-02-19 Thread Felix Yan via arch-commits 
Date: Tuesday, February 19, 2019 @ 20:43:11
  Author: felixonmars
Revision: 434634

upgpkg: zbar 0.21-1

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-19 20:36:47 UTC (rev 434633)
+++ PKGBUILD2019-02-19 20:43:11 UTC (rev 434634)
@@ -5,16 +5,16 @@
 
 pkgbase=zbar
 pkgname=(zbar zbar-gtk zbar-qt python2-zbar)
-pkgver=0.20
-pkgrel=3
+pkgver=0.21
+pkgrel=1
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
-url="https://github.com/procxx/zbar;
+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/procxx/zbar/archive/$pkgver.tar.gz;
+source=("$pkgname-$pkgver.tar.gz::https://github.com/mchehab/zbar/archive/$pkgver.tar.gz;
 imagemagick7.patch)
-sha512sums=('b013dc5f72f910e8e0dc73de1705684f76e5cb5b2026d48d3e149d3e8b46afdf273d06f32738c588c272218e95b5cd39d3c0b8be4eb9be17553504a13b11c144'
+sha512sums=('148fbcdc3fc01c54087f92f746c92bd21ec37a7e0c27b0f48862f0ff0490d9a4b0954cf9cbc10a536d3bf559e13c8cb2670c1c9e6832ca70841107f3c5bb0210'
 
'43987414a6432b9e7da329f5a416f389d29bfc3417a6edc65a46b2677ade7dbb8c150df90c8b42464a6cb17c4732509fb8d3672387dafe9fd17a5def78a5ef63')
 
 prepare() {

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

2018-05-09 Thread Felix Yan via arch-commits 
Date: Wednesday, May 9, 2018 @ 12:55:03
  Author: felixonmars
Revision: 319862

upgpkg: zbar 0.20-3

libmagick/libmagick6 rebuild

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-09 12:38:11 UTC (rev 319861)
+++ PKGBUILD2018-05-09 12:55:03 UTC (rev 319862)
@@ -7,7 +7,7 @@
 pkgbase=zbar
 pkgname=(zbar zbar-gtk zbar-qt python2-zbar)
 pkgver=0.20
-pkgrel=2
+pkgrel=3
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
 url="https://github.com/procxx/zbar;

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

2018-03-23 Thread Felix Yan via arch-commits 
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
===
--- PKGBUILD2018-03-23 14:35:07 UTC (rev 311348)
+++ PKGBUILD2018-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.0 +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.c2016-12-20 09:20:27.679129140 +0100
+@@ -44,7 +44,7 @@
+ #endif
+ 
+ #ifdef HAVE_IMAGEMAGICK
+-# include 
++# include 
+ 
+ /* ImageMagick frequently changes API names - just use the original
+  * (more stable?) names to match GraphicsMagick

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

2018-03-14 Thread Felix Yan via arch-commits 
Date: Thursday, March 15, 2018 @ 03:00:58
  Author: felixonmars
Revision: 307915

upgpkg: zbar 0.20-1

bump to fork and split package

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

+
 PKGBUILD   |   88 ---
 v4l1.patch |   24 
 2 files changed, 73 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-15 02:49:41 UTC (rev 307914)
+++ PKGBUILD2018-03-15 03:00:58 UTC (rev 307915)
@@ -4,26 +4,21 @@
 # Contributor: Radu Andries 
 # Contributor: Andy Weidenbaum 
 
-pkgname=zbar
-pkgver=0.10
-pkgrel=12
+pkgbase=zbar
+pkgname=(zbar zbar-gtk zbar-qt python2-zbar)
+pkgver=0.20
+pkgrel=1
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
-url="http://zbar.sourceforge.net/;
+url="https://github.com/procxx/zbar;
 license=('LGPL')
-depends=('libmagick6' 'libxv' 'python2' 'gtk2' 'pygtk' 'v4l-utils')
-makedepends=('qt4' 'python')
-conflicts=('zbar-gtk' 'zbar-qt')
-provides=("zbar-gtk=$pkgver" "zbar-qt=$pkgver")
-optdepends=('qt4: for libzbarqt')
-source=("http://downloads.sourceforge.net/project/zbar/zbar/$pkgver/zbar-$pkgver.tar.bz2;
-v4l1.patch)
-md5sums=('0fd61eb590ac1bab62a77913c8b086a5'
- '284f11ca2a5e009744c4a1b9e92d6953')
+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')
 
 prepare() {
   cd zbar-$pkgver
-  patch -p1 -i ../v4l1.patch
+  autoreconf -vfi
 }
 
 build() {
@@ -31,12 +26,75 @@
   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() {
+package_zbar() {
+  depends=('libmagick6' '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: v4l1.patch
===
--- v4l1.patch  2018-03-15 02:49:41 UTC (rev 307914)
+++ v4l1.patch  2018-03-15 03:00:58 UTC (rev 307915)
@@ -1,24 +0,0 @@
-Thanks to Andy Weidenbaum  for providing this patch!
-
 ./zbar/video/v4l1.c2013-03-06 23:24:22.996336417 -0800
-+++ ./zbar/video/v4l1.c2013-03-06 23:29:29.789662369 -0800
-@@ -41,7 +41,7 @@
- #ifdef HAVE_SYS_MMAN_H
- # include 
- #endif
--#include 
-+#include 
- 
- #include "video.h"
- #include "image.h"
 ./configure2009-10-23 11:17:24.0 -0700
-+++ ./configure2013-03-06 23:47:33.902966990 -0800
-@@ -18709,7 +18709,7 @@
- if test "x$enable_video" != "xno"; then
-   if test "x$win32" = "xno"; then
- 
--for ac_header in linux/videodev.h
-+for ac_header in libv4l1-videodev.h
- do
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

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

2017-12-04 Thread Antonio Rojas via arch-commits 
Date: Monday, December 4, 2017 @ 09:58:47
  Author: arojas
Revision: 272106

Rebuild with libmagick6

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-04 09:50:37 UTC (rev 272105)
+++ PKGBUILD2017-12-04 09:58:47 UTC (rev 272106)
@@ -6,13 +6,13 @@
 
 pkgname=zbar
 pkgver=0.10
-pkgrel=11
+pkgrel=12
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
 url="http://zbar.sourceforge.net/;
 license=('LGPL')
-depends=('imagemagick' 'libxv' 'python2' 'gtk2' 'pygtk' 'v4l-utils')
-makedepends=('qt4')
+depends=('libmagick6' 'libxv' 'python2' 'gtk2' 'pygtk' 'v4l-utils')
+makedepends=('qt4' 'python')
 conflicts=('zbar-gtk' 'zbar-qt')
 provides=("zbar-gtk=$pkgver" "zbar-qt=$pkgver")
 optdepends=('qt4: for libzbarqt')
@@ -28,7 +28,8 @@
 
 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"
   make
 }

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

2017-10-04 Thread Felix Yan 
Date: Wednesday, October 4, 2017 @ 15:41:52
  Author: felixonmars
Revision: 261494

update email

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-04 15:41:51 UTC (rev 261493)
+++ PKGBUILD2017-10-04 15:41:52 UTC (rev 261494)
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer: Felix Yan 
+# Maintainer: Felix Yan 
 # Contributor: Marti Raudsepp 
 # Contributor: Radu Andries 
 # Contributor: Andy Weidenbaum

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

2017-07-16 Thread Antonio Rojas 
Date: Sunday, July 16, 2017 @ 09:51:11
  Author: arojas
Revision: 245321

imagemagick 6.9.9.0 rebuild

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-16 09:46:06 UTC (rev 245320)
+++ PKGBUILD2017-07-16 09:51:11 UTC (rev 245321)
@@ -6,7 +6,7 @@
 
 pkgname=zbar
 pkgver=0.10
-pkgrel=10
+pkgrel=11
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('i686' 'x86_64')
 url="http://zbar.sourceforge.net/;

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

2017-06-06 Thread Bartłomiej Piotrowski 
Date: Tuesday, June 6, 2017 @ 16:53:35
  Author: bpiotrowski
Revision: 234996

0.10-10: make qt4 an optional dependency

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-06 16:51:41 UTC (rev 234995)
+++ PKGBUILD2017-06-06 16:53:35 UTC (rev 234996)
@@ -6,14 +6,16 @@
 
 pkgname=zbar
 pkgver=0.10
-pkgrel=9
+pkgrel=10
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('i686' 'x86_64')
 url="http://zbar.sourceforge.net/;
 license=('LGPL')
-depends=('imagemagick' 'libxv' 'python2' 'gtk2' 'qt4' 'pygtk' 'v4l-utils')
+depends=('imagemagick' 'libxv' 'python2' 'gtk2' 'pygtk' 'v4l-utils')
+makedepends=('qt4')
 conflicts=('zbar-gtk' 'zbar-qt')
 provides=("zbar-gtk=$pkgver" "zbar-qt=$pkgver")
+optdepends=('qt4: for libzbarqt')
 
source=("http://downloads.sourceforge.net/project/zbar/zbar/$pkgver/zbar-$pkgver.tar.bz2;
 v4l1.patch)
 md5sums=('0fd61eb590ac1bab62a77913c8b086a5'

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

2017-02-08 Thread Antonio Rojas 
Date: Wednesday, February 8, 2017 @ 10:38:53
  Author: arojas
Revision: 211212

Imagemagick 6.9.7.7 rebuild

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-08 10:38:22 UTC (rev 211211)
+++ PKGBUILD2017-02-08 10:38:53 UTC (rev 211212)
@@ -6,7 +6,7 @@
 
 pkgname=zbar
 pkgver=0.10
-pkgrel=8
+pkgrel=9
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('i686' 'x86_64')
 url="http://zbar.sourceforge.net/;

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

2016-12-17 Thread Evangelos Foutras 
Date: Saturday, December 17, 2016 @ 16:40:38
  Author: foutrelis
Revision: 199966

imagemagick 6.9.6.8 rebuild

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-17 16:36:39 UTC (rev 199965)
+++ PKGBUILD2016-12-17 16:40:38 UTC (rev 199966)
@@ -6,7 +6,7 @@
 
 pkgname=zbar
 pkgver=0.10
-pkgrel=7
+pkgrel=8
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('i686' 'x86_64')
 url="http://zbar.sourceforge.net/;

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

2015-12-06 Thread Allan McRae 
Date: Monday, December 7, 2015 @ 01:56:55
  Author: allan
Revision: 149439

C++11 ABI rebuild

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 00:56:49 UTC (rev 149438)
+++ PKGBUILD2015-12-07 00:56:55 UTC (rev 149439)
@@ -6,7 +6,7 @@
 
 pkgname=zbar
 pkgver=0.10
-pkgrel=6
+pkgrel=7
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('i686' 'x86_64')
 url="http://zbar.sourceforge.net/;

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

2015-10-22 Thread Felix Yan 
Date: Friday, October 23, 2015 @ 04:42:44
  Author: fyan
Revision: 144761

upgpkg: zbar 0.10-6

apply our CFLAGS (FS#44092)

Modified:
  zbar/trunk/PKGBUILD

--+
 PKGBUILD |   19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-23 02:23:25 UTC (rev 144760)
+++ PKGBUILD2015-10-23 02:42:44 UTC (rev 144761)
@@ -6,7 +6,7 @@
 
 pkgname=zbar
 pkgver=0.10
-pkgrel=5
+pkgrel=6
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('i686' 'x86_64')
 url="http://zbar.sourceforge.net/;
@@ -16,17 +16,18 @@
 provides=("zbar-gtk=$pkgver" "zbar-qt=$pkgver")
 
source=("http://downloads.sourceforge.net/project/zbar/zbar/$pkgver/zbar-$pkgver.tar.bz2;
 v4l1.patch)
+md5sums=('0fd61eb590ac1bab62a77913c8b086a5'
+ '284f11ca2a5e009744c4a1b9e92d6953')
 
+prepare() {
+  cd zbar-$pkgver
+  patch -p1 -i ../v4l1.patch
+}
+
 build() {
   cd zbar-$pkgver
 
-  msg 'Patching...'
-  patch -p1 < ../v4l1.patch
-
-  msg 'Running configure...'
-  ./configure --prefix=/usr --with-qt --with-gtk CFLAGS=-DNDEBUG
-
-  msg 'Running make...'
+  ./configure --prefix=/usr --with-qt --with-gtk CFLAGS="$CFLAGS -DNDEBUG"
   make
 }
 
@@ -36,5 +37,3 @@
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('0fd61eb590ac1bab62a77913c8b086a5'
- '284f11ca2a5e009744c4a1b9e92d6953')

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

2014-01-18 Thread Felix Yan 
Date: Saturday, January 18, 2014 @ 09:19:04
  Author: fyan
Revision: 104336

upgpkg: zbar 0.10-5

- imagemagick 6.8.8.2 rebuild

Modified:
  zbar/trunk/PKGBUILD   (contents, properties)

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-18 05:15:20 UTC (rev 104335)
+++ PKGBUILD2014-01-18 08:19:04 UTC (rev 104336)
@@ -6,7 +6,7 @@
 
 pkgname=zbar
 pkgver=0.10
-pkgrel=4
+pkgrel=5
 pkgdesc=Application and library for reading bar codes from various sources
 arch=('i686' 'x86_64')
 url=http://zbar.sourceforge.net/;
@@ -29,6 +29,7 @@
   msg 'Running make...'
   make
 }
+
 package() {
   cd zbar-$pkgver
   make DESTDIR=$pkgdir install


Property changes on: zbar/trunk/PKGBUILD
___
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property