From owner-svn-ports-all@freebsd.org Thu Dec 14 08:31:22 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 757FEE9C3EC; Thu, 14 Dec 2017 08:31:22 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 500727A832; Thu, 14 Dec 2017 08:31:22 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBE8VL88059441; Thu, 14 Dec 2017 08:31:21 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBE8VLQa059438; Thu, 14 Dec 2017 08:31:21 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201712140831.vBE8VLQa059438@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Thu, 14 Dec 2017 08:31:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456280 - in head/games/pokerth: . files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/games/pokerth: . files X-SVN-Commit-Revision: 456280 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Dec 2017 08:31:22 -0000 Author: madpilot Date: Thu Dec 14 08:31:21 2017 New Revision: 456280 URL: https://svnweb.freebsd.org/changeset/ports/456280 Log: - Unbreak and fix build after protobuf 3.5.0 update Added: head/games/pokerth/files/patch-pokerth.proto (contents, props changed) head/games/pokerth/files/patch-src_net_common_netpacket.cpp (contents, props changed) Modified: head/games/pokerth/Makefile Modified: head/games/pokerth/Makefile ============================================================================== --- head/games/pokerth/Makefile Thu Dec 14 06:59:13 2017 (r456279) +++ head/games/pokerth/Makefile Thu Dec 14 08:31:21 2017 (r456280) @@ -14,8 +14,6 @@ COMMENT= Poker game written in C++/Qt4 LICENSE= AGPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= Fails to compile with protobuf 3.5.0 - LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libmikmod.so:audio/libmikmod \ libgnutls.so:security/gnutls \ @@ -23,7 +21,8 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libgsasl.so:security/gsasl \ libtinyxml.so:textproc/tinyxml \ libprotobuf.so:devel/protobuf -BUILD_DEPENDS= ${LOCALBASE}/include/libircclient.h:irc/libircclient +BUILD_DEPENDS= ${LOCALBASE}/include/libircclient.h:irc/libircclient \ + protoc:devel/protobuf USES= iconv gmake qmake tar:bzip2 USE_QT4= gui corelib network sql sql-sqlite3 \ @@ -44,6 +43,12 @@ post-patch: ${WRKSRC}/*.pro @${FIND} ${WRKSRC} -name '*.cpp' -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's|[io]fstream|std::&|' + +pre-build: + (cd ${WRKSRC} && \ + protoc --cpp_out=src/third_party/protobuf chatcleaner.proto && \ + protoc --cpp_out=src/third_party/protobuf pokerth.proto \ + ) post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pokerth Added: head/games/pokerth/files/patch-pokerth.proto ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/pokerth/files/patch-pokerth.proto Thu Dec 14 08:31:21 2017 (r456280) @@ -0,0 +1,11 @@ +--- pokerth.proto.orig 2014-01-10 21:18:20 UTC ++++ pokerth.proto +@@ -701,7 +701,7 @@ message ReportGameAckMessage { + + message ErrorMessage { + enum ErrorReason { +- reserved = 0; ++ pthreserved = 0; + initVersionNotSupported = 1; + initServerFull = 2; + initAuthFailure = 3; Added: head/games/pokerth/files/patch-src_net_common_netpacket.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/pokerth/files/patch-src_net_common_netpacket.cpp Thu Dec 14 08:31:21 2017 (r456280) @@ -0,0 +1,11 @@ +--- src/net/common/netpacket.cpp.orig 2014-01-10 21:18:20 UTC ++++ src/net/common/netpacket.cpp +@@ -249,7 +249,7 @@ NetPacket::GameErrorToNetError(int gameErrorReason) + retVal = ErrorMessage::sessionTimeout; + break; + default : +- retVal = ErrorMessage::reserved; ++ retVal = ErrorMessage::pthreserved; + break; + } + return retVal;