Date: Friday, January 15, 2021 @ 11:34:38 Author: arojas Revision: 821002
archrelease: copy trunk to community-x86_64 Added: imagescan/repos/community-x86_64/PKGBUILD (from rev 821001, imagescan/trunk/PKGBUILD) imagescan/repos/community-x86_64/boost-1.74.patch (from rev 821001, imagescan/trunk/boost-1.74.patch) Deleted: imagescan/repos/community-x86_64/PKGBUILD imagescan/repos/community-x86_64/boost-1.74.patch imagescan/repos/community-x86_64/imagescan-gcc10.patch -----------------------+ PKGBUILD | 104 +++++++++++++++++------------------- boost-1.74.patch | 136 ++++++++++++++++++++++++------------------------ imagescan-gcc10.patch | 20 ------- 3 files changed, 118 insertions(+), 142 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-01-15 11:33:33 UTC (rev 821001) +++ PKGBUILD 2021-01-15 11:34:38 UTC (rev 821002) @@ -1,54 +0,0 @@ -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Leonardo Santana Vieira <leosanvieira at gmail dot com> - -pkgname=imagescan -pkgver=3.63.0 -_utsushiver=${pkgver/3./0.} -pkgrel=3 -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 boost-1.74.patch) -sha256sums=('439fb18054293b6e743b168739d85f2ceba66498d68590cfa68dbbc7ad971a94' - 'de64458187846d40e0c5dd06fa0c32962a22863803929d7ae61419153a5272bf' - 'e7da445c970a4a99b476b3bb994d0d18f327e0cd166cd87ba24fcd16abee7d49') -backup=('etc/utsushi/utsushi.conf') - -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() { - 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 821001, imagescan/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-01-15 11:34:38 UTC (rev 821002) @@ -0,0 +1,50 @@ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Leonardo Santana Vieira <leosanvieira at gmail dot com> + +pkgname=imagescan +pkgver=3.65.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 + boost-1.74.patch) +sha256sums=('e83704398c51a3166fd62c25b89e95cf6262e52f3dc6e627db3e7556e2220d64' + 'e7da445c970a4a99b476b3bb994d0d18f327e0cd166cd87ba24fcd16abee7d49') +backup=('etc/utsushi/utsushi.conf') + +prepare() { + cd utsushi-$_utsushiver + + patch -Np1 -i ${srcdir}/boost-1.74.patch # Fix build with boost 1.74 + rm -r upstream/boost # Remove vendored libraries +} + +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 +} Deleted: boost-1.74.patch =================================================================== --- boost-1.74.patch 2021-01-15 11:33:33 UTC (rev 821001) +++ boost-1.74.patch 2021-01-15 11:34:38 UTC (rev 821002) @@ -1,68 +0,0 @@ -From ae1e2b6c738d5af0cb8a121f5c5146e113930cc4 Mon Sep 17 00:00:00 2001 -From: Olaf Meeuwissen <paddy-h...@member.fsf.org> -Date: Sun, 18 Oct 2020 10:13:30 +0900 -Subject: [PATCH] Fix compile errors with boost-1.74.0. Fixes #94 - -Courtesy of @loqs. ---- - drivers/esci/verify.cpp | 2 ++ - gtkmm/pump.cpp | 2 ++ - lib/monitor.cpp | 2 ++ - sane/handle.cpp | 2 ++ - 4 files changed, 8 insertions(+) - -diff --git a/drivers/esci/verify.cpp b/drivers/esci/verify.cpp -index b9463e8..35d4ec9 100644 ---- a/drivers/esci/verify.cpp -+++ b/drivers/esci/verify.cpp -@@ -59,6 +59,8 @@ namespace but = boost::unit_test; - using namespace utsushi; - using namespace _drv_::esci; - -+using namespace boost::placeholders; -+ - using std::basic_string; - using std::ios_base; - using std::make_pair; -diff --git a/gtkmm/pump.cpp b/gtkmm/pump.cpp -index 2c5a2d4..7c5c1ea 100644 ---- a/gtkmm/pump.cpp -+++ b/gtkmm/pump.cpp -@@ -31,6 +31,8 @@ - namespace utsushi { - namespace gtkmm { - -+using namespace boost::placeholders; -+ - pump::pump (idevice::ptr idev) - : utsushi::pump (idev) - , idev_ptr_(idev) -diff --git a/lib/monitor.cpp b/lib/monitor.cpp -index 964670a..0460f55 100644 ---- a/lib/monitor.cpp -+++ b/lib/monitor.cpp -@@ -50,6 +50,8 @@ namespace utsushi { - - using boost::filesystem::exists; - -+using namespace boost::placeholders; -+ - class monitor::impl - { - public: -diff --git a/sane/handle.cpp b/sane/handle.cpp -index cac6ce5..9c5a802 100644 ---- a/sane/handle.cpp -+++ b/sane/handle.cpp -@@ -66,6 +66,8 @@ using utsushi::_flt_::deskew; - using utsushi::_flt_::autocrop; - using utsushi::_flt_::pnm; - -+using namespace boost::placeholders; -+ - namespace sane { - - //! Keep backend options separate from frontend options --- -GitLab - Copied: imagescan/repos/community-x86_64/boost-1.74.patch (from rev 821001, imagescan/trunk/boost-1.74.patch) =================================================================== --- boost-1.74.patch (rev 0) +++ boost-1.74.patch 2021-01-15 11:34:38 UTC (rev 821002) @@ -0,0 +1,68 @@ +From ae1e2b6c738d5af0cb8a121f5c5146e113930cc4 Mon Sep 17 00:00:00 2001 +From: Olaf Meeuwissen <paddy-h...@member.fsf.org> +Date: Sun, 18 Oct 2020 10:13:30 +0900 +Subject: [PATCH] Fix compile errors with boost-1.74.0. Fixes #94 + +Courtesy of @loqs. +--- + drivers/esci/verify.cpp | 2 ++ + gtkmm/pump.cpp | 2 ++ + lib/monitor.cpp | 2 ++ + sane/handle.cpp | 2 ++ + 4 files changed, 8 insertions(+) + +diff --git a/drivers/esci/verify.cpp b/drivers/esci/verify.cpp +index b9463e8..35d4ec9 100644 +--- a/drivers/esci/verify.cpp ++++ b/drivers/esci/verify.cpp +@@ -59,6 +59,8 @@ namespace but = boost::unit_test; + using namespace utsushi; + using namespace _drv_::esci; + ++using namespace boost::placeholders; ++ + using std::basic_string; + using std::ios_base; + using std::make_pair; +diff --git a/gtkmm/pump.cpp b/gtkmm/pump.cpp +index 2c5a2d4..7c5c1ea 100644 +--- a/gtkmm/pump.cpp ++++ b/gtkmm/pump.cpp +@@ -31,6 +31,8 @@ + namespace utsushi { + namespace gtkmm { + ++using namespace boost::placeholders; ++ + pump::pump (idevice::ptr idev) + : utsushi::pump (idev) + , idev_ptr_(idev) +diff --git a/lib/monitor.cpp b/lib/monitor.cpp +index 964670a..0460f55 100644 +--- a/lib/monitor.cpp ++++ b/lib/monitor.cpp +@@ -50,6 +50,8 @@ namespace utsushi { + + using boost::filesystem::exists; + ++using namespace boost::placeholders; ++ + class monitor::impl + { + public: +diff --git a/sane/handle.cpp b/sane/handle.cpp +index cac6ce5..9c5a802 100644 +--- a/sane/handle.cpp ++++ b/sane/handle.cpp +@@ -66,6 +66,8 @@ using utsushi::_flt_::deskew; + using utsushi::_flt_::autocrop; + using utsushi::_flt_::pnm; + ++using namespace boost::placeholders; ++ + namespace sane { + + //! Keep backend options separate from frontend options +-- +GitLab + Deleted: imagescan-gcc10.patch =================================================================== --- imagescan-gcc10.patch 2021-01-15 11:33:33 UTC (rev 821001) +++ imagescan-gcc10.patch 2021-01-15 11:34:38 UTC (rev 821002) @@ -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 {