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

[Jelle van der Waa]

    Date: Sunday, December 6, 2020 @ 22:05:16
  Author: jelle
Revision: 771249

Add boost 1.74 compatibility patch

Added:
  imagescan/trunk/boost-1.74.patch
Modified:
  imagescan/trunk/PKGBUILD

------------------+
 PKGBUILD         |    6 +++-
 boost-1.74.patch |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-06 22:05:05 UTC (rev 771248)
+++ PKGBUILD	2020-12-06 22:05:16 UTC (rev 771249)
@@ -13,9 +13,10 @@
 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)
+        imagescan-gcc10.patch boost-1.74.patch)
 sha256sums=('439fb18054293b6e743b168739d85f2ceba66498d68590cfa68dbbc7ad971a94'
-            'de64458187846d40e0c5dd06fa0c32962a22863803929d7ae61419153a5272bf')
+            'de64458187846d40e0c5dd06fa0c32962a22863803929d7ae61419153a5272bf'
+            'e7da445c970a4a99b476b3bb994d0d18f327e0cd166cd87ba24fcd16abee7d49')
 backup=('etc/utsushi/utsushi.conf')
 
 prepare() {
@@ -22,6 +23,7 @@
   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

Added: boost-1.74.patch
===================================================================
--- boost-1.74.patch	                        (rev 0)
+++ boost-1.74.patch	2020-12-06 22:05:16 UTC (rev 771249)
@@ -0,0 +1,68 @@
+From ae1e2b6c738d5af0cb8a121f5c5146e113930cc4 Mon Sep 17 00:00:00 2001
+From: Olaf Meeuwissen <paddy-hack at 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
+