From owner-svn-ports-all@freebsd.org Mon Sep 18 14:04:07 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 1214DE129EA; Mon, 18 Sep 2017 14:04:07 +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 C85836A287; Mon, 18 Sep 2017 14:04:06 +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 v8IE45tE072444; Mon, 18 Sep 2017 14:04:05 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8IE45f8072439; Mon, 18 Sep 2017 14:04:05 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201709181404.v8IE45f8072439@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 18 Sep 2017 14:04:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450041 - head/games/pokerth/files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: head/games/pokerth/files X-SVN-Commit-Revision: 450041 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.23 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: Mon, 18 Sep 2017 14:04:07 -0000 Author: madpilot Date: Mon Sep 18 14:04:05 2017 New Revision: 450041 URL: https://svnweb.freebsd.org/changeset/ports/450041 Log: - Fix build failure with new boot version 1.65 - While here, regenerate some patches PR: 222190 Submitted by: jbeich@ Added: head/games/pokerth/files/patch-src_gui_qt_gametable_gametableimpl.cpp (contents, props changed) Modified: head/games/pokerth/files/patch-pokerth_game.pro head/games/pokerth/files/patch-pokerth_server.pro head/games/pokerth/files/patch-src_engine_log.h head/games/pokerth/files/patch-src_net_common_ircthread.cpp Modified: head/games/pokerth/files/patch-pokerth_game.pro ============================================================================== --- head/games/pokerth/files/patch-pokerth_game.pro Mon Sep 18 12:53:56 2017 (r450040) +++ head/games/pokerth/files/patch-pokerth_game.pro Mon Sep 18 14:04:05 2017 (r450041) @@ -1,6 +1,6 @@ ---- pokerth_game.pro.orig 2013-12-22 17:58:01.933816000 +0100 -+++ pokerth_game.pro 2013-12-23 12:19:53.142695431 +0100 -@@ -406,9 +406,7 @@ +--- pokerth_game.pro.orig 2014-01-10 21:18:20 UTC ++++ pokerth_game.pro +@@ -406,9 +406,7 @@ unix:!mac { QMAKE_LIBDIR += lib !android{ LIBPATH += $${PREFIX}/lib /opt/gsasl/lib @@ -11,7 +11,7 @@ } android{ LIBPATH += $${PREFIX}/lib/armv7 -@@ -427,7 +425,7 @@ +@@ -427,7 +425,7 @@ unix:!mac { BOOST_RANDOM = boost_random \ boost_random-mt @@ -20,7 +20,7 @@ # to override the default '/usr' pass PREFIX # variable to qmake. for(dir, LIB_DIRS):exists($$dir) { -@@ -501,7 +499,7 @@ +@@ -501,7 +499,7 @@ unix:!mac { LIBS += -lSDL \ -lSDL_mixer \ -lgsasl Modified: head/games/pokerth/files/patch-pokerth_server.pro ============================================================================== --- head/games/pokerth/files/patch-pokerth_server.pro Mon Sep 18 12:53:56 2017 (r450040) +++ head/games/pokerth/files/patch-pokerth_server.pro Mon Sep 18 14:04:05 2017 (r450041) @@ -1,6 +1,6 @@ ---- pokerth_server.pro.orig 2013-04-07 14:04:26.923209000 +0200 -+++ pokerth_server.pro 2013-09-05 14:53:56.604074418 +0200 -@@ -265,7 +265,7 @@ +--- pokerth_server.pro.orig 2014-01-10 21:18:20 UTC ++++ pokerth_server.pro +@@ -264,7 +264,7 @@ unix : !mac { -lprotobuf LIBS += -lgsasl !isEmpty( BSD ): isEmpty( kFreeBSD ){ Modified: head/games/pokerth/files/patch-src_engine_log.h ============================================================================== --- head/games/pokerth/files/patch-src_engine_log.h Mon Sep 18 12:53:56 2017 (r450040) +++ head/games/pokerth/files/patch-src_engine_log.h Mon Sep 18 14:04:05 2017 (r450041) @@ -1,6 +1,6 @@ ---- src/engine/log.h.orig 2012-01-04 13:48:11.224976420 +0100 -+++ src/engine/log.h 2012-01-04 14:01:30.113974000 +0100 -@@ -21,6 +21,7 @@ +--- src/engine/log.h.orig 2014-01-10 21:18:20 UTC ++++ src/engine/log.h +@@ -37,6 +37,7 @@ #include "engine_defs.h" #include "game_defs.h" Added: head/games/pokerth/files/patch-src_gui_qt_gametable_gametableimpl.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/pokerth/files/patch-src_gui_qt_gametable_gametableimpl.cpp Mon Sep 18 14:04:05 2017 (r450041) @@ -0,0 +1,11 @@ +--- src/gui/qt/gametable/gametableimpl.cpp.orig 2014-01-10 21:18:20 UTC ++++ src/gui/qt/gametable/gametableimpl.cpp +@@ -3859,7 +3859,7 @@ void gameTableImpl::triggerVoteOnKick(int id) + int playerCount = static_cast(seatList->size()); + if (id < playerCount) { + PlayerListIterator pos = seatList->begin(); +- advance(pos, id); ++ std::advance(pos, id); + myStartWindow->getSession()->startVoteKickPlayer((*pos)->getMyUniqueID()); + } + } Modified: head/games/pokerth/files/patch-src_net_common_ircthread.cpp ============================================================================== --- head/games/pokerth/files/patch-src_net_common_ircthread.cpp Mon Sep 18 12:53:56 2017 (r450040) +++ head/games/pokerth/files/patch-src_net_common_ircthread.cpp Mon Sep 18 14:04:05 2017 (r450041) @@ -1,5 +1,5 @@ ---- src/net/common/ircthread.cpp.orig 2013-04-07 14:04:27.006209000 +0200 -+++ src/net/common/ircthread.cpp 2013-04-21 11:26:39.764765351 +0200 +--- src/net/common/ircthread.cpp.orig 2014-01-10 21:18:20 UTC ++++ src/net/common/ircthread.cpp @@ -32,14 +32,15 @@ #include #include