diff options
author | Matteo Bernardini | 2018-05-20 18:38:36 +0200 |
---|---|---|
committer | Matteo Bernardini | 2018-05-20 18:38:36 +0200 |
commit | a824dbc05057a7ebee9d6e389b1a9d94b2526841 (patch) | |
tree | b0a684ea03270d3921e4255b015e39dab4786073 /games/pokerth | |
parent | 3e13c69615265f8bb16da751be07dd649bd89c79 (diff) | |
download | old.slackbuilds-a824dbc05057a7ebee9d6e389b1a9d94b2526841.tar.gz |
20180520.1 global branch merge.current-20180520.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'games/pokerth')
-rw-r--r-- | games/pokerth/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch | 14 | ||||
-rw-r--r-- | games/pokerth/pokerth-1.1.2-boost-1.66-remove-deprecated.patch | 26 | ||||
-rw-r--r-- | games/pokerth/pokerth.SlackBuild | 33 | ||||
-rw-r--r-- | games/pokerth/pokerth.info | 6 |
4 files changed, 60 insertions, 19 deletions
diff --git a/games/pokerth/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch b/games/pokerth/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch new file mode 100644 index 0000000000..2e8c9c50c5 --- /dev/null +++ b/games/pokerth/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/pokerth/pokerth-1.1.2-boost-1.66-remove-deprecated.patch b/games/pokerth/pokerth-1.1.2-boost-1.66-remove-deprecated.patch new file mode 100644 index 0000000000..d265eb1db9 --- /dev/null +++ b/games/pokerth/pokerth-1.1.2-boost-1.66-remove-deprecated.patch @@ -0,0 +1,26 @@ +diff -Naur pokerth-1.1.2-rc.orig/src/net/common/clientthread.cpp pokerth-1.1.2-rc/src/net/common/clientthread.cpp +--- pokerth-1.1.2-rc.orig/src/net/common/clientthread.cpp 2017-08-16 14:24:03.000000000 +0200 ++++ pokerth-1.1.2-rc/src/net/common/clientthread.cpp 2017-12-23 21:48:58.660592917 +0100 +@@ -993,8 +993,7 @@ + newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v6())); + else + newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v4())); +- boost::asio::socket_base::non_blocking_io command(true); +- newSock->io_control(command); ++ newSock->non_blocking(true); + newSock->set_option(tcp::no_delay(true)); + newSock->set_option(boost::asio::socket_base::keep_alive(true)); + +diff -Naur pokerth-1.1.2-rc.orig/src/net/serveraccepthelper.h pokerth-1.1.2-rc/src/net/serveraccepthelper.h +--- pokerth-1.1.2-rc.orig/src/net/serveraccepthelper.h 2017-08-16 14:24:03.000000000 +0200 ++++ pokerth-1.1.2-rc/src/net/serveraccepthelper.h 2017-12-23 22:05:51.075613870 +0100 +@@ -122,8 +122,7 @@ + const boost::system::error_code &error) + { + if (!error) { +- boost::asio::socket_base::non_blocking_io command(true); +- acceptedSocket->io_control(command); ++ acceptedSocket->non_blocking(true); + acceptedSocket->set_option(typename P::no_delay(true)); + acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true)); + boost::shared_ptr<SessionData> sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService)); diff --git a/games/pokerth/pokerth.SlackBuild b/games/pokerth/pokerth.SlackBuild index 5412cb9fbe..d2dfdc6278 100644 --- a/games/pokerth/pokerth.SlackBuild +++ b/games/pokerth/pokerth.SlackBuild @@ -26,14 +26,13 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pokerth -SRCNAM=PokerTH -VERSION=${VERSION:-1.1.1} +VERSION=${VERSION:-1.1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -44,8 +43,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -61,11 +60,11 @@ fi set -e rm -rf $PKG -rm -rf $TMP/$SRCNAM-$VERSION-src mkdir -p $TMP $PKG $OUTPUT cd $TMP -tar xvf $CWD/$SRCNAM-$VERSION-src.tar.bz2 -cd $SRCNAM-$VERSION-src +rm -rf $PRGNAM-$VERSION-rc +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION-rc chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -73,18 +72,20 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# The headers to which this file points have moved in the newer libircclient... -# Thanks ponce. -sed -i "s|libircclient/||" src/net/common/ircthread.cpp +patch -p1 < $CWD/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch +patch -p1 < $CWD/pokerth-1.1.2-boost-1.66-remove-deprecated.patch -qmake pokerth.pro +qmake -spec linux-g++ pokerth.pro +make +mkdir -p $PKG/usr/bin +install -s -D -m 0755 bin/pokerth_server $PKG/usr/bin +install -s -D -m 0755 chatcleaner $PKG/usr/bin +make clean -make #CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" +qmake CONFIG+="client" -spec linux-g++ pokerth.pro +make make install DESTDIR=$PKG INSTALL_ROOT=$PKG -mkdir -p $PKG/usr/bin -install -s -D -m 0755 $TMP/$SRCNAM-$VERSION-src/bin/pokerth_server $PKG/usr/bin - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING INSTALL TODO ChangeLog \ $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/games/pokerth/pokerth.info b/games/pokerth/pokerth.info index 24588c1909..e3a18f5b1a 100644 --- a/games/pokerth/pokerth.info +++ b/games/pokerth/pokerth.info @@ -1,8 +1,8 @@ PRGNAM="pokerth" -VERSION="1.1.1" +VERSION="1.1.2" HOMEPAGE="https://www.pokerth.net" -DOWNLOAD="https://downloads.sourceforge.net/pokerth/PokerTH-1.1.1-src.tar.bz2" -MD5SUM="a7f76f95782099f966e5f2b6809f502a" +DOWNLOAD="https://downloads.sourceforge.net/pokerth/pokerth-1.1.2.tar.gz" +MD5SUM="8fd7d7fc7ece17315e58aa3240dd4586" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libgsasl libircclient tinyxml protobuf" |