From: jbenden <jbenden@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] imagescan: update to 3.65.0.
Date: Fri, 03 Sep 2021 22:54:31 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32825@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]
There is a new pull request by jbenden against master on the void-packages repository
https://github.com/jbenden/void-packages imagescan-3.65.0
https://github.com/void-linux/void-packages/pull/32825
imagescan: update to 3.65.0.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### 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
#### Additional Information
I purchased a new EPSON printer and could not get it to completely work (mostly scanning). So I underwent the process to upgrade the components (this PR). Afterwards all printer functionality is working (print, scan, etc.).
I want to point out it was NOT trivial to make the scanner functionality work. I'd recommend that a documentation page be added to cover the additional bits that I've placed in the `INSTALL.msg` file; unless you think it is sufficient. Please advise.
A patch file from https://github.com/void-linux/void-packages/pull/32825.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-imagescan-3.65.0-32825.patch --]
[-- Type: text/x-diff, Size: 4638 bytes --]
From c231158484a97b53ea4ee1201f5d81fd86736380 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Fri, 3 Sep 2021 13:30:42 -0700
Subject: [PATCH] imagescan: update to 3.65.0.
Signed-off-by: Joseph Benden <joe@benden.us>
---
.../imagescan-plugin-networkscan/INSTALL.msg | 23 +++++++++++++++++++
srcpkgs/imagescan-plugin-networkscan/template | 8 +++----
srcpkgs/imagescan/patches/fix-iostream.patch | 20 ----------------
srcpkgs/imagescan/template | 10 ++++----
4 files changed, 32 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/imagescan/patches/fix-iostream.patch
diff --git a/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg b/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg
index 56865d74a9ec..7a3147e7a253 100644
--- a/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg
+++ b/srcpkgs/imagescan-plugin-networkscan/INSTALL.msg
@@ -1 +1,24 @@
Please read /usr/share/doc/imagescan-plugin-networkscan/README
+
+CRITICAL: The documentation all mention the use of:
+
+ /etc/imagescan/imagescan.conf
+
+But this is incorrect. The correct path is:
+
+ /etc/utsushi/utsushi.conf
+
+The discrepancy stems from the difference in use of software
+provided from EPSON(TM) verses the downstream open-source
+project.
+
+An example of a working configuration is:
+```
+[devices]
+
+net.udi = networkscan:esci://192.168.1.98:1865
+net.vendor = Epson
+net.model = ET-2760
+net.name = Epson Network Scanner
+```
+
diff --git a/srcpkgs/imagescan-plugin-networkscan/template b/srcpkgs/imagescan-plugin-networkscan/template
index b36c8c2c59d6..1b9d1494b53e 100644
--- a/srcpkgs/imagescan-plugin-networkscan/template
+++ b/srcpkgs/imagescan-plugin-networkscan/template
@@ -1,9 +1,9 @@
# Template file for 'imagescan-plugin-networkscan'
pkgname=imagescan-plugin-networkscan
-version=1.1.3
+version=1.1.4
revision=1
archs="i686 x86_64"
-_bversion=3.63.0
+_bversion=3.65.0
_dst=ubuntu
_rel=18.04
build_style=fetch
@@ -17,12 +17,12 @@ case "${XBPS_TARGET_MACHINE}" in
x86_64)
_type=x64
_arch=amd64
- _hash=318372a594fdff4d0f1d5dbe4d7d818036ee7f78edbb6d14ed1ad49b1c057c51
+ _hash=bbc171780e079ba65ef7817b3eb7bed419faa1b09080f6ac72cd3731bc3dc930
;;
i686)
_type=x86
_arch=i386
- _hash=412430d264fb3c3e80e5a22ecacec774b8a52d95b26db0930a17e4e58bd7e52c
+ _hash=aa7c67a8b6a513bb7f5d0fb952c8bd3cf7d2dfe7fe26c87b745d5f99f5187d49
;;
esac
diff --git a/srcpkgs/imagescan/patches/fix-iostream.patch b/srcpkgs/imagescan/patches/fix-iostream.patch
deleted file mode 100644
index 11ac322741df..000000000000
--- a/srcpkgs/imagescan/patches/fix-iostream.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/utsushi/string.hpp 2019-04-02 02:01:37.000000000 +0200
-+++ b/utsushi/string.hpp 2021-01-19 00:58:03.102000070 +0100
-@@ -23,6 +23,7 @@
-
- #include <iosfwd>
-+#include <iostream>
- #include <string>
-
- #include <boost/operators.hpp>
-
---- a/utsushi/toggle.hpp 2019-04-02 02:01:36.000000000 +0200
-+++ b/utsushi/toggle.hpp 2021-01-19 01:00:34.884821885 +0100
-@@ -22,6 +22,7 @@
- #define utsushi_toggle_hpp_
-
- #include <iosfwd>
-+#include <iostream>
- #include <boost/operators.hpp>
-
- namespace utsushi {
diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template
index 0a0cb5e2b3f8..5e351a808240 100644
--- a/srcpkgs/imagescan/template
+++ b/srcpkgs/imagescan/template
@@ -1,22 +1,22 @@
# Template file for 'imagescan'
pkgname=imagescan
-version=3.55.0
-revision=2
-wrksrc=utsushi-0.55.0
+version=3.65.0
+revision=1
+wrksrc=utsushi-0.65.0
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-gtkmm --enable-sane-config --with-sane-confdir=/etc/sane.d --enable-udev-config
--with-udev-confdir=/usr/lib/udev --with-jpeg --with-magick --with-sane --with-tiff"
conf_files="/etc/utsushi/combo.conf"
hostmakedepends="ImageMagick pkg-config sane"
-makedepends="boost-devel eudev-libudev-devel gtkmm2-devel libusb-devel sane-devel"
+makedepends="boost-devel eudev-libudev-devel gtkmm2-devel pango-devel libusb-devel sane-devel"
depends="ImageMagick"
short_desc="EPSON Image Scan v3 front-end and backend for scanners and all-in-ones"
maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/utsushi/imagescan/"
distfiles="http://support.epson.net/linux/src/scanner/imagescanv3/debian/${pkgname}_${version}.orig.tar.gz"
-checksum=9440b103b8218863ab08e891d2a9dc9ef52db51485e11017d52fb2036e279477
+checksum=e83704398c51a3166fd62c25b89e95cf6262e52f3dc6e627db3e7556e2220d64
mutable_files="/etc/sane.d/dll.d/utsushi"
CFLAGS="-Wno-error"
next reply other threads:[~2021-09-03 20:54 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 20:54 jbenden [this message]
2021-09-04 7:44 ` [PR PATCH] [Updated] " jbenden
2021-09-04 20:25 ` jbenden
2021-09-04 21:29 ` jbenden
2021-09-04 21:30 ` jbenden
2021-09-05 18:43 ` [PR REVIEW] " ericonr
2021-09-05 18:43 ` ericonr
2021-09-05 18:51 ` jbenden
2021-09-05 18:53 ` [PR REVIEW] " jbenden
2021-09-05 18:54 ` ahesford
2021-09-05 19:01 ` jbenden
2021-09-05 19:03 ` jbenden
2021-09-05 19:03 ` [PR PATCH] [Closed]: " jbenden
2021-09-05 20:00 ` ahesford
2021-09-05 20:10 ` jbenden
2021-09-05 20:15 ` ahesford
2021-09-05 21:32 ` jbenden
2021-09-05 21:34 ` jbenden
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32825@inbox.vuxu.org \
--to=jbenden@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).