Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/files/, media-gfx/iscan/
Date: Sun, 10 May 2020 12:06:12
Message-Id: 1589112352.c35585303c48d0746234352cca0df3e1b9ff8fd3.asturm@gentoo
1 commit: c35585303c48d0746234352cca0df3e1b9ff8fd3
2 Author: Marcin Deranek <marcin.deranek <AT> booking <DOT> com>
3 AuthorDate: Sun May 10 11:52:32 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun May 10 12:05:52 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3558530
7
8 media-gfx/iscan: fix building with boost 1.73
9
10 Closes: https://bugs.gentoo.org/721696
11 Signed-off-by: Marcin Deranek <marcin.deranek <AT> slonko.net>
12 Closes: https://github.com/gentoo/gentoo/pull/15737
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 .../iscan/files/iscan-3.62.0-boost-1.73.patch | 33 ++++++++++++++++++++++
16 media-gfx/iscan/iscan-3.62.0.ebuild | 1 +
17 2 files changed, 34 insertions(+)
18
19 diff --git a/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch b/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch
20 new file mode 100644
21 index 00000000000..d55a464823b
22 --- /dev/null
23 +++ b/media-gfx/iscan/files/iscan-3.62.0-boost-1.73.patch
24 @@ -0,0 +1,33 @@
25 +diff -urN a/drivers/esci/verify.cpp b/drivers/esci/verify.cpp
26 +--- a/drivers/esci/verify.cpp 2019-11-18 04:08:45.000000000 +0200
27 ++++ b/drivers/esci/verify.cpp 2020-05-09 20:22:00.899968638 +0300
28 +@@ -58,6 +58,7 @@
29 +
30 + using namespace utsushi;
31 + using namespace _drv_::esci;
32 ++using namespace boost::placeholders;
33 +
34 + using std::basic_string;
35 + using std::ios_base;
36 +diff -urN a/lib/monitor.cpp b/lib/monitor.cpp
37 +--- a/lib/monitor.cpp 2019-11-18 04:08:08.000000000 +0200
38 ++++ b/lib/monitor.cpp 2020-05-09 20:22:26.392174029 +0300
39 +@@ -49,6 +49,7 @@
40 + namespace utsushi {
41 +
42 + using boost::filesystem::exists;
43 ++using namespace boost::placeholders;
44 +
45 + class monitor::impl
46 + {
47 +diff -urN a/sane/handle.cpp b/sane/handle.cpp
48 +--- a/sane/handle.cpp 2019-11-18 04:08:08.000000000 +0200
49 ++++ b/sane/handle.cpp 2020-05-09 20:21:49.559223712 +0300
50 +@@ -65,6 +65,7 @@
51 + using utsushi::_flt_::deskew;
52 + using utsushi::_flt_::autocrop;
53 + using utsushi::_flt_::pnm;
54 ++using namespace boost::placeholders;
55 +
56 + namespace sane {
57 +
58
59 diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild
60 index f5957958df9..f01a67d2417 100644
61 --- a/media-gfx/iscan/iscan-3.62.0.ebuild
62 +++ b/media-gfx/iscan/iscan-3.62.0.ebuild
63 @@ -33,6 +33,7 @@ PATCHES=(
64 "${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch
65 "${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch
66 "${FILESDIR}"/${PN}-3.62.0-gcc-10.patch
67 + "${FILESDIR}"/${PN}-3.62.0-boost-1.73.patch
68 )
69
70 src_prepare() {