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"