diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /games-board/pokerth/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'games-board/pokerth/files')
-rw-r--r-- | games-board/pokerth/files/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch | 14 | ||||
-rw-r--r-- | games-board/pokerth/files/pokerth-1.1.2-protobuf.patch | 23 |
2 files changed, 37 insertions, 0 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 000000000000..2e8c9c50c5eb --- /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/files/pokerth-1.1.2-protobuf.patch b/games-board/pokerth/files/pokerth-1.1.2-protobuf.patch new file mode 100644 index 000000000000..0ac2ab0b1531 --- /dev/null +++ b/games-board/pokerth/files/pokerth-1.1.2-protobuf.patch @@ -0,0 +1,23 @@ +https://github.com/pokerth/pokerth/issues/339 +--- PokerTH-1.1.1-src/pokerth.proto ++++ PokerTH-1.1.1-src.new/pokerth.proto +@@ -701,7 +701,7 @@ + + message ErrorMessage { + enum ErrorReason { +- reserved = 0; ++ custReserved = 0; + initVersionNotSupported = 1; + initServerFull = 2; + initAuthFailure = 3; +--- PokerTH-1.1.1-src/src/net/common/netpacket.cpp ++++ PokerTH-1.1.1-src.new/src/net/common/netpacket.cpp +@@ -249,7 +249,7 @@ + retVal = ErrorMessage::sessionTimeout; + break; + default : +- retVal = ErrorMessage::reserved; ++ retVal = ErrorMessage::custReserved; + break; + } + return retVal; |