# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1573806065 -3600
# Node ID 2850fe3df53d6f165bbd8f780a4e8e00fe106c87
# Parent  28641e29960995aa7dc8ba428b69f65fcfb4bad5
updated zbar and zbar-dev (0.10 -> 0.23)

diff -r 28641e299609 -r 2850fe3df53d zbar-dev/receipt
--- a/zbar-dev/receipt	Fri Nov 15 07:49:52 2019 +0100
+++ b/zbar-dev/receipt	Fri Nov 15 09:21:05 2019 +0100
@@ -1,21 +1,22 @@
 # SliTaz package receipt.
 
 PACKAGE="zbar-dev"
-VERSION="0.10"
+VERSION="0.23"
 CATEGORY="development"
-SHORT_DESC="Decode barcode & QR code, development code."
+SHORT_DESC="Decode barcode and QR code, development files."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://zbar.sourceforge.net/"
-WANTED="zbar"
+WEB_SITE="http://github.com/mchehab/zbar"
 
 DEPENDS="zbar pkg-config"
+WANTED="zbar"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.   
 genpkg_rules()                                      
 {
 	mkdir -p $fs/usr/lib
-	cp -a $install/usr/include $fs/usr
-	cp -a $install/usr/lib/*a $fs/usr/lib
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+
+	cp -a $install/usr/include		$fs/usr
+	cp -a $install/usr/lib/*a		$fs/usr/lib
+	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
 }
diff -r 28641e299609 -r 2850fe3df53d zbar/receipt
--- a/zbar/receipt	Fri Nov 15 07:49:52 2019 +0100
+++ b/zbar/receipt	Fri Nov 15 09:21:05 2019 +0100
@@ -1,30 +1,39 @@
 # SliTaz package receipt.
 
 PACKAGE="zbar"
-VERSION="0.10"
+VERSION="0.23"
 CATEGORY="utilities"
-SHORT_DESC="Decode barcode & QR code."
+SHORT_DESC="Decode barcode and QR code."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://zbar.sourceforge.net/"
-WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+WEB_SITE="http://github.com/mchehab/zbar"
 
-DEPENDS="jpeg imagemagick pango cairo freetype fontconfig atk gtk+ libgio"
-BUILD_DEPENDS="linux-api-headers jpeg-dev imagemagick-dev pango-dev cairo-dev \
-freetype-dev fontconfig-dev atk-dev gtk+-dev libgio-dev util-linux-uuid-dev \
-lcms-dev fftw-dev openexr-dev ilmbase-dev graphviz-dev gdk-pixbuf libxml2-dev \
-libtool"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
+
+DEPENDS="atk cairo fontconfig freetype gcc83-lib-base gtk+ 
+	imagemagick jpeg libgio pango"
+BUILD_DEPENDS="atk-dev cairo-dev fftw-dev fontconfig-dev freetype-dev 
+	gcc83 gdk-pixbuf graphviz-dev gtk+-dev ilmbase-dev imagemagick-dev 
+	jpeg-dev lcms-dev libgio-dev libtool libxml2-dev linux-api-headers 
+	openexr-dev pango-dev util-linux-uuid-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	sed -i 's|w\(and/MagickWand\.h\)|MagickW\1|' configu* zbarimg/zbarimg.c
-	./configure --prefix=/usr --mandir=/usr/share/man \
-		--localstatedir=/var \
-		--without-qt \
-		--without-python \
-		--disable-video \
+#	sed -i 's|w\(and/MagickWand\.h\)|MagickW\1|' configu* zbarimg/zbarimg.c
+
+	autoreconf -vfi &&
+	./configure			\
+		CC=gcc-83		\
+		CXX=g++-83		\
+		--prefix=/usr		\
+		--mandir=/usr/share/man	\
+		--localstatedir=/var	\
+		--without-qt		\
+		--without-python	\
+		--disable-video		\
+		--disable-doc		\
 	$CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install
@@ -34,6 +43,7 @@
 genpkg_rules()                                      
 {
 	mkdir -p $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
+
+	cp -a $install/usr/bin		$fs/usr
+	cp -a $install/usr/lib/*.so*	$fs/usr/lib
 }