[arch-commits] Commit in imagescan/trunk (PKGBUILD imagescan-gcc10.patch)

[Antonio Rojas]

    Date: Friday, January 15, 2021 @ 11:33:33
  Author: arojas
Revision: 821001

Update to 3.65.0

Modified:
  imagescan/trunk/PKGBUILD
Deleted:
  imagescan/trunk/imagescan-gcc10.patch

-----------------------+
 PKGBUILD              |   12 ++++--------
 imagescan-gcc10.patch |   20 --------------------
 2 files changed, 4 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-15 11:24:00 UTC (rev 821000)
+++ PKGBUILD	2021-01-15 11:33:33 UTC (rev 821001)
@@ -2,9 +2,9 @@
 # Contributor: Leonardo Santana Vieira <leosanvieira at gmail dot com>
 
 pkgname=imagescan
-pkgver=3.63.0
+pkgver=3.65.0
 _utsushiver=${pkgver/3./0.}
-pkgrel=3
+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"
@@ -13,9 +13,8 @@
 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 boost-1.74.patch)
-sha256sums=('439fb18054293b6e743b168739d85f2ceba66498d68590cfa68dbbc7ad971a94'
-            'de64458187846d40e0c5dd06fa0c32962a22863803929d7ae61419153a5272bf'
+        boost-1.74.patch)
+sha256sums=('e83704398c51a3166fd62c25b89e95cf6262e52f3dc6e627db3e7556e2220d64'
             'e7da445c970a4a99b476b3bb994d0d18f327e0cd166cd87ba24fcd16abee7d49')
 backup=('etc/utsushi/utsushi.conf')
 
@@ -22,11 +21,8 @@
 prepare() {
   cd utsushi-$_utsushiver
 
-  patch -p1 -i ../imagescan-gcc10.patch # Fix build with GCC 10
   patch -Np1 -i ${srcdir}/boost-1.74.patch # Fix build with boost 1.74
-  sed -e 's|-Werror||g' -i configure.ac
   rm -r upstream/boost # Remove vendored libraries
-  autoreconf -vif
 }
 
 build() {

Deleted: imagescan-gcc10.patch
===================================================================
--- imagescan-gcc10.patch	2021-01-15 11:24:00 UTC (rev 821000)
+++ imagescan-gcc10.patch	2021-01-15 11:33:33 UTC (rev 821001)
@@ -1,20 +0,0 @@
---- 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 {