From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/, media-gfx/iscan/files/
Date: Sun, 10 May 2020 11:31:33 +0000 (UTC) [thread overview]
Message-ID: <1589110279.0852935daf941052fb1160f394f8ed03cde749af.asturm@gentoo> (raw)
commit: 0852935daf941052fb1160f394f8ed03cde749af
Author: Marcin Deranek <marcin.deranek <AT> booking <DOT> com>
AuthorDate: Fri May 8 21:49:21 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 10 11:31:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0852935d
media-gfx/iscan: fix building with gcc 10
Closes: https://bugs.gentoo.org/721812
Signed-off-by: Marcin Deranek <marcin.deranek <AT> slonko.net>
Closes: https://github.com/gentoo/gentoo/pull/15718
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/iscan/files/iscan-3.62.0-gcc-10.patch | 20 ++++++++++++++++++++
media-gfx/iscan/iscan-3.62.0.ebuild | 1 +
2 files changed, 21 insertions(+)
diff --git a/media-gfx/iscan/files/iscan-3.62.0-gcc-10.patch b/media-gfx/iscan/files/iscan-3.62.0-gcc-10.patch
new file mode 100644
index 00000000000..4f8c63c7353
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-3.62.0-gcc-10.patch
@@ -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 {
diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild
index 2a2c97d1512..f5957958df9 100644
--- a/media-gfx/iscan/iscan-3.62.0.ebuild
+++ b/media-gfx/iscan/iscan-3.62.0.ebuild
@@ -32,6 +32,7 @@ S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"
PATCHES=(
"${FILESDIR}"/${PN}-3.61.0-ijg-libjpeg.patch
"${FILESDIR}"/${PN}-3.61.0-imagemagick-7.patch
+ "${FILESDIR}"/${PN}-3.62.0-gcc-10.patch
)
src_prepare() {
next reply other threads:[~2020-05-10 11:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-10 11:31 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-11-05 8:12 [gentoo-commits] repo/gentoo:master commit in: media-gfx/iscan/, media-gfx/iscan/files/ Joonas Niilola
2020-08-15 9:30 Joonas Niilola
2020-02-16 13:41 Andreas Sturmlechner
2019-09-21 15:35 Joonas Niilola
2019-04-03 22:59 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1589110279.0852935daf941052fb1160f394f8ed03cde749af.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox