Fix after protobuf 3.6.0 update. Add patches to cope with incompatibilities

of protobuf2 with protobuf3 and a couple other things, including C++11.

tweaks & ok jca
This commit is contained in:
tb 2018-07-10 10:53:10 +00:00
parent 5ce51cbd1a
commit 5a9f0ebd71
5 changed files with 76 additions and 2 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.40 2018/06/27 21:03:49 espie Exp $
# $OpenBSD: Makefile,v 1.41 2018/07/10 10:53:10 tb Exp $
COMMENT= texas hold'em poker game with online capabilities
#'
BROKEN-hppa = needs atomic ops
DISTNAME = pokerth-1.1.2
REVISION = 0
REVISION = 1
CATEGORIES= games x11
@ -25,6 +25,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pokerth/}
# C++11
COMPILER = base-clang ports-gcc ports-clang
CXXFLAGS += -std=gnu++11
MODULES= devel/qmake \
x11/qt4

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-chatcleaner_proto,v 1.1 2018/07/10 10:53:10 tb Exp $
https://github.com/albmed/pokerth/commit/8e5b09ac62a66ed560ea9869caf3351959e399ce
Index: chatcleaner.proto
--- chatcleaner.proto.orig
+++ chatcleaner.proto
@@ -29,6 +29,8 @@
* as that of the covered work. *
*****************************************************************************/
+syntax = "proto2";
+
option java_package = "de.chatcleaner.protocol";
option java_outer_classname = "ProtoBuf";
option optimize_for = LITE_RUNTIME;

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-pokerth_proto,v 1.1 2018/07/10 10:53:10 tb Exp $
https://github.com/albmed/pokerth/commit/8e5b09ac62a66ed560ea9869caf3351959e399ce
Index: pokerth.proto
--- pokerth.proto.orig
+++ pokerth.proto
@@ -29,6 +29,8 @@
* as that of the covered work. *
*****************************************************************************/
+syntax = "proto2";
+
option java_package = "de.pokerth.protocol";
option java_outer_classname = "ProtoBuf";
option optimize_for = LITE_RUNTIME;
@@ -701,7 +703,7 @@ message ReportGameAckMessage {
message ErrorMessage {
enum ErrorReason {
- reserved = 0;
+ custReserved = 0;
initVersionNotSupported = 1;
initServerFull = 2;
initAuthFailure = 3;

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_gui_qt_gametable_gametableimpl_cpp,v 1.1 2018/07/10 10:53:10 tb Exp $
https://github.com/albmed/pokerth/commit/8e5b09ac62a66ed560ea9869caf3351959e399ce
Index: src/gui/qt/gametable/gametableimpl.cpp
--- src/gui/qt/gametable/gametableimpl.cpp.orig
+++ src/gui/qt/gametable/gametableimpl.cpp
@@ -3859,7 +3859,7 @@ void gameTableImpl::triggerVoteOnKick(int id)
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());
}
}

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_net_common_netpacket_cpp,v 1.1 2018/07/10 10:53:10 tb Exp $
https://github.com/albmed/pokerth/commit/8e5b09ac62a66ed560ea9869caf3351959e399ce
Index: src/net/common/netpacket.cpp
--- src/net/common/netpacket.cpp.orig
+++ src/net/common/netpacket.cpp
@@ -249,7 +249,7 @@ NetPacket::GameErrorToNetError(int gameErrorReason)
retVal = ErrorMessage::sessionTimeout;
break;
default :
- retVal = ErrorMessage::reserved;
+ retVal = ErrorMessage::custReserved;
break;
}
return retVal;