Github messages for voidlinux
 help / color / mirror / Atom feed
From: Piraty <Piraty@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] sane: update to 1.0.32.
Date: Mon, 04 Oct 2021 23:58:34 +0200	[thread overview]
Message-ID: <20211004215834.WvcL0WYT90HjuF2SEcfXsHOSFZc-9A_YrDy55lbY564@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33328@inbox.vuxu.org>

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

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

https://github.com/Piraty/void-packages sane-1.0.32
https://github.com/void-linux/void-packages/pull/33328

sane: update to 1.0.32.
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

I scaned using this version of sane, and this (https://github.com/void-linux/void-packages/pull/33325) version of simple-scan

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

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

From d3edd59c6e62c467b919979a5f0c6c33322ac331 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 4 Oct 2021 22:46:36 +0200
Subject: [PATCH] sane: update to 1.0.32.

---
 srcpkgs/sane/template | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index 35dac1cc846a..4e8cdab17d61 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -1,14 +1,14 @@
 # Template file for 'sane'
 pkgname=sane
-_gitlab_release_hash=8bf1cae2e1803aefab9e5331550e5d5d
-version=1.0.31
-revision=3
+_gitlab_release_hash=104f09c07d35519cc8e72e604f11643f
+version=1.0.32
+revision=1
 wrksrc="sane-backends-${version}"
 build_style=gnu-configure
 configure_args="--disable-locking --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 python3"
 makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
  v4l-utils-devel libusb-devel openssl-devel libxml2-devel
  $(vopt_if snmp net-snmp-devel)"
@@ -16,14 +16,19 @@ depends="$(vopt_if snmp net-snmp)"
 conf_files="/etc/sane.d/*.conf"
 short_desc="Scanner Access Now Easy"
 maintainer="Piraty <piraty1@inbox.ru>"
-license="GPL-2.0-or-later, SANE-exception"
+license="custom:GPL-2.0-or-later-with-SANE-exception"
 homepage="http://www.sane-project.org/"
 distfiles="https://gitlab.com/sane-project/backends/uploads/${_gitlab_release_hash}/sane-backends-${version}.tar.gz"
-checksum=4a3b10fcb398ed854777d979498645edfe66fcac2f2fd2b9117a79ff45e2a5aa
+checksum=3a28c237c0a72767086202379f6dc92dbb63ec08dfbab22312cba80e238bb114
 noshlibprovides="avoid false detection of device drivers"
 
 build_options="snmp"
 
+# tests broken on 32bit.  https://gitlab.com/sane-project/backends/-/issues/157
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
+	make_check=no
+fi
+
 post_build() {
 	# generate udev file
 	cd tools
@@ -39,7 +44,9 @@ post_install() {
 
 	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"
+	sed -n \
+		-e "/\/* sane - Scanner Access Now Easy./,/dynamic linking to load backends on demand./p" \
+		"${wrksrc}/backend/dll.c" > "${DESTDIR}/usr/share/licenses/sane/SANE-EXCEPTION"
 }
 
 libsane_package() {

  reply	other threads:[~2021-10-04 21:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-04 21:46 [PR PATCH] " Piraty
2021-10-04 21:58 ` Piraty [this message]
2021-10-05 19:22 ` [PR PATCH] [Updated] " Piraty
2021-10-12 19:23 ` [PR PATCH] [Merged]: " ericonr

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211004215834.WvcL0WYT90HjuF2SEcfXsHOSFZc-9A_YrDy55lbY564@z \
    --to=piraty@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    --subject='Re: [PR PATCH] [Updated] sane: update to 1.0.32.' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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).