[arch-commits] Commit in imagescan/repos/community-x86_64 (3 files)

[Antonio Rojas]

    Date: Thursday, June 25, 2020 @ 07:00:45
  Author: arojas
Revision: 652691

archrelease: copy trunk to community-x86_64

Added:
  imagescan/repos/community-x86_64/PKGBUILD
    (from rev 652690, imagescan/trunk/PKGBUILD)
  imagescan/repos/community-x86_64/imagescan-gcc10.patch
    (from rev 652690, imagescan/trunk/imagescan-gcc10.patch)
Deleted:
  imagescan/repos/community-x86_64/PKGBUILD

-----------------------+
 PKGBUILD              |  100 ++++++++++++++++++++++++------------------------
 imagescan-gcc10.patch |   20 +++++++++
 2 files changed, 72 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-25 07:00:34 UTC (rev 652690)
+++ PKGBUILD	2020-06-25 07:00:45 UTC (rev 652691)
@@ -1,48 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Leonardo Santana Vieira <leosanvieira at gmail dot com>
-
-pkgname=imagescan
-pkgver=3.62.0
-_utsushiver=${pkgver/3./0.}
-pkgrel=2
-pkgdesc="EPSON Image Scan v3 front-end for scanners and all-in-ones"
-arch=(x86_64)
-url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
-license=(GPL3)
-depends=(sane gtkmm graphicsmagick boost-libs)
-makedepends=(boost)
-optdepends=('tesseract: OCR support')
-source=(https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_$pkgver.orig.tar.gz)
-sha256sums=('683204986061c8833a30482b1ec7cd183aac079f464bd7d0a591ca0f97067e32')
-backup=('etc/utsushi/utsushi.conf')
-
-prepare() {
-  cd utsushi-$_utsushiver
-  sed -e 's|-Werror||g' -i configure.ac
-  rm -r upstream/boost # Remove vendored libraries
-  autoreconf -vif
-}
-
-build() {
-  cd utsushi-$_utsushiver
-  ./configure \
-    --prefix=/usr/ \
-    --libexecdir=/usr/lib/ \
-    --sysconfdir=/etc/ \
-    --enable-sane-config \
-    --enable-udev-config \
-    --with-gtkmm \
-    --with-jpeg \
-    --with-magick \
-    --with-magick-pp \
-    --with-sane \
-    --with-tiff
-#  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool # This breaks some scanners, https://bugs.archlinux.org/task/63491
-  make
-}
-
-package() {
-  cd utsushi-$_utsushiver
-  make DESTDIR="$pkgdir" install
-  install -Dm644 lib/devices.conf "$pkgdir"/etc/utsushi/utsushi.conf
-}

Copied: imagescan/repos/community-x86_64/PKGBUILD (from rev 652690, imagescan/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-06-25 07:00:45 UTC (rev 652691)
@@ -0,0 +1,52 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Leonardo Santana Vieira <leosanvieira at gmail dot com>
+
+pkgname=imagescan
+pkgver=3.63.0
+_utsushiver=${pkgver/3./0.}
+pkgrel=1
+pkgdesc="EPSON Image Scan v3 front-end for scanners and all-in-ones"
+arch=(x86_64)
+url="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
+license=(GPL3)
+depends=(sane gtkmm graphicsmagick boost-libs)
+makedepends=(boost systemd)
+optdepends=('tesseract: OCR support')
+source=(https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_$pkgver.orig.tar.gz
+        imagescan-gcc10.patch)
+sha256sums=('439fb18054293b6e743b168739d85f2ceba66498d68590cfa68dbbc7ad971a94'
+            'de64458187846d40e0c5dd06fa0c32962a22863803929d7ae61419153a5272bf')
+backup=('etc/utsushi/utsushi.conf')
+
+prepare() {
+  cd utsushi-$_utsushiver
+
+  patch -p1 -i ../imagescan-gcc10.patch # Fix build with GCC 10
+  sed -e 's|-Werror||g' -i configure.ac
+  rm -r upstream/boost # Remove vendored libraries
+  autoreconf -vif
+}
+
+build() {
+  cd utsushi-$_utsushiver
+  ./configure \
+    --prefix=/usr/ \
+    --libexecdir=/usr/lib/ \
+    --sysconfdir=/etc/ \
+    --enable-sane-config \
+    --enable-udev-config \
+    --with-gtkmm \
+    --with-jpeg \
+    --with-magick \
+    --with-magick-pp \
+    --with-sane \
+    --with-tiff
+#  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool # This breaks some scanners, https://bugs.archlinux.org/task/63491
+  make
+}
+
+package() {
+  cd utsushi-$_utsushiver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 lib/devices.conf "$pkgdir"/etc/utsushi/utsushi.conf
+}

Copied: imagescan/repos/community-x86_64/imagescan-gcc10.patch (from rev 652690, imagescan/trunk/imagescan-gcc10.patch)
===================================================================
--- imagescan-gcc10.patch	                        (rev 0)
+++ imagescan-gcc10.patch	2020-06-25 07:00:45 UTC (rev 652691)
@@ -0,0 +1,20 @@
+--- a/utsushi/string.hpp	2020-05-08 23:20:11.642359134 +0200
++++ b/utsushi/string.hpp	2020-05-08 23:20:21.834246187 +0200
+@@ -23,6 +23,7 @@
+ 
+ #include <iosfwd>
+ #include <string>
++#include <iostream>
+ 
+ #include <boost/operators.hpp>
+ 
+--- a/utsushi/toggle.hpp	2019-11-18 03:08:06.000000000 +0100
++++ b/utsushi/toggle.hpp	2020-05-08 23:23:40.284045167 +0200
+@@ -22,6 +22,7 @@
+ #define utsushi_toggle_hpp_
+ 
+ #include <iosfwd>
++#include <iostream>
+ #include <boost/operators.hpp>
+ 
+ namespace utsushi {