[arch-commits] Commit in iscan/trunk (PKGBUILD)

2018-11-09 Thread Felix Yan via arch-commits
Date: Friday, November 9, 2018 @ 22:17:04
  Author: felixonmars
Revision: 404896

PIE/BUILDINFO rebuild

Modified:
  iscan/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-09 22:16:46 UTC (rev 404895)
+++ PKGBUILD2018-11-09 22:17:04 UTC (rev 404896)
@@ -5,7 +5,7 @@
 
 pkgname=iscan
 pkgver=2.30.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="EPSON Image Scan! front-end for scanners and all-in-ones"
 arch=('x86_64')
 url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX;


[arch-commits] Commit in iscan/trunk (PKGBUILD)

2016-12-04 Thread Fabio Castelli
Date: Sunday, December 4, 2016 @ 23:24:28
  Author: muflone
Revision: 197891

upgpkg: iscan 2.30.3.1-1

Modified:
  iscan/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-04 23:14:26 UTC (rev 197890)
+++ PKGBUILD2016-12-04 23:24:28 UTC (rev 197891)
@@ -5,9 +5,8 @@
 # Contributor: Alessio Sergi 
 
 pkgname=iscan
-pkgver=2.30.2
+pkgver=2.30.3.1
 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;
@@ -15,11 +14,11 @@
 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}-${_pkgrev}.tar.gz;
+source=("http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${pkgver%.*}-${pkgver/*.}.tar.gz;
 "libpng15.patch"
 "jpegstream.cc.patch"
 "epkowa.conf")
-sha256sums=('ca2322a527ab41c8207b060ee54fc3782cba84c444bcf6b9c8ee32f7cda007d9'
+sha256sums=('91a6cc1571e5ec34cee067eabb35f13838e71dfeda416310ecb5b5030d49de67'
 '1a75b8df945a813a297dfd6e3dabae3bc8b51898f23af31640091e31b901f0ba'
 '44990a5264e530a7a8ad1f95524e5d70e4f0f9009c53c8ea593cedf8d861a669'
 '8e9e90fa50f1bd476b13766b19f100470c41dd253dc0605fbb1d0ac346a0beff')
@@ -27,7 +26,7 @@
 backup=("etc/sane.d/epkowa.conf")
 
 prepare() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver%.*}"
   # patch for building iscan against libpng15 by giovanni
   patch -Np0 -i "../libpng15.patch"
   # patch for ambiguous div in jpegstream.cc
@@ -37,7 +36,7 @@
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver%.*}"
   export LDFLAGS="${LDFLAGS} -ldl -lpng16"
   ./configure --prefix=/usr \
   --sbindir=/usr/bin \
@@ -51,7 +50,7 @@
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver%.*}"
 
   # install files
   make DESTDIR="${pkgdir}" install


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

2016-07-10 Thread 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
===
--- PKGBUILD2016-07-10 16:59:11 UTC (rev 182619)
+++ PKGBUILD2016-07-10 17:10:15 UTC (rev 182620)
@@ -5,8 +5,9 @@
 # Contributor: Alessio Sergi 
 
 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.0 +0200
 lib/jpegstream.cc  2016-07-10 18:45:40.511301054 +0200
+@@ -33,7 +33,7 @@
+ 
+ #include "jpegstream.hh"
+ 
+-#include 
++// #include 
+ #include 
+ 
+ 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(i),
++   static_cast(8 * sizeof (JSAMPLE)));
+ int offset = 8 * sizeof (JSAMPLE) - 1 - index.rem;
+ _scanline[i] = ((line[index.quot] & (1 << offset))
+ ? 0 : ~0);


[arch-commits] Commit in iscan/trunk (PKGBUILD)

2015-12-07 Thread Bartłomiej Piotrowski
Date: Monday, December 7, 2015 @ 13:47:39
  Author: bpiotrowski
Revision: 149834

Fix download url

Modified:
  iscan/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 12:47:08 UTC (rev 149833)
+++ PKGBUILD2015-12-07 12:47:39 UTC (rev 149834)
@@ -14,7 +14,7 @@
 depends=('gtk2' 'sane' 'libstdc++5')
 makedepends=('gettext' 'gimp')
 optdepends=('iscan-data: Image Scan! data files required for some devices')
-source=("https://download3.ebz.epson.net/dsc/f/03/00/03/61/59/a3f8b8d60e8702a1c5bf3977d018cc2336e308a8/${pkgname}_${pkgver}-1.tar.gz;
+source=("http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${pkgver}-1.tar.gz;
 "libpng15.patch"
 "epkowa.conf")
 sha256sums=('79aa9a9f81a7146beb22a382bbaf840fbce61b1bdb82660e541946a471e48426'


[arch-commits] Commit in iscan/trunk (PKGBUILD)

2015-12-07 Thread Evangelos Foutras
Date: Monday, December 7, 2015 @ 13:56:16
  Author: foutrelis
Revision: 149845

C++11 ABI rebuild

Modified:
  iscan/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 12:55:15 UTC (rev 149844)
+++ PKGBUILD2015-12-07 12:56:16 UTC (rev 149845)
@@ -6,7 +6,7 @@
 
 pkgname=iscan
 pkgver=2.30.1
-pkgrel=8
+pkgrel=9
 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;


[arch-commits] Commit in iscan/trunk (PKGBUILD)

2015-06-06 Thread Fabio Castelli
Date: Saturday, June 6, 2015 @ 17:32:01
  Author: muflone
Revision: 134903

upgpkg: iscan 2.30.1-8
fixes for gcc 5.1

Modified:
  iscan/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-06 13:37:10 UTC (rev 134902)
+++ PKGBUILD2015-06-06 15:32:01 UTC (rev 134903)
@@ -6,12 +6,12 @@
 
 pkgname=iscan
 pkgver=2.30.1
-pkgrel=7
+pkgrel=8
 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;
 license=('GPL2' 'custom:AVASYSPL')
-depends=('gtk2' 'sane')
+depends=('gtk2' 'sane' 'libstdc++5')
 makedepends=('gettext' 'gimp')
 optdepends=('iscan-data: Image Scan! data files required for some devices')
 
source=(https://download3.ebz.epson.net/dsc/f/03/00/03/61/59/a3f8b8d60e8702a1c5bf3977d018cc2336e308a8/${pkgname}_${pkgver}-1.tar.gz;
@@ -27,6 +27,8 @@
   cd ${pkgname}-${pkgver}
   # patch for building iscan against libpng15 by giovanni
   patch -Np0 -i ../libpng15.patch
+  # add fix for CXX ABI different than 1002
+  ln -s libesmod-x86_64.c2.so non-free/libesmod-x86_64.so
 }
 
 build() {


[arch-commits] Commit in iscan/trunk (PKGBUILD)

2015-03-29 Thread Fabio Castelli
Date: Sunday, March 29, 2015 @ 22:52:54
  Author: muflone
Revision: 130210

upgpkg: iscan 2.30.1-6

Modified:
  iscan/trunk/PKGBUILD

--+
 PKGBUILD |   31 ++-
 1 file changed, 10 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-29 20:35:07 UTC (rev 130209)
+++ PKGBUILD2015-03-29 20:52:54 UTC (rev 130210)
@@ -3,22 +3,26 @@
 # Contributor: Frederic Bezies  fredbezies at gmail dot com
 # Contributor: garion  garion @ mailoo.org 
 # Contributor: Alessio Sergi asergi at archlinux dot us
-# Contributor: mutlu_inek mutlu_i...@yahoo.de
 
-pkgbase=iscan
-pkgname=('iscan' 'gimp-plugin-iscan')
+pkgname='iscan'
 pkgver=2.30.1
 pkgrel=6
 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;
-makedepends=('gettext' 'sane' 'gimp')
-source=(https://download3.ebz.epson.net/dsc/f/03/00/03/61/59/a3f8b8d60e8702a1c5bf3977d018cc2336e308a8/${pkgbase}_${pkgver}-1.tar.gz;
+license=('GPL2' 'custom:AVASYSPL')
+depends=('gtk2' 'sane')
+makedepends=('gettext' 'gimp')
+optdepends=('iscan-data: Image Scan! data files required for some devices'
+'gimp-plugin-iscan: plug-in to scan directly from GIMP')
+source=(https://download3.ebz.epson.net/dsc/f/03/00/03/61/59/a3f8b8d60e8702a1c5bf3977d018cc2336e308a8/${pkgname}_${pkgver}-1.tar.gz;
 libpng15.patch
 epkowa.conf)
 sha256sums=('79aa9a9f81a7146beb22a382bbaf840fbce61b1bdb82660e541946a471e48426'
 '1a75b8df945a813a297dfd6e3dabae3bc8b51898f23af31640091e31b901f0ba'
 '8e9e90fa50f1bd476b13766b19f100470c41dd253dc0605fbb1d0ac346a0beff')
+install=${pkgname}.install
+backup=(etc/sane.d/epkowa.conf)
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -40,14 +44,7 @@
   make
 }
 
-package_iscan() {
-  depends=('gtk2' 'sane')
-  optdepends=('iscan-data: Image Scan! data files required for some devices'
-  'gimp-plugin-iscan: plug-in to scan directly from GIMP')
-  install=${pkgname}.install
-  backup=(etc/sane.d/epkowa.conf)
-  license=('GPL2' 'custom:AVASYSPL')
-
+package() {
   cd ${pkgname}-${pkgver}
 
   # install files
@@ -68,11 +65,3 @@
   install -m 644 non-free/AVASYSPL.en.txt 
${pkgdir}/usr/share/licenses/${pkgname}/AVASYSPL
 }
 
-package_gimp-plugin-iscan() {
-  pkgdesc='GIMP plugin to launch Image Scan! and to scan an image directly 
from GIMP'
-  arch=('any')
-  depends=('iscan' 'gimp')
-  license=('GPL2')
-  install -m 755 -d ${pkgdir}/usr/lib/gimp/2.0/plug-ins
-  ln -s /usr/bin/iscan ${pkgdir}/usr/lib/gimp/2.0/plug-ins/iscan
-}


[arch-commits] Commit in iscan/trunk (PKGBUILD)

2015-03-29 Thread Fabio Castelli
Date: Sunday, March 29, 2015 @ 22:57:40
  Author: muflone
Revision: 130212

upgpkg: iscan 2.30.1-6

Modified:
  iscan/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-29 20:53:21 UTC (rev 130211)
+++ PKGBUILD2015-03-29 20:57:40 UTC (rev 130212)
@@ -4,7 +4,7 @@
 # Contributor: garion  garion @ mailoo.org 
 # Contributor: Alessio Sergi asergi at archlinux dot us
 
-pkgname='iscan'
+pkgname=iscan
 pkgver=2.30.1
 pkgrel=6
 pkgdesc=EPSON Image Scan! front-end for scanners and all-in-ones


[arch-commits] Commit in iscan/trunk (PKGBUILD)

2015-03-29 Thread Fabio Castelli
Date: Sunday, March 29, 2015 @ 23:35:15
  Author: muflone
Revision: 130218

Modified:
  iscan/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-29 21:24:15 UTC (rev 130217)
+++ PKGBUILD2015-03-29 21:35:15 UTC (rev 130218)
@@ -6,7 +6,7 @@
 
 pkgname=iscan
 pkgver=2.30.1
-pkgrel=6
+pkgrel=7
 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;
@@ -13,8 +13,7 @@
 license=('GPL2' 'custom:AVASYSPL')
 depends=('gtk2' 'sane')
 makedepends=('gettext' 'gimp')
-optdepends=('iscan-data: Image Scan! data files required for some devices'
-'gimp-plugin-iscan: plug-in to scan directly from GIMP')
+optdepends=('iscan-data: Image Scan! data files required for some devices')
 
source=(https://download3.ebz.epson.net/dsc/f/03/00/03/61/59/a3f8b8d60e8702a1c5bf3977d018cc2336e308a8/${pkgname}_${pkgver}-1.tar.gz;
 libpng15.patch
 epkowa.conf)
@@ -63,5 +62,9 @@
   # install license
   install -m 755 -d ${pkgdir}/usr/share/licenses/${pkgname}
   install -m 644 non-free/AVASYSPL.en.txt 
${pkgdir}/usr/share/licenses/${pkgname}/AVASYSPL
+
+  # install plugin for GIMP
+  install -m 755 -d ${pkgdir}/usr/lib/gimp/2.0/plug-ins
+  ln -s /usr/bin/iscan ${pkgdir}/usr/lib/gimp/2.0/plug-ins/
 }