From d5cb65ac1e6f31086d7d01773ebb2105a08e3267 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 12 Nov 2017 15:46:09 +0100
Subject: [PATCH] iscan: update to 2.30.3

Closes #9124.
---
 srcpkgs/iscan/patches/jpegstream.cc.patch | 11 +++++++++++
 srcpkgs/iscan/patches/uchar.patch         | 10 ++++++++++
 srcpkgs/iscan/template                    | 14 ++++++++++----
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/iscan/patches/jpegstream.cc.patch
 create mode 100644 srcpkgs/iscan/patches/uchar.patch

diff --git a/srcpkgs/iscan/patches/jpegstream.cc.patch b/srcpkgs/iscan/patches/jpegstream.cc.patch
new file mode 100644
index 00000000000..28f2dd54af5
--- /dev/null
+++ b/srcpkgs/iscan/patches/jpegstream.cc.patch
@@ -0,0 +1,11 @@
+--- lib/jpegstream.cc.orig	2016-08-19 11:14:06.000000000 +0200
++++ lib/jpegstream.cc	2017-11-12 08:37:36.999741006 +0100
+@@ -82,7 +82,7 @@
+         //        only that _bits != 8.
+         for (unsigned int i = 0; i < _h_sz; ++i)
+           {
+-            div_t index = div (i, 8 * sizeof (JSAMPLE));
++            div_t index = div (static_cast<int>(i), static_cast<int>(8 * sizeof (JSAMPLE)));
+             int offset = 8 * sizeof (JSAMPLE) - 1 - index.rem;
+             _scanline[i] = ((line[index.quot] & (1 << offset))
+                             ? 0 : ~0);
diff --git a/srcpkgs/iscan/patches/uchar.patch b/srcpkgs/iscan/patches/uchar.patch
new file mode 100644
index 00000000000..5699b71a1b5
--- /dev/null
+++ b/srcpkgs/iscan/patches/uchar.patch
@@ -0,0 +1,10 @@
+--- sanei/sanei_pio.c.orig	2016-08-19 11:14:06.000000000 +0200
++++ sanei/sanei_pio.c	2017-11-12 20:06:53.428389561 +0100
+@@ -61,6 +61,7 @@
+ #define STUBS
+ #include "sane/sanei_debug.h"
+ #include <fcntl.h>
++#include <sys/types.h>
+ 
+ #ifdef HAVE_UNISTD_H
+ # include <unistd.h>
diff --git a/srcpkgs/iscan/template b/srcpkgs/iscan/template
index aa21d93f306..99d139baec3 100644
--- a/srcpkgs/iscan/template
+++ b/srcpkgs/iscan/template
@@ -1,7 +1,8 @@
 # Template file for 'iscan'
 pkgname=iscan
-version=2.30.1
-revision=2
+version=2.30.3
+revision=1
+_srcrev=1
 repository=nonfree
 build_style=gnu-configure
 configure_args="--enable-frontend --enable-jpeg --enable-tiff --enable-png --enable-gimp"
@@ -13,10 +14,15 @@ depends="sane-epkowa"
 license="GPL-2, AVASYSPL"
 homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 short_desc="EPSON Image Scan! front-end"
-distfiles="http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${version}-1.tar.gz"
-checksum=79aa9a9f81a7146beb22a382bbaf840fbce61b1bdb82660e541946a471e48426
+distfiles="http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${version}-${_srcrev}.tar.gz"
+checksum=91a6cc1571e5ec34cee067eabb35f13838e71dfeda416310ecb5b5030d49de67
 only_for_archs="i686 x86_64"
 
+post_configure() {
+	# fix wrongly created link
+	sed -i -e 's/\(libesmod-$${arch}\)$(PACKAGE_CXX_ABI)/\1.c2/' non-free/Makefile
+}
+
 post_install() {
 	vlicense non-free/AVASYSPL.en.txt
 	vmkdir usr/lib/gimp/2.0/plug-ins