[arch-commits] Commit in iscan/trunk (PKGBUILD jpegstream.cc.patch)

[Fabio Castelli]

    Date: Sunday, July 10, 2016 @ 17:10:15
  Author: muflone
Revision: 182620

upgpkg: iscan 2.30.2-1

Added:
  iscan/trunk/jpegstream.cc.patch
Modified:
  iscan/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   13 +++++++++----
 jpegstream.cc.patch |   21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-10 16:59:11 UTC (rev 182619)
+++ PKGBUILD	2016-07-10 17:10:15 UTC (rev 182620)
@@ -5,8 +5,9 @@
 # Contributor: Alessio Sergi <asergi at archlinux dot us>
 
 pkgname=iscan
-pkgver=2.30.1
-pkgrel=9
+pkgver=2.30.2
+pkgrel=1
+_pkgrev=2
 pkgdesc="EPSON Image Scan! front-end for scanners and all-in-ones"
 arch=('i686' 'x86_64')
 url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
@@ -14,11 +15,13 @@
 depends=('gtk2' 'sane' 'libstdc++5')
 makedepends=('gettext' 'gimp')
 optdepends=('iscan-data: Image Scan! data files required for some devices')
-source=("http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${pkgver}-1.tar.gz"
+source=("http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${pkgver}-${_pkgrev}.tar.gz"
         "libpng15.patch"
+        "jpegstream.cc.patch"
         "epkowa.conf")
-sha256sums=('79aa9a9f81a7146beb22a382bbaf840fbce61b1bdb82660e541946a471e48426'
+sha256sums=('ca2322a527ab41c8207b060ee54fc3782cba84c444bcf6b9c8ee32f7cda007d9'
             '1a75b8df945a813a297dfd6e3dabae3bc8b51898f23af31640091e31b901f0ba'
+            '44990a5264e530a7a8ad1f95524e5d70e4f0f9009c53c8ea593cedf8d861a669'
             '8e9e90fa50f1bd476b13766b19f100470c41dd253dc0605fbb1d0ac346a0beff')
 install="${pkgname}.install"
 backup=("etc/sane.d/epkowa.conf")
@@ -27,6 +30,8 @@
   cd "${pkgname}-${pkgver}"
   # patch for building iscan against libpng15 by giovanni
   patch -Np0 -i "../libpng15.patch"
+  # patch for ambiguous div in jpegstream.cc
+  patch -Np0 -i "../jpegstream.cc.patch"
   # add fix for CXX ABI different than 1002
   ln -s libesmod-x86_64.c2.so non-free/libesmod-x86_64.so
 }

Added: jpegstream.cc.patch
===================================================================
--- jpegstream.cc.patch	                        (rev 0)
+++ jpegstream.cc.patch	2016-07-10 17:10:15 UTC (rev 182620)
@@ -0,0 +1,21 @@
+--- lib/jpegstream.cc.orig	2016-06-20 06:10:38.000000000 +0200
++++ lib/jpegstream.cc	2016-07-10 18:45:40.511301054 +0200
+@@ -33,7 +33,7 @@
+ 
+ #include "jpegstream.hh"
+ 
+-#include <cstdlib>
++// #include <cstdlib>
+ #include <ios>
+ 
+ namespace iscan
+@@ -82,7 +82,8 @@
+         //        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);