From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/
Date: Thu, 7 Sep 2017 07:13:36 +0000 (UTC) [thread overview]
Message-ID: <1504768400.1f6eeb3ae3f00b88fa38398613a63d08422e320f.soap@gentoo> (raw)
commit: 1f6eeb3ae3f00b88fa38398613a63d08422e320f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 7 07:13:02 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Sep 7 07:13:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f6eeb3a
games-board/pokerth: Fully qualify std::advance
Closes: https://bugs.gentoo.org/show_bug.cgi?id=629966
Package-Manager: Portage-2.3.8, Repoman-2.3.3
.../files/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch | 14 ++++++++++++++
games-board/pokerth/pokerth-1.1.1-r2.ebuild | 9 +++++----
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/games-board/pokerth/files/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch b/games-board/pokerth/files/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch
new file mode 100644
index 00000000000..2e8c9c50c5e
--- /dev/null
+++ b/games-board/pokerth/files/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch
@@ -0,0 +1,14 @@
+Boost 1.65 made 'advance()' ambiguous.
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=629966
+
+--- a/src/gui/qt/gametable/gametableimpl.cpp
++++ b/src/gui/qt/gametable/gametableimpl.cpp
+@@ -3859,7 +3859,7 @@
+ int playerCount = static_cast<int>(seatList->size());
+ if (id < playerCount) {
+ PlayerListIterator pos = seatList->begin();
+- advance(pos, id);
++ std::advance(pos, id);
+ myStartWindow->getSession()->startVoteKickPlayer((*pos)->getMyUniqueID());
+ }
+ }
diff --git a/games-board/pokerth/pokerth-1.1.1-r2.ebuild b/games-board/pokerth/pokerth-1.1.1-r2.ebuild
index 32e456bf3d7..be20d0fd206 100644
--- a/games-board/pokerth/pokerth-1.1.1-r2.ebuild
+++ b/games-board/pokerth/pokerth-1.1.1-r2.ebuild
@@ -38,10 +38,11 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
PATCHES=(
- "${FILESDIR}/${P}-qt5.patch"
- "${FILESDIR}/${P}-boost-1.60.patch"
- "${FILESDIR}/${P}-qmake-gcc-6.patch"
- "${FILESDIR}/${P}-boost-noexcept.patch"
+ "${FILESDIR}"/${PN}-1.1.1-qt5.patch
+ "${FILESDIR}"/${PN}-1.1.1-boost-1.60.patch
+ "${FILESDIR}"/${PN}-1.1.1-qmake-gcc-6.patch
+ "${FILESDIR}"/${PN}-1.1.1-boost-noexcept.patch
+ "${FILESDIR}"/${PN}-1.1.1-boost-1.65-ambiguous-advance.patch
)
src_prepare() {
next reply other threads:[~2017-09-07 7:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-07 7:13 David Seifert [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-10 0:55 [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/ Stefan Strogin
2018-04-27 21:51 James Le Cuirot
2018-04-27 21:51 James Le Cuirot
2017-01-22 16:04 David Seifert
2016-04-03 10:02 David Seifert
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=1504768400.1f6eeb3ae3f00b88fa38398613a63d08422e320f.soap@gentoo \
--to=soap@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