* [PR PATCH] sane: fix license
@ 2019-09-18 7:05 voidlinux-github
2019-09-20 14:59 ` [PR PATCH] [Updated] " voidlinux-github
` (12 more replies)
0 siblings, 13 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-18 7:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
There is a new 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: 1511 bytes --]
From beae261a4983452d78113490f9031dd11efc0d4c Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 18 Sep 2019 09:02:39 +0200
Subject: [PATCH] sane: fix license
---
srcpkgs/sane/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index 1c2fe80b21c..f391bf468df 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -1,7 +1,7 @@
# Template file for 'sane'
pkgname=sane
version=1.0.27
-revision=2
+revision=3
wrksrc="sane-backends-${version}"
build_style=gnu-configure
build_options="snmp"
@@ -16,7 +16,7 @@ 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"
+license="GPL-2.0-or-later, SANE-exception"
distfiles="https://fossies.org/linux/misc/sane-backends-${version}.tar.xz"
checksum=9483e6789dae8117371059c95caaeda3e67dc25130f1d69ebfe926c5422e67b9
@@ -35,6 +35,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 +46,7 @@ libsane_package() {
vmove usr/lib/libsane.so.*
}
}
+
sane-devel_package() {
depends="libsane>=${version}_${revision}"
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] sane: fix license
2019-09-18 7:05 [PR PATCH] sane: fix license voidlinux-github
@ 2019-09-20 14:59 ` voidlinux-github
2019-09-20 14:59 ` voidlinux-github
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-20 14:59 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] sane: fix license
2019-09-18 7:05 [PR PATCH] sane: fix license voidlinux-github
2019-09-20 14:59 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-09-20 14:59 ` voidlinux-github
2019-09-24 21:53 ` [PR PATCH] [Updated] [WIP] sane: update to 1.0.28 voidlinux-github
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-20 14:59 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] sane: update to 1.0.28.
2019-09-18 7:05 [PR PATCH] sane: fix license voidlinux-github
` (2 preceding siblings ...)
2019-09-24 21:53 ` [PR PATCH] [Updated] [WIP] sane: update to 1.0.28 voidlinux-github
@ 2019-09-24 21:53 ` voidlinux-github
2019-09-24 22:11 ` voidlinux-github
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-24 21:53 UTC (permalink / raw)
To: ml
[-- 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: 3585 bytes --]
From bed261d8b12324e2aa5405e0cbc7b2256a26714d 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
* drop obsolete autoconf overwrite
* cleanup post_install()
* fix license
---
.../sane/{patches => }/sane-desc-cross.patch | 0
srcpkgs/sane/template | 44 ++++++++++---------
2 files changed, 23 insertions(+), 21 deletions(-)
rename srcpkgs/sane/{patches => }/sane-desc-cross.patch (100%)
diff --git a/srcpkgs/sane/patches/sane-desc-cross.patch b/srcpkgs/sane/sane-desc-cross.patch
similarity index 100%
rename from srcpkgs/sane/patches/sane-desc-cross.patch
rename to srcpkgs/sane/sane-desc-cross.patch
diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index 1c2fe80b21c..f6c3b49f2b1 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -1,48 +1,50 @@
# Template file for 'sane'
pkgname=sane
-version=1.0.27
-revision=2
+version=1.0.28
+_gitlab_release_hash=9e718daff347826f4cfe21126c8d5091
+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)"
+ --with-usb --docdir=/usr/share/doc/sane $(vopt_with snmp)"
hostmakedepends="pkg-config"
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)"
conf_files="/etc/sane.d/*.conf"
short_desc="Scanner Access Now Easy"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piraty <piraty1@inbox.ru>"
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/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" #FIXME: does this still do anything useful?
+
+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 +53,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"
}
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] sane: update to 1.0.28.
2019-09-18 7:05 [PR PATCH] sane: fix license voidlinux-github
2019-09-20 14:59 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-20 14:59 ` voidlinux-github
@ 2019-09-24 21:53 ` voidlinux-github
2019-09-24 21:53 ` voidlinux-github
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-24 21:53 UTC (permalink / raw)
To: ml
[-- 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: 3585 bytes --]
From bed261d8b12324e2aa5405e0cbc7b2256a26714d 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
* drop obsolete autoconf overwrite
* cleanup post_install()
* fix license
---
.../sane/{patches => }/sane-desc-cross.patch | 0
srcpkgs/sane/template | 44 ++++++++++---------
2 files changed, 23 insertions(+), 21 deletions(-)
rename srcpkgs/sane/{patches => }/sane-desc-cross.patch (100%)
diff --git a/srcpkgs/sane/patches/sane-desc-cross.patch b/srcpkgs/sane/sane-desc-cross.patch
similarity index 100%
rename from srcpkgs/sane/patches/sane-desc-cross.patch
rename to srcpkgs/sane/sane-desc-cross.patch
diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index 1c2fe80b21c..f6c3b49f2b1 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -1,48 +1,50 @@
# Template file for 'sane'
pkgname=sane
-version=1.0.27
-revision=2
+version=1.0.28
+_gitlab_release_hash=9e718daff347826f4cfe21126c8d5091
+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)"
+ --with-usb --docdir=/usr/share/doc/sane $(vopt_with snmp)"
hostmakedepends="pkg-config"
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)"
conf_files="/etc/sane.d/*.conf"
short_desc="Scanner Access Now Easy"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piraty <piraty1@inbox.ru>"
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/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" #FIXME: does this still do anything useful?
+
+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 +53,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"
}
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] sane: update to 1.0.28.
2019-09-18 7:05 [PR PATCH] sane: fix license voidlinux-github
` (3 preceding siblings ...)
2019-09-24 21:53 ` voidlinux-github
@ 2019-09-24 22:11 ` voidlinux-github
2019-09-24 22:11 ` voidlinux-github
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-24 22:11 UTC (permalink / raw)
To: ml
[-- 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: 3066 bytes --]
From 7457d4ef45dfde9708372c2b4fc92c7a711f70f7 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..2c6621b3893 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" #FIXME: does this still do anything useful?
+
+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"
}
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] sane: update to 1.0.28.
2019-09-18 7:05 [PR PATCH] sane: fix license voidlinux-github
` (4 preceding siblings ...)
2019-09-24 22:11 ` voidlinux-github
@ 2019-09-24 22:11 ` voidlinux-github
2019-09-25 19:43 ` voidlinux-github
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-24 22:11 UTC (permalink / raw)
To: ml
[-- 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: 3066 bytes --]
From 7457d4ef45dfde9708372c2b4fc92c7a711f70f7 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..2c6621b3893 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" #FIXME: does this still do anything useful?
+
+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"
}
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] sane: update to 1.0.28.
2019-09-18 7:05 [PR PATCH] sane: fix license voidlinux-github
` (6 preceding siblings ...)
2019-09-25 19:43 ` voidlinux-github
@ 2019-09-25 19:43 ` voidlinux-github
2019-09-25 19:56 ` voidlinux-github
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-25 19:43 UTC (permalink / raw)
To: ml
[-- 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"
}
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] sane: update to 1.0.28.
2019-09-18 7:05 [PR PATCH] sane: fix license voidlinux-github
` (5 preceding siblings ...)
2019-09-24 22:11 ` voidlinux-github
@ 2019-09-25 19:43 ` voidlinux-github
2019-09-25 19:43 ` voidlinux-github
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-25 19:43 UTC (permalink / raw)
To: ml
[-- 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"
}
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] sane: update to 1.0.28.
2019-09-18 7:05 [PR PATCH] sane: fix license voidlinux-github
` (7 preceding siblings ...)
2019-09-25 19:43 ` voidlinux-github
@ 2019-09-25 19:56 ` voidlinux-github
2019-09-25 19:56 ` voidlinux-github
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-25 19:56 UTC (permalink / raw)
To: ml
[-- 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"
}
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] sane: update to 1.0.28.
2019-09-18 7:05 [PR PATCH] sane: fix license voidlinux-github
` (8 preceding siblings ...)
2019-09-25 19:56 ` voidlinux-github
@ 2019-09-25 19:56 ` voidlinux-github
2019-09-25 20:24 ` voidlinux-github
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-25 19:56 UTC (permalink / raw)
To: ml
[-- 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"
}
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] sane: update to 1.0.28.
2019-09-18 7:05 [PR PATCH] sane: fix license voidlinux-github
` (9 preceding siblings ...)
2019-09-25 19:56 ` voidlinux-github
@ 2019-09-25 20:24 ` voidlinux-github
2019-09-25 20:24 ` voidlinux-github
2019-09-30 22:55 ` [PR PATCH] [Merged]: " voidlinux-github
12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-25 20:24 UTC (permalink / raw)
To: ml
[-- 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: 4050 bytes --]
From f683ac04690b484573da0fae1bf0d28e1f3b2151 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/patches/sane-desc-cross.patch | 2 +-
srcpkgs/sane/template | 41 ++++++++++++----------
2 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/sane/patches/sane-desc-cross.patch b/srcpkgs/sane/patches/sane-desc-cross.patch
index 168a768f966..5999809da9c 100644
--- a/srcpkgs/sane/patches/sane-desc-cross.patch
+++ b/srcpkgs/sane/patches/sane-desc-cross.patch
@@ -5,7 +5,7 @@
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 $@
++ cc -I. sane-desc.c -I../include ../sanei/sanei_config.c ../sanei/sanei_init_debug.c ../sanei/sanei_constrain_value.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..77fa2eccdff 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,40 @@ 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
-
-post_install() {
- # fix hp officejets
- echo "#hpaio" >> ${DESTDIR}/etc/sane.d/dll.conf
+distfiles="https://gitlab.com/sane-project/backends/uploads/${_gitlab_release_hash}/sane-backends-${version}.tar.gz"
+checksum=31260f3f72d82ac1661c62c5a4468410b89fb2b4a811dabbfcc0350c1346de03
- vinstall ${FILESDIR}/saned.xinetd 644 etc/xinetd.d saned.conf
- vinstall ${wrksrc}/tools/sane-backends.pc 644 usr/lib/pkgconfig
+build_options="snmp"
+post_build() {
# generate udev file
cd tools
mkdir -p udev
make 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
+
# 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 +56,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"
}
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] sane: update to 1.0.28.
2019-09-18 7:05 [PR PATCH] sane: fix license voidlinux-github
` (10 preceding siblings ...)
2019-09-25 20:24 ` voidlinux-github
@ 2019-09-25 20:24 ` voidlinux-github
2019-09-30 22:55 ` [PR PATCH] [Merged]: " voidlinux-github
12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-25 20:24 UTC (permalink / raw)
To: ml
[-- 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: 4050 bytes --]
From f683ac04690b484573da0fae1bf0d28e1f3b2151 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/patches/sane-desc-cross.patch | 2 +-
srcpkgs/sane/template | 41 ++++++++++++----------
2 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/sane/patches/sane-desc-cross.patch b/srcpkgs/sane/patches/sane-desc-cross.patch
index 168a768f966..5999809da9c 100644
--- a/srcpkgs/sane/patches/sane-desc-cross.patch
+++ b/srcpkgs/sane/patches/sane-desc-cross.patch
@@ -5,7 +5,7 @@
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 $@
++ cc -I. sane-desc.c -I../include ../sanei/sanei_config.c ../sanei/sanei_init_debug.c ../sanei/sanei_constrain_value.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..77fa2eccdff 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,40 @@ 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
-
-post_install() {
- # fix hp officejets
- echo "#hpaio" >> ${DESTDIR}/etc/sane.d/dll.conf
+distfiles="https://gitlab.com/sane-project/backends/uploads/${_gitlab_release_hash}/sane-backends-${version}.tar.gz"
+checksum=31260f3f72d82ac1661c62c5a4468410b89fb2b4a811dabbfcc0350c1346de03
- vinstall ${FILESDIR}/saned.xinetd 644 etc/xinetd.d saned.conf
- vinstall ${wrksrc}/tools/sane-backends.pc 644 usr/lib/pkgconfig
+build_options="snmp"
+post_build() {
# generate udev file
cd tools
mkdir -p udev
make 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
+
# 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 +56,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"
}
}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Merged]: sane: update to 1.0.28.
2019-09-18 7:05 [PR PATCH] sane: fix license voidlinux-github
` (11 preceding siblings ...)
2019-09-25 20:24 ` voidlinux-github
@ 2019-09-30 22:55 ` voidlinux-github
12 siblings, 0 replies; 14+ messages in thread
From: voidlinux-github @ 2019-09-30 22:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
There's a merged pull request on the void-packages repository
sane: update to 1.0.28.
https://github.com/void-linux/void-packages/pull/14545
Description:
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2019-09-30 22:55 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-18 7:05 [PR PATCH] sane: fix license voidlinux-github
2019-09-20 14:59 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-20 14:59 ` voidlinux-github
2019-09-24 21:53 ` [PR PATCH] [Updated] [WIP] sane: update to 1.0.28 voidlinux-github
2019-09-24 21:53 ` voidlinux-github
2019-09-24 22:11 ` voidlinux-github
2019-09-24 22:11 ` voidlinux-github
2019-09-25 19:43 ` voidlinux-github
2019-09-25 19:43 ` voidlinux-github
2019-09-25 19:56 ` voidlinux-github
2019-09-25 19:56 ` voidlinux-github
2019-09-25 20:24 ` voidlinux-github
2019-09-25 20:24 ` voidlinux-github
2019-09-30 22:55 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).