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

Felix Yan felixonmars at archlinux.org
Mon Jun 29 08:26:18 UTC 2020


    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
===================================================================
--- PKGBUILD	2020-06-29 08:20:06 UTC (rev 390566)
+++ PKGBUILD	2020-06-29 08:26:18 UTC (rev 390567)
@@ -3,105 +3,39 @@
 # Contributor: Radu Andries <admiral0 at tuxfamily.org>
 # Contributor: Andy Weidenbaum <archbaum at gmail.com>
 
-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:



More information about the arch-commits mailing list