Re: [PR PATCH] [Updated] sane: fix license

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 310 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

sane: fix license


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: 3335 bytes --]

From e691d3cc641005a62a31506d416c2748e9a5ae30 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.

---
 srcpkgs/sane/patches/sane-desc-cross.patch | 12 ------------
 srcpkgs/sane/template                      | 22 +++++++++++++++-------
 2 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/sane/patches/sane-desc-cross.patch

diff --git a/srcpkgs/sane/patches/sane-desc-cross.patch b/srcpkgs/sane/patches/sane-desc-cross.patch
deleted file mode 100644
index 168a768f966..00000000000
--- a/srcpkgs/sane/patches/sane-desc-cross.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- tools/Makefile.in
-+++ tools/Makefile.in
-@@ -531,7 +531,7 @@ gamma4scanimage$(EXEEXT): $(gamma4scanimage_OBJECTS) $(gamma4scanimage_DEPENDENC
- 
- sane-desc$(EXEEXT): $(sane_desc_OBJECTS) $(sane_desc_DEPENDENCIES) $(EXTRA_sane_desc_DEPENDENCIES) 
- 	@rm -f sane-desc$(EXEEXT)
--	$(AM_V_CCLD)$(LINK) $(sane_desc_OBJECTS) $(sane_desc_LDADD) $(LIBS)
-+	cc -I. sane-desc.c -I../include ../sanei/sanei_config.c ../sanei/sanei_init_debug.c ../sanei/sanei_constrain_value.c ../lib/isfdtype.c -o $@
- 
- sane-find-scanner$(EXEEXT): $(sane_find_scanner_OBJECTS) $(sane_find_scanner_DEPENDENCIES) $(EXTRA_sane_find_scanner_DEPENDENCIES) 
- 	@rm -f sane-find-scanner$(EXEEXT)
-
diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index 1c2fe80b21c..9d2d63cd3a0 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -1,14 +1,14 @@
 # Template file for 'sane'
 pkgname=sane
-version=1.0.27
-revision=2
-wrksrc="sane-backends-${version}"
+version=1.0.28
+revision=1
+wrksrc="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)"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config autoconf"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
  v4l-utils-devel libusb-devel libressl-devel $(vopt_if snmp net-snmp-devel)"
 depends="$(vopt_if snmp net-snmp)"
@@ -16,9 +16,13 @@ conf_files="/etc/sane.d/*.conf"
 short_desc="Scanner Access Now Easy"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="http://www.sane-project.org/"
-license="GPL-2"
-distfiles="https://fossies.org/linux/misc/sane-backends-${version}.tar.xz"
-checksum=9483e6789dae8117371059c95caaeda3e67dc25130f1d69ebfe926c5422e67b9
+license="GPL-2.0-or-later, SANE-exception"
+distfiles="https://gitlab.com/sane-project/backends/-/archive/${version}/backends-${version}.tar.gz"
+checksum=243fbc2b0249b53bae3fd3ceb83eaea0050f0deb8422e1ef123293245a297554
+
+pre_configure() {
+	./autogen.sh
+}
 
 post_install() {
 	# fix hp officejets
@@ -35,6 +39,9 @@ post_install() {
 	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
+
+	vlicense LICENSE
+	sed -n "1,43 p" ${wrksrc}/backend/dll.c > ${DESTDIR}/usr/share/licenses/sane/SANE-EXCEPTION
 }
 
 libsane_package() {
@@ -43,6 +50,7 @@ libsane_package() {
 		vmove usr/lib/libsane.so.*
 	}
 }
+
 sane-devel_package() {
 	depends="libsane>=${version}_${revision}"
 	short_desc+=" - development files"