Index: head/games/pokerth/files/patch-pokerth_game.pro =================================================================== --- head/games/pokerth/files/patch-pokerth_game.pro (revision 450040) +++ head/games/pokerth/files/patch-pokerth_game.pro (revision 450041) @@ -1,31 +1,31 @@ ---- 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 - LIB_DIRS = $${PREFIX}/lib \ - $${PREFIX}/lib64 \ - $$system(qmake -query QT_INSTALL_LIBS) + LIB_DIRS = $${PREFIX}/lib } android{ LIBPATH += $${PREFIX}/lib/armv7 -@@ -427,7 +425,7 @@ +@@ -427,7 +425,7 @@ unix:!mac { BOOST_RANDOM = boost_random \ boost_random-mt - # searching in $PREFIX/lib, $PREFIX/lib64 and $$system(qmake -query QT_INSTALL_LIBS) + # searching in $PREFIX/lib # 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 - !isEmpty( BSD ):isEmpty( kFreeBSD ):LIBS += -lcrypto + !isEmpty( BSD ):isEmpty( kFreeBSD ):LIBS += -lcrypto -lssl else:LIBS += -lgcrypt } android{ Index: head/games/pokerth/files/patch-pokerth_server.pro =================================================================== --- head/games/pokerth/files/patch-pokerth_server.pro (revision 450040) +++ head/games/pokerth/files/patch-pokerth_server.pro (revision 450041) @@ -1,11 +1,11 @@ ---- 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 ){ - LIBS += -lcrypto -liconv + LIBS += -lcrypto -liconv -lssl } else { LIBS += -lgcrypt } Index: head/games/pokerth/files/patch-src_engine_log.h =================================================================== --- head/games/pokerth/files/patch-src_engine_log.h (revision 450040) +++ head/games/pokerth/files/patch-src_engine_log.h (revision 450041) @@ -1,10 +1,10 @@ ---- 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" +#include struct sqlite3; Index: head/games/pokerth/files/patch-src_gui_qt_gametable_gametableimpl.cpp =================================================================== --- head/games/pokerth/files/patch-src_gui_qt_gametable_gametableimpl.cpp (nonexistent) +++ head/games/pokerth/files/patch-src_gui_qt_gametable_gametableimpl.cpp (revision 450041) @@ -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()); + } + } Property changes on: head/games/pokerth/files/patch-src_gui_qt_gametable_gametableimpl.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/pokerth/files/patch-src_net_common_ircthread.cpp =================================================================== --- head/games/pokerth/files/patch-src_net_common_ircthread.cpp (revision 450040) +++ head/games/pokerth/files/patch-src_net_common_ircthread.cpp (revision 450041) @@ -1,20 +1,20 @@ ---- 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 #include -#include +#include +#include // We need to do the following to handle different versions of libircclient. // Sadly, libircclient doesn't have actual definitions for its versions in its headers. // However, we can use a definition that appeared in the same version we need // to check for. Hacky, but hey, it works. #ifdef LIBIRC_OPTION_SSL_NO_VERIFY -#include +#include #endif #include