Re: [PR PATCH] [Updated] [WIP] sane: update to 1.0.28.

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

There is an updated pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages sane-license
https://github.com/void-linux/void-packages/pull/14545

[WIP] sane: update to 1.0.28.


A patch file from https://github.com/void-linux/void-packages/pull/14545.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sane-license-14545.patch --]
[-- Type: text/x-diff, Size: 3022 bytes --]

From 8846e93cae77cb5a9e69ecb0b78941902d64e185 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 18 Sep 2019 09:02:39 +0200
Subject: [PATCH] sane: update to 1.0.28.

* release tarballs are now provided on gitlab
* cleanup post_install()
* fix license
---
 srcpkgs/sane/template | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index 1c2fe80b21c..f1e9cd9a02e 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -1,10 +1,10 @@
 # Template file for 'sane'
 pkgname=sane
-version=1.0.27
-revision=2
+_gitlab_release_hash=9e718daff347826f4cfe21126c8d5091
+version=1.0.28
+revision=1
 wrksrc="sane-backends-${version}"
 build_style=gnu-configure
-build_options="snmp"
 configure_args="--disable-locking --enable-avahi --enable-ipv6 --enable-pthread
  --with-usb --docdir=/usr/share/doc/sane ac_cv_func_mmap_fixed_mapped=yes
  $(vopt_with snmp)"
@@ -14,35 +14,38 @@ makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
 depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"
 short_desc="Scanner Access Now Easy"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piraty <piraty1@inbox.ru>"
+license="GPL-2.0-or-later, SANE-exception"
 homepage="http://www.sane-project.org/"
-license="GPL-2"
-distfiles="https://fossies.org/linux/misc/sane-backends-${version}.tar.xz"
-checksum=9483e6789dae8117371059c95caaeda3e67dc25130f1d69ebfe926c5422e67b9
+distfiles="https://gitlab.com/sane-project/backends/uploads/${_gitlab_release_hash}/sane-backends-${version}.tar.gz"
+checksum=31260f3f72d82ac1661c62c5a4468410b89fb2b4a811dabbfcc0350c1346de03
 
-post_install() {
-	# fix hp officejets
-	echo "#hpaio" >> ${DESTDIR}/etc/sane.d/dll.conf
+build_options="snmp"
+
+post_build() {
+	# generate udev file
+	make -C tools udev/libsane.rules
+}
 
+post_install() {
 	vinstall ${FILESDIR}/saned.xinetd 644 etc/xinetd.d saned.conf
 	vinstall ${wrksrc}/tools/sane-backends.pc 644 usr/lib/pkgconfig
 
-	# generate udev file
-	cd tools
-	mkdir -p udev
-	make udev/libsane.rules
 	# install udev file
-	vinstall udev/libsane.rules 644 usr/lib/udev/rules.d 49-sane.rules
-	# fix udev rules
-	sed -i 's|NAME="%k", ||g' ${DESTDIR}/usr/lib/udev/rules.d/49-sane.rules
+	vinstall tools/udev/libsane.rules 644 usr/lib/udev/rules.d 49-sane.rules
+
+	vlicense LICENSE # License clarification
+	vlicense COPYING # GPL-2.0
+	sed -n "1,43 p" "${wrksrc}/backend/dll.c" > "${DESTDIR}/usr/share/licenses/sane/SANE-EXCEPTION"
 }
 
 libsane_package() {
 	short_desc+=" - runtime shared library"
 	pkg_install() {
-		vmove usr/lib/libsane.so.*
+		vmove "usr/lib/libsane.so.*"
 	}
 }
+
 sane-devel_package() {
 	depends="libsane>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -51,6 +54,6 @@ sane-devel_package() {
 		vmove usr/bin/sane-config
 		vmove usr/share/man/man1/sane-config.1
 		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.so"
 	}
 }