wok rev 24035

updated sane-backends and sane-backends-dev (1.0.22 -> 1.0.24)
author Hans-G?nter Theisgen
date Sun Apr 11 15:30:14 2021 +0100 (4 weeks ago)
parents 6b6d14c9f7e9
children ef4ee17e784f
files sane-backends-dev/receipt sane-backends-lang/receipt sane-backends/receipt
line diff
     1.1 --- a/sane-backends-dev/receipt	Thu Apr 08 09:21:26 2021 +0000
     1.2 +++ b/sane-backends-dev/receipt	Sun Apr 11 15:30:14 2021 +0100
     1.3 @@ -1,21 +1,19 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="sane-backends-dev"
     1.7 -VERSION="1.0.22"
     1.8 +VERSION="1.0.24"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="Sane devel files."
    1.11 +SHORT_DESC="Scanner Access Now Easy - development files."
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14 -WANTED="sane-backends"
    1.15  WEB_SITE="http://www.sane-project.org/"
    1.16  
    1.17 -DEPENDS="sane-backends"
    1.18 +WANTED="sane-backends"
    1.19  
    1.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.21  genpkg_rules()
    1.22  {
    1.23  	mkdir -p $fs/usr/lib
    1.24 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.25 -	cp -a $install/usr/include $fs/usr
    1.26 +	cp -a $install/usr/lib/*.*a	$fs/usr/lib
    1.27 +	cp -a $install/usr/include	$fs/usr
    1.28  }
    1.29 -
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/sane-backends-lang/receipt	Sun Apr 11 15:30:14 2021 +0100
     2.3 @@ -0,0 +1,18 @@
     2.4 +# SliTaz package receipt.
     2.5 +
     2.6 +PACKAGE="sane-backends-lang"
     2.7 +VERSION="1.0.24"
     2.8 +CATEGORY="system-tools"
     2.9 +SHORT_DESC="Scanner Access Now Easy - localised messages."
    2.10 +MAINTAINER="maintainer@slitaz.org"
    2.11 +LICENSE="GPL2"
    2.12 +WEB_SITE="http://www.sane-project.org/"
    2.13 +
    2.14 +WANTED="sane-backends"
    2.15 +
    2.16 +# Rules to gen a SliTaz package suitable for Tazpkg.
    2.17 +genpkg_rules()
    2.18 +{
    2.19 +	mkdir -p $fs/usr/share
    2.20 +	cp -a $install/usr/share/locale	$fs/usr/share
    2.21 +}
     3.1 --- a/sane-backends/receipt	Thu Apr 08 09:21:26 2021 +0000
     3.2 +++ b/sane-backends/receipt	Sun Apr 11 15:30:14 2021 +0100
     3.3 @@ -1,63 +1,77 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="sane-backends"
     3.7 -VERSION="1.0.22"
     3.8 +VERSION="1.0.24"
     3.9  CATEGORY="system-tools"
    3.10  SHORT_DESC="Scanner Access Now Easy."
    3.11  MAINTAINER="pankso@slitaz.org"
    3.12  LICENSE="GPL2"
    3.13 +WEB_SITE="http://www.sane-project.org/"
    3.14 +
    3.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.16 -WEB_SITE="http://www.sane-project.org/"
    3.17 -WGET_URL="ftp://ftp2.sane-project.org/pub/sane/$PACKAGE-$VERSION/$TARBALL"
    3.18 +WGET_URL="https://gitlab.com/sane-project/backends/-/archive/RELEASE_${VERSION//./_}/backends-RELEASE_${VERSION//./_}.tar.gz"
    3.19  
    3.20 -DEPENDS="libusb-compat jpeg tiff zlib libgphoto2 libv4l libltdl"
    3.21 -BUILD_DEPENDS="libusb-compat-dev jpeg-dev tiff-dev zlib-dev libv4l-dev \
    3.22 -libgphoto2-dev libtool"
    3.23 -SUGGESTED="imagemagick gocr tesseract-ocr"
    3.24 +DEPENDS="jpeg libgphoto2 libltdl libusb-compat libv4l tiff zlib"
    3.25 +BUILD_DEPENDS="jpeg-dev libgphoto2-dev libtool libusb-compat-dev 
    3.26 +	libv4l-dev tiff-dev zlib-dev"
    3.27 +SUGGESTED="gocr imagemagick sane-backends-lang tesseract-ocr"
    3.28  
    3.29  # Rules to configure and make the package.
    3.30  compile_rules()
    3.31  {
    3.32 -	sed -i 's|prefix}/doc|prefix}/share/doc|' configure
    3.33 -	patch -Np1 -i $stuff/libv4l-0.8.3.patch
    3.34 +	# 1.0.24: no longer needed
    3.35 +#	sed -i 's|prefix}/doc|prefix}/share/doc|' configure
    3.36 +
    3.37 +	# 1.0.24: no longer needed
    3.38 +#	patch -Np1 -i $stuff/libv4l-0.8.3.patch
    3.39 +
    3.40 +	# 1.0.24: no longer needed
    3.41  	# fix https://bugs.archlinux.org/task/26114
    3.42 -	patch -Np1 -i $stuff/xerox_mfp_fix_usb_devices.patch
    3.43 -	./configure \
    3.44 -		--prefix=/usr \
    3.45 -		--sysconfdir=/etc \
    3.46 -		--mandir=/usr/share/man \
    3.47 +#	patch -Np1 -i $stuff/xerox_mfp_fix_usb_devices.patch
    3.48 +
    3.49 +	./configure						\
    3.50 +		--prefix=/usr					\
    3.51 +                --with-docdir=/usr/share/doc/$PACKAGE-$VERSION  \
    3.52 +		--sysconfdir=/etc				\
    3.53 +		--mandir=/usr/share/man				\
    3.54  		$CONFIGURE_ARGS &&
    3.55  	make &&
    3.56  	make -j 1 DESTDIR=$DESTDIR install
    3.57  
    3.58  	# copy the missing udev rule
    3.59 -	[ ! -d $DESTDIR/etc/udev/rules.d ] && mkdir -p $DESTDIR/etc/udev/rules.d
    3.60 -	cp -a $src/tools/udev/libsane.rules $DESTDIR/etc/udev/rules.d/55-sane.rules
    3.61 +	[ ! -d $DESTDIR/etc/udev/rules.d ] &&
    3.62 +		mkdir -p $DESTDIR/etc/udev/rules.d
    3.63 +	cp -a $src/tools/udev/libsane.rules	\
    3.64 +		$DESTDIR/etc/udev/rules.d/55-sane.rules
    3.65  }
    3.66  
    3.67  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.68  genpkg_rules()
    3.69  {
    3.70 -	mkdir -p $fs/usr/lib $fs/usr/share \
    3.71 -	         $fs/var/lock/sane $fs/etc/sane.d \
    3.72 -	         $fs/var/www/tazpanel/lib \
    3.73 -	         $fs/var/www/tazpanel/report.d \
    3.74 -	         $fs/var/www/tazpanel/menu.d/hardware \
    3.75 -	         $fs/var/www/tazpanel/styles/default/images
    3.76 -	
    3.77 -	cp -a $install/etc/sane.d $fs/etc
    3.78 -	cp -a $install/usr/bin $fs/usr
    3.79 -	cp -a $install/usr/sbin $fs/usr
    3.80 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    3.81 -	cp -a $install/usr/lib/sane $fs/usr/lib
    3.82 -	cp -a $install/usr/share/sane $fs/usr/share
    3.83 -	cp $stuff/tazpanel/sane.cgi $fs/var/www/tazpanel/
    3.84 -	cp $stuff/tazpanel/sane $fs/var/www/tazpanel/report.d/
    3.85 -	cp $stuff/tazpanel/crop.js $fs/var/www/tazpanel/lib/
    3.86 -	cp $stuff/tazpanel/drag.gif $fs/var/www/tazpanel/styles/default/images/
    3.87 -	ln -s ../../sane.cgi $fs/var/www/tazpanel/menu.d/hardware/sane
    3.88 -	
    3.89 -	# fix groups/permissions on /var/lock/sane ; add it to scanner group
    3.90 +	mkdir -p $fs/etc/sane.d
    3.91 +	mkdir -p $fs/usr/lib
    3.92 +	mkdir -p $fs/usr/share
    3.93 +	mkdir -p $fs/var/lock/sane
    3.94 +	mkdir -p $fs/var/www/tazpanel/lib
    3.95 +	mkdir -p $fs/var/www/tazpanel/menu.d/hardware
    3.96 +	mkdir -p $fs/var/www/tazpanel/report.d
    3.97 +	mkdir -p $fs/var/www/tazpanel/styles/default/images
    3.98 +
    3.99 +	cp -a $install/etc/sane.d	$fs/etc
   3.100 +
   3.101 +	cp -a $install/usr/bin		$fs/usr
   3.102 +	cp -a $install/usr/sbin		$fs/usr
   3.103 +	cp -a $install/usr/lib/*.so*	$fs/usr/lib
   3.104 +	cp -a $install/usr/lib/sane	$fs/usr/lib
   3.105 +	cp -a $install/usr/share/sane	$fs/usr/share
   3.106 +
   3.107 +	cp $stuff/tazpanel/sane.cgi	$fs/var/www/tazpanel/
   3.108 +	cp $stuff/tazpanel/sane		$fs/var/www/tazpanel/report.d/
   3.109 +	cp $stuff/tazpanel/crop.js	$fs/var/www/tazpanel/lib/
   3.110 +	cp $stuff/tazpanel/drag.gif	$fs/var/www/tazpanel/styles/default/images/
   3.111 +	ln -s ../../sane.cgi		$fs/var/www/tazpanel/menu.d/hardware/sane
   3.112 +
   3.113 +	# fix groups and permissions on /var/lock/sane ; add it to scanner group
   3.114  	chmod 775 "$fs/var/lock/sane"
   3.115  	chgrp 96 "$fs/var/lock/sane"
   3.116     
   3.117 @@ -70,21 +84,24 @@
   3.118  	tazpkg reconfigure udev --root="$1"
   3.119  	
   3.120  	# add group scanner
   3.121 -	if ! grep -q scanner "$1/etc/group" ; then
   3.122 +	if ! grep -q scanner "$1/etc/group"
   3.123 +	  then
   3.124  		chroot "$1/" addgroup -g 96 scanner
   3.125  	fi
   3.126 -	chroot "$1/" chgrp scanner /usr/bin/scanimage
   3.127 -	chmod 4750 $1/usr/bin/scanimage
   3.128 -	
   3.129 +
   3.130 +	chroot "$1/" chgrp scanner	/usr/bin/scanimage
   3.131 +	chmod 4750			$1/usr/bin/scanimage
   3.132 +
   3.133  	echo
   3.134 -	echo " ADD yourself to group scanner to use sane: addgroup tux scanner"
   3.135 +	echo " ADD user(s) to group scanner to use sane: addgroup <user> scanner"
   3.136  	
   3.137  	rm -f "$1"/var/cache/tazpanel/* 2> /dev/null
   3.138  	[ -e "$1/var/www/tazpanel/tmp" ] ||
   3.139 -	ln -s /tmp "$1/var/www/tazpanel/tmp"
   3.140 +		ln -s /tmp "$1/var/www/tazpanel/tmp"
   3.141  }
   3.142  
   3.143  post_remove()
   3.144  {
   3.145 +	# delete group scanner
   3.146  	chroot "$1/" delgroup scanner & >/dev/null
   3.147  }