[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/
commit: db417400c886b07681470089828ec6679a643730 Author: Stefan Strogin gentoo org> AuthorDate: Tue Oct 10 00:43:53 2023 + Commit: Stefan Strogin gentoo org> CommitDate: Tue Oct 10 00:54:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db417400 games-board/pokerth: fix build with protobuf-23.3 Closes: https://bugs.gentoo.org/912793 Signed-off-by: Stefan Strogin gentoo.org> .../pokerth/files/pokerth-1.1.2-protobuf-23.patch | 57 ++ games-board/pokerth/pokerth-1.1.2-r1.ebuild| 1 + 2 files changed, 58 insertions(+) diff --git a/games-board/pokerth/files/pokerth-1.1.2-protobuf-23.patch b/games-board/pokerth/files/pokerth-1.1.2-protobuf-23.patch new file mode 100644 index ..4907b7541969 --- /dev/null +++ b/games-board/pokerth/files/pokerth-1.1.2-protobuf-23.patch @@ -0,0 +1,57 @@ +From da0855690cfec5129a60dfe33128ebd393389989 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Tue, 10 Oct 2023 00:30:29 + +Subject: [PATCH] Fix linking with protobuf 23 + +--- + chatcleaner.pro| 2 ++ + pokerth_game.pro | 4 +++- + pokerth_server.pro | 4 +++- + 3 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/chatcleaner.pro b/chatcleaner.pro +index 6d63b4a9..d9f50ab4 100644 +--- a/chatcleaner.pro b/chatcleaner.pro +@@ -38,6 +38,8 @@ LIBPATH += lib + LIBS += -lpokerth_lib \ + -lpokerth_protocol \ + -lprotobuf \ ++ -labsl_log_internal_check_op \ ++ -labsl_log_internal_message \ + -ltinyxml + + win32 { +diff --git a/pokerth_game.pro b/pokerth_game.pro +index 2c188e44..9ef53666 100644 +--- a/pokerth_game.pro b/pokerth_game.pro +@@ -524,7 +524,9 @@ unix:!mac { + kFreeBSD = $$find(UNAME, "kFreeBSD") + LIBS += -lsqlite3 \ + -ltinyxml \ +- -lprotobuf ++ -lprotobuf \ ++ -labsl_log_internal_check_op \ ++ -labsl_log_internal_message + LIBS += $$BOOST_LIBS + LIBS += -lSDL \ + -lSDL_mixer \ +diff --git a/pokerth_server.pro b/pokerth_server.pro +index ccaff69e..20cc3eca 100644 +--- a/pokerth_server.pro b/pokerth_server.pro +@@ -285,7 +285,9 @@ unix : !mac { + LIBS += $$BOOST_LIBS + LIBS += -lsqlite3 \ + -ltinyxml \ +- -lprotobuf ++ -lprotobuf \ ++ -labsl_log_internal_check_op \ ++ -labsl_log_internal_message + LIBS += -lgsasl + !isEmpty( BSD ): isEmpty( kFreeBSD ){ + LIBS += -lcrypto -liconv +-- +2.42.0 + diff --git a/games-board/pokerth/pokerth-1.1.2-r1.ebuild b/games-board/pokerth/pokerth-1.1.2-r1.ebuild index 17063c8c8b00..76847f7d9fb7 100644 --- a/games-board/pokerth/pokerth-1.1.2-r1.ebuild +++ b/games-board/pokerth/pokerth-1.1.2-r1.ebuild @@ -46,6 +46,7 @@ PATCHES=( # unbundle dev-cpp/websocketpp "${FILESDIR}"/${PN}-1.1.2-system-websockets.patch "${FILESDIR}"/${PN}-1.1.2-boost-1.73.patch + "${FILESDIR}"/${PN}-1.1.2-protobuf-23.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/
commit: 6b7cf86c7fdd7ce8c0bc3be8375dfd7df2953a49 Author: David Seifert gentoo org> AuthorDate: Sat May 20 10:33:44 2023 + Commit: David Seifert gentoo org> CommitDate: Sat May 20 10:33:44 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b7cf86c games-board/pokerth: depend on boost[zlib] Closes: https://bugs.gentoo.org/905317 Signed-off-by: David Seifert gentoo.org> .../pokerth/{pokerth-1.1.2.ebuild => pokerth-1.1.2-r1.ebuild} | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/games-board/pokerth/pokerth-1.1.2.ebuild b/games-board/pokerth/pokerth-1.1.2-r1.ebuild similarity index 94% rename from games-board/pokerth/pokerth-1.1.2.ebuild rename to games-board/pokerth/pokerth-1.1.2-r1.ebuild index 4a003de8dc78..17063c8c8b00 100644 --- a/games-board/pokerth/pokerth-1.1.2.ebuild +++ b/games-board/pokerth/pokerth-1.1.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,8 +14,9 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="dedicated" -RDEPEND="dev-db/sqlite:3 - dev-libs/boost:= +RDEPEND=" + dev-db/sqlite:3 + dev-libs/boost:=[zlib] dev-libs/libgcrypt:0 dev-libs/protobuf:0= dev-libs/tinyxml[stl]
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/
commit: 08ce8fe20f1a4cf2940577bc61267aac08e3c9a0 Author: David Seifert gentoo org> AuthorDate: Sun Sep 4 12:22:43 2022 + Commit: David Seifert gentoo org> CommitDate: Sun Sep 4 12:22:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ce8fe2 games-board/pokerth: remove boost slot deps Signed-off-by: David Seifert gentoo.org> games-board/pokerth/pokerth-1.1.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-board/pokerth/pokerth-1.1.2.ebuild b/games-board/pokerth/pokerth-1.1.2.ebuild index f2668b088980..4a003de8dc78 100644 --- a/games-board/pokerth/pokerth-1.1.2.ebuild +++ b/games-board/pokerth/pokerth-1.1.2.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" IUSE="dedicated" RDEPEND="dev-db/sqlite:3 - dev-libs/boost:0= + dev-libs/boost:= dev-libs/libgcrypt:0 dev-libs/protobuf:0= dev-libs/tinyxml[stl]
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/files/, games-board/pokerth/
commit: 37c8f41312b0ad6f990df3b17eba2b06aabc38e9 Author: Stefan Strogin gentoo org> AuthorDate: Mon May 18 01:30:28 2020 + Commit: Stefan Strogin gentoo org> CommitDate: Mon May 18 01:33:27 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37c8f413 games-board/pokerth: add patch for boost-1.73 Closes: https://bugs.gentoo.org/723520 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Stefan Strogin gentoo.org> .../pokerth/files/pokerth-1.1.2-boost-1.73.patch | 42 ++ games-board/pokerth/pokerth-1.1.2.ebuild | 3 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/games-board/pokerth/files/pokerth-1.1.2-boost-1.73.patch b/games-board/pokerth/files/pokerth-1.1.2-boost-1.73.patch new file mode 100644 index 000..9733ffa2f8e --- /dev/null +++ b/games-board/pokerth/files/pokerth-1.1.2-boost-1.73.patch @@ -0,0 +1,42 @@ +From a769887330a317d55e7f64c71a32ad130ffb9307 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Mon, 18 May 2020 03:30:53 +0300 +Subject: [PATCH] Fix using boost placeholders (#395) + +Bug: https://bugs.gentoo.org/723520 +Upstream-Status: Submitted [https://github.com/pokerth/pokerth/pull/396] +Signed-off-by: Stefan Strogin +--- + src/net/common/serveracceptwebhelper.cpp | 9 + + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/net/common/serveracceptwebhelper.cpp b/src/net/common/serveracceptwebhelper.cpp +index f61d4d77..8701e1e9 100644 +--- a/src/net/common/serveracceptwebhelper.cpp b/src/net/common/serveracceptwebhelper.cpp +@@ -29,6 +29,7 @@ + * as that of the covered work. * + */ + ++#include + #include + #include + #include +@@ -58,10 +59,10 @@ ServerAcceptWebHelper::Listen(unsigned serverPort, bool /*ipv6*/, const std::str + + m_webSocketServer->init_asio(m_ioService.get()); + +- m_webSocketServer->set_validate_handler(boost::bind(boost::mem_fn(::validate), this, _1)); +- m_webSocketServer->set_open_handler(boost::bind(boost::mem_fn(::on_open), this, _1)); +- m_webSocketServer->set_close_handler(boost::bind(boost::mem_fn(::on_close), this, _1)); +- m_webSocketServer->set_message_handler(boost::bind(boost::mem_fn(::on_message), this, _1, _2)); ++ m_webSocketServer->set_validate_handler(boost::bind(boost::mem_fn(::validate), this, boost::placeholders::_1)); ++ m_webSocketServer->set_open_handler(boost::bind(boost::mem_fn(::on_open), this, boost::placeholders::_1)); ++ m_webSocketServer->set_close_handler(boost::bind(boost::mem_fn(::on_close), this, boost::placeholders::_1)); ++ m_webSocketServer->set_message_handler(boost::bind(boost::mem_fn(::on_message), this, boost::placeholders::_1, boost::placeholders::_2)); + + m_webSocketServer->listen(serverPort); + m_webSocketServer->start_accept(); +-- +2.26.2 + diff --git a/games-board/pokerth/pokerth-1.1.2.ebuild b/games-board/pokerth/pokerth-1.1.2.ebuild index 08afd16fde1..4414a4a4561 100644 --- a/games-board/pokerth/pokerth-1.1.2.ebuild +++ b/games-board/pokerth/pokerth-1.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -44,6 +44,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.1.2-fix-includes.patch # unbundle dev-cpp/websocketpp "${FILESDIR}"/${PN}-1.1.2-system-websockets.patch + "${FILESDIR}"/${PN}-1.1.2-boost-1.73.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/
commit: 1cf782e353b8105b11571c421d819f0db6945506 Author: David Seifert gentoo org> AuthorDate: Sun Aug 11 19:50:41 2019 + Commit: David Seifert gentoo org> CommitDate: Sun Aug 11 19:51:02 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf782e3 games-board/pokerth: Fix virtual/pkgconfig in BDEPEND Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: David Seifert gentoo.org> games-board/pokerth/pokerth-1.1.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-board/pokerth/pokerth-1.1.2.ebuild b/games-board/pokerth/pokerth-1.1.2.ebuild index c133c405644..08afd16fde1 100644 --- a/games-board/pokerth/pokerth-1.1.2.ebuild +++ b/games-board/pokerth/pokerth-1.1.2.ebuild @@ -32,8 +32,8 @@ RDEPEND="dev-db/sqlite:3 )" DEPEND="${RDEPEND} dev-cpp/websocketpp - !dedicated? ( dev-qt/qtsql:5 ) - virtual/pkgconfig" + !dedicated? ( dev-qt/qtsql:5 )" +BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${P}-rc"
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/
commit: ce5832b57c718f259d4cbaf00e2e9f5128d0d70f Author: David Seifert gentoo org> AuthorDate: Sun Aug 11 19:12:08 2019 + Commit: David Seifert gentoo org> CommitDate: Sun Aug 11 19:12:08 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce5832b5 games-board/pokerth: Port to EAPI 7 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: David Seifert gentoo.org> games-board/pokerth/pokerth-1.1.2.ebuild | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/games-board/pokerth/pokerth-1.1.2.ebuild b/games-board/pokerth/pokerth-1.1.2.ebuild index 685ac05c300..c133c405644 100644 --- a/games-board/pokerth/pokerth-1.1.2.ebuild +++ b/games-board/pokerth/pokerth-1.1.2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit desktop gnome2-utils qmake-utils +inherit desktop qmake-utils xdg DESCRIPTION="Texas Hold'em poker game" HOMEPAGE="https://www.pokerth.net/; @@ -47,7 +47,7 @@ PATCHES=( ) src_prepare() { - default + xdg_src_prepare sed -i 's/!client//' *.pro || die # delete bundled dev-cpp/websocketpp to be safe @@ -73,7 +73,3 @@ src_install() { doicon -s 128 ${PN}.png fi } - -pkg_preinst() { gnome2_icon_savelist; } -pkg_postinst() { gnome2_icon_cache_update; } -pkg_postrm() { gnome2_icon_cache_update; }
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/files/, games-board/pokerth/
commit: a3f67754346ac4fc694059dc38790058aa37cc40 Author: David Seifert gentoo org> AuthorDate: Sun Aug 11 19:12:05 2019 + Commit: David Seifert gentoo org> CommitDate: Sun Aug 11 19:12:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3f67754 games-board/pokerth: Unbundle dev-cpp/websocketpp Closes: https://bugs.gentoo.org/689298 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: David Seifert gentoo.org> .../pokerth/files/pokerth-1.1.2-boost-1.66.patch | 38 .../pokerth/files/pokerth-1.1.2-fix-includes.patch | 106 + .../files/pokerth-1.1.2-system-websockets.patch| 17 games-board/pokerth/pokerth-1.1.2.ebuild | 10 +- 4 files changed, 170 insertions(+), 1 deletion(-) diff --git a/games-board/pokerth/files/pokerth-1.1.2-boost-1.66.patch b/games-board/pokerth/files/pokerth-1.1.2-boost-1.66.patch new file mode 100644 index 000..94eb5b2c570 --- /dev/null +++ b/games-board/pokerth/files/pokerth-1.1.2-boost-1.66.patch @@ -0,0 +1,38 @@ +Description: Fix build failure with deprecated io_control in boost 1.66 +Origin: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224123 +Last-Update: 2018-09-11 + +Index: pokerth-1.1.2/src/net/common/clientthread.cpp +=== +--- pokerth-1.1.2.orig/src/net/common/clientthread.cpp pokerth-1.1.2/src/net/common/clientthread.cpp +@@ -993,8 +993,12 @@ + 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())); ++#if BOOST_VERSION < 106600 + boost::asio::socket_base::non_blocking_io command(true); + newSock->io_control(command); ++#else ++ newSock->non_blocking(true); ++#endif + newSock->set_option(tcp::no_delay(true)); + newSock->set_option(boost::asio::socket_base::keep_alive(true)); + +Index: pokerth-1.1.2/src/net/serveraccepthelper.h +=== +--- pokerth-1.1.2.orig/src/net/serveraccepthelper.h pokerth-1.1.2/src/net/serveraccepthelper.h +@@ -122,8 +122,12 @@ + const boost::system::error_code ) + { + if (!error) { ++#if BOOST_VERSION < 106600 + boost::asio::socket_base::non_blocking_io command(true); + acceptedSocket->io_control(command); ++#else ++ acceptedSocket->non_blocking(true); ++#endif + acceptedSocket->set_option(typename P::no_delay(true)); + acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true)); + boost::shared_ptr sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService)); diff --git a/games-board/pokerth/files/pokerth-1.1.2-fix-includes.patch b/games-board/pokerth/files/pokerth-1.1.2-fix-includes.patch new file mode 100644 index 000..f03ff0dae4d --- /dev/null +++ b/games-board/pokerth/files/pokerth-1.1.2-fix-includes.patch @@ -0,0 +1,106 @@ +Description: fix build failure due to including -isystem /usr/include before everything else + (usr/include is already included by the compiler itself) +Author: Gianfranco Costamagna +Last-Update: 2018-10-02 + +--- a/chatcleaner.pro b/chatcleaner.pro +@@ -49,7 +49,6 @@ + !win32{ + # My release static build options + #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections +- INCLUDEPATH += $${PREFIX}/include + } + mac { + # make it x86_64 only +--- a/connectivity.pro b/connectivity.pro +@@ -40,7 +40,6 @@ + #QMAKE_LFLAGS += -Wl,--gc-sections + + QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib +- INCLUDEPATH += $${PREFIX}/include + LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) + BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt + BOOST_SYS = boost_system boost_system-mt +--- a/load.pro b/load.pro +@@ -41,7 +41,6 @@ + #QMAKE_LFLAGS += -Wl,--gc-sections + + QMAKE_LIBDIR += lib $${PREFIX}/lib /opt/gsasl/lib +- INCLUDEPATH += $${PREFIX}/include + LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) + BOOST_THREAD = boost_thread boost_thread-mt + BOOST_PROGRAM_OPTIONS = boost_program_options boost_program_options-mt +--- a/pokerth_dbofficial.pro b/pokerth_dbofficial.pro +@@ -73,7 +73,7 @@ + !win32 { + # My release static build options + # QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections +-INCLUDEPATH += /usr/include \ ++INCLUDEPATH += \ + /usr/include/mysql \ + /usr/include/mysql++ + INCLUDEPATH +=
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/
commit: e99b8bc1ffe6e199605cbddb7ec82fee8b571649 Author: David Seifert gentoo org> AuthorDate: Sun Jul 14 10:54:36 2019 + Commit: David Seifert gentoo org> CommitDate: Sun Jul 14 10:54:36 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e99b8bc1 games-board/pokerth: Add upper bound on boost-1.70 Bug: https://bugs.gentoo.org/689298 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: David Seifert gentoo.org> games-board/pokerth/pokerth-1.1.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-board/pokerth/pokerth-1.1.2.ebuild b/games-board/pokerth/pokerth-1.1.2.ebuild index 3a84288bbc7..5aa49bfc497 100644 --- a/games-board/pokerth/pokerth-1.1.2.ebuild +++ b/games-board/pokerth/pokerth-1.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" IUSE="dedicated" RDEPEND="dev-db/sqlite:3 - dev-libs/boost:0=[threads(+)] +
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/
commit: 5491d810d06b16b7606169535c25c74ced1adb49 Author: James Le Cuirot gentoo org> AuthorDate: Fri Apr 27 21:50:45 2018 + Commit: James Le Cuirot gentoo org> CommitDate: Fri Apr 27 21:50:45 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5491d810 games-board/pokerth: Drop old 1.1.1-r2 Package-Manager: Portage-2.3.31, Repoman-2.3.9 games-board/pokerth/Manifest | 1 - .../pokerth/files/pokerth-1.1.1-boost-1.60.patch | 150 - .../files/pokerth-1.1.1-boost-noexcept.patch | 80 --- .../pokerth/files/pokerth-1.1.1-qmake-gcc-6.patch | 86 games-board/pokerth/files/pokerth-1.1.1-qt5.patch | 19 --- games-board/pokerth/pokerth-1.1.1-r2.ebuild| 76 --- 6 files changed, 412 deletions(-) diff --git a/games-board/pokerth/Manifest b/games-board/pokerth/Manifest index 75c22499163..1e96e868f0e 100644 --- a/games-board/pokerth/Manifest +++ b/games-board/pokerth/Manifest @@ -1,2 +1 @@ -DIST PokerTH-1.1.1-src.tar.bz2 19326922 BLAKE2B 43c94c1330ca11eaa52e4729e52fed3ee4022b8486b626168933a20658bf0c79028adb39b68433e5ccb7c8618b610366f193720f821039adc0e9a84eff0488b7 SHA512 bd822d15747d94b67657ea2fd0b9c8c1bdad0031a6eae30380217387a702e5f648d6f612b1bff0355c3c301ecaf47ca9d635a526e575f1bc1c5f88e38a7f73c1 DIST pokerth-1.1.2.tar.gz 21354306 BLAKE2B d8e1ecc46e61d9c16ae3949099f6e72271a5ab2def9799652b0c612980e0c5e96cb2ccf4d659c1a90b9ac6433af95587fa5d44af80c16fb6a34a272751c9fc4a SHA512 d54c84f199636eb5a53580213e5e4ccc828cf565bf4b055797daa82e2ad54d8c52c7a16a781b82c8cc89d184a2b3c4105922394d08c7d2e06383b96963c36b5a diff --git a/games-board/pokerth/files/pokerth-1.1.1-boost-1.60.patch b/games-board/pokerth/files/pokerth-1.1.1-boost-1.60.patch deleted file mode 100644 index daaeca013b3..000 --- a/games-board/pokerth/files/pokerth-1.1.1-boost-1.60.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 69f820bb3d7c4dc8c838f115cb4c7ee5fd188721 Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely-Date: Thu, 26 Nov 2015 16:27:52 + -Subject: [PATCH] Qualify std::ifstream and std::ofstream - -Starting with Boost 1.60.0 includes -, which declares ifstream and ofstream -types that make the unqualified names ifstream and ofstream ambiguous. -The names must be qualified to refer to the std versions. - src/core/common/avatarmanager.cpp| 4 ++-- - src/core/common/loghelper_server.cpp | 6 +++--- - src/net/common/clientstate.cpp | 4 ++-- - src/net/common/clientthread.cpp | 4 ++-- - src/net/common/downloaderthread.cpp | 2 +- - src/pokerth_server.cpp | 2 +- - src/zlib_compress.cpp| 4 ++-- - 7 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp -index a8a52e4..0246b72 100644 a/src/core/common/avatarmanager.cpp -+++ b/src/core/common/avatarmanager.cpp -@@ -61,7 +61,7 @@ using namespace std; - using namespace boost::filesystem; - - struct AvatarFileState { -- ifstreaminputStream; -+ std::ifstream inputStream; - }; - - AvatarManager::AvatarManager(bool useExternalServer, const std::string , -@@ -371,7 +371,7 @@ AvatarManager::StoreAvatarInCache(const MD5Buf , AvatarFileType avatarFil - path tmpPath(cacheDir); - tmpPath /= (md5buf.ToString() + ext); - string fileName(tmpPath.file_string()); -- ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc); -+ std::ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc); - if (!o.fail()) { - o.write((const char *)data, size); - o.close(); -diff --git a/src/core/common/loghelper_server.cpp b/src/core/common/loghelper_server.cpp -index f79e4ca..a0d0350 100644 a/src/core/common/loghelper_server.cpp -+++ b/src/core/common/loghelper_server.cpp -@@ -67,7 +67,7 @@ void - internal_log_err(const string ) - { - if (!g_logFile.empty()) { -- ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); -+ std::ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); - if (!o.fail()) { - o << second_clock::local_time() << " ERR: " << msg; - o.flush(); -@@ -80,7 +80,7 @@ internal_log_msg(const std::string ) - { - if (g_logLevel) { - if (!g_logFile.empty()) { -- ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); -+ std::ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); - if (!o.fail()) - o << second_clock::local_time() << " MSG: " << msg; -
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/
commit: b1e9b981d868caa32a59110e89eda03bafcbe155 Author: James Le Cuirot gentoo org> AuthorDate: Fri Apr 27 21:49:39 2018 + Commit: James Le Cuirot gentoo org> CommitDate: Fri Apr 27 21:49:39 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1e9b981 games-board/pokerth: Version bump to 1.1.2 Fixes protobuf issue. Some libraries still need unbundling. Closes: https://bugs.gentoo.org/644460 Package-Manager: Portage-2.3.31, Repoman-2.3.9 games-board/pokerth/Manifest | 1 + .../pokerth/files/pokerth-1.1.2-protobuf.patch | 23 +++ games-board/pokerth/pokerth-1.1.2.ebuild | 71 ++ 3 files changed, 95 insertions(+) diff --git a/games-board/pokerth/Manifest b/games-board/pokerth/Manifest index bb54b52e704..75c22499163 100644 --- a/games-board/pokerth/Manifest +++ b/games-board/pokerth/Manifest @@ -1 +1,2 @@ DIST PokerTH-1.1.1-src.tar.bz2 19326922 BLAKE2B 43c94c1330ca11eaa52e4729e52fed3ee4022b8486b626168933a20658bf0c79028adb39b68433e5ccb7c8618b610366f193720f821039adc0e9a84eff0488b7 SHA512 bd822d15747d94b67657ea2fd0b9c8c1bdad0031a6eae30380217387a702e5f648d6f612b1bff0355c3c301ecaf47ca9d635a526e575f1bc1c5f88e38a7f73c1 +DIST pokerth-1.1.2.tar.gz 21354306 BLAKE2B d8e1ecc46e61d9c16ae3949099f6e72271a5ab2def9799652b0c612980e0c5e96cb2ccf4d659c1a90b9ac6433af95587fa5d44af80c16fb6a34a272751c9fc4a SHA512 d54c84f199636eb5a53580213e5e4ccc828cf565bf4b055797daa82e2ad54d8c52c7a16a781b82c8cc89d184a2b3c4105922394d08c7d2e06383b96963c36b5a diff --git a/games-board/pokerth/files/pokerth-1.1.2-protobuf.patch b/games-board/pokerth/files/pokerth-1.1.2-protobuf.patch new file mode 100644 index 000..0ac2ab0b153 --- /dev/null +++ b/games-board/pokerth/files/pokerth-1.1.2-protobuf.patch @@ -0,0 +1,23 @@ +https://github.com/pokerth/pokerth/issues/339 +--- PokerTH-1.1.1-src/pokerth.proto PokerTH-1.1.1-src.new/pokerth.proto +@@ -701,7 +701,7 @@ + + message ErrorMessage { + enum ErrorReason { +- reserved = 0; ++ custReserved = 0; + initVersionNotSupported = 1; + initServerFull = 2; + initAuthFailure = 3; +--- PokerTH-1.1.1-src/src/net/common/netpacket.cpp PokerTH-1.1.1-src.new/src/net/common/netpacket.cpp +@@ -249,7 +249,7 @@ + retVal = ErrorMessage::sessionTimeout; + break; + default : +- retVal = ErrorMessage::reserved; ++ retVal = ErrorMessage::custReserved; + break; + } + return retVal; diff --git a/games-board/pokerth/pokerth-1.1.2.ebuild b/games-board/pokerth/pokerth-1.1.2.ebuild new file mode 100644 index 000..3a84288bbc7 --- /dev/null +++ b/games-board/pokerth/pokerth-1.1.2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit desktop gnome2-utils qmake-utils + +DESCRIPTION="Texas Hold'em poker game" +HOMEPAGE="https://www.pokerth.net/; +SRC_URI="mirror://sourceforge/pokerth/${P}.tar.gz" + +LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dedicated" + +RDEPEND="dev-db/sqlite:3 + dev-libs/boost:0=[threads(+)] + dev-libs/libgcrypt:0 + dev-libs/protobuf:0= + dev-libs/tinyxml[stl] + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + >=net-libs/libircclient-1.6-r2 + >=net-misc/curl-7.16 + virtual/gsasl + !dedicated? ( + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + media-libs/libsdl:0 + media-libs/sdl-mixer[mod,vorbis] + )" +DEPEND="${RDEPEND} + !dedicated? ( dev-qt/qtsql:5 ) + virtual/pkgconfig" + +S="${WORKDIR}/${P}-rc" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.1-boost-1.65-ambiguous-advance.patch + "${FILESDIR}"/${PN}-1.1.2-protobuf.patch +) + +src_prepare() { + default + sed -i 's/!client//' *.pro || die +} + +src_configure() { + eqmake5 pokerth.pro \ + QMAKE_CFLAGS_ISYSTEM= \ + CONFIG+="$(use dedicated || echo client)" +} + +src_install() { + dobin bin/pokerth_server chatcleaner + dodoc docs/{gui_styling,server_setup}_howto.txt + doman docs/pokerth.1 + + if ! use dedicated; then + dobin ${PN} + insinto /usr/share/${PN} + doins -r data + domenu ${PN}.desktop + doicon -s 128 ${PN}.png + fi +} + +pkg_preinst() { gnome2_icon_savelist; } +pkg_postinst() { gnome2_icon_cache_update; } +pkg_postrm() { gnome2_icon_cache_update; }
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/
commit: 8872ca63c67badba6f4276c7753b0da03a6c4bcc Author: Michael Mair-Keimberger gmail com> AuthorDate: Wed Apr 18 07:13:06 2018 + Commit: David Seifert gentoo org> CommitDate: Wed Apr 18 18:14:58 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8872ca63 games-board/pokerth: use HTTPS games-board/pokerth/pokerth-1.1.1-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-board/pokerth/pokerth-1.1.1-r2.ebuild b/games-board/pokerth/pokerth-1.1.1-r2.ebuild index e0f3c1cf65f..a7c17d19809 100644 --- a/games-board/pokerth/pokerth-1.1.1-r2.ebuild +++ b/games-board/pokerth/pokerth-1.1.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,7 +7,7 @@ inherit eutils flag-o-matic qmake-utils MY_P="PokerTH-${PV}-src" DESCRIPTION="Texas Hold'em poker game" -HOMEPAGE="http://www.pokerth.net/; +HOMEPAGE="https://www.pokerth.net/; SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2" LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain"
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/
commit: 1f6eeb3ae3f00b88fa38398613a63d08422e320f Author: David Seifert gentoo org> AuthorDate: Thu Sep 7 07:13:02 2017 + Commit: David Seifert gentoo org> CommitDate: Thu Sep 7 07:13:20 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f6eeb3a games-board/pokerth: Fully qualify std::advance Closes: https://bugs.gentoo.org/show_bug.cgi?id=629966 Package-Manager: Portage-2.3.8, Repoman-2.3.3 .../files/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch | 14 ++ games-board/pokerth/pokerth-1.1.1-r2.ebuild| 9 + 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/games-board/pokerth/files/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch b/games-board/pokerth/files/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch new file mode 100644 index 000..2e8c9c50c5e --- /dev/null +++ b/games-board/pokerth/files/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(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-board/pokerth/pokerth-1.1.1-r2.ebuild b/games-board/pokerth/pokerth-1.1.1-r2.ebuild index 32e456bf3d7..be20d0fd206 100644 --- a/games-board/pokerth/pokerth-1.1.1-r2.ebuild +++ b/games-board/pokerth/pokerth-1.1.1-r2.ebuild @@ -38,10 +38,11 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} PATCHES=( - "${FILESDIR}/${P}-qt5.patch" - "${FILESDIR}/${P}-boost-1.60.patch" - "${FILESDIR}/${P}-qmake-gcc-6.patch" - "${FILESDIR}/${P}-boost-noexcept.patch" + "${FILESDIR}"/${PN}-1.1.1-qt5.patch + "${FILESDIR}"/${PN}-1.1.1-boost-1.60.patch + "${FILESDIR}"/${PN}-1.1.1-qmake-gcc-6.patch + "${FILESDIR}"/${PN}-1.1.1-boost-noexcept.patch + "${FILESDIR}"/${PN}-1.1.1-boost-1.65-ambiguous-advance.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/
commit: 001f7e2fd0c9334bbe2ddb4308ac1c78d90f0ad6 Author: David Seifert gentoo org> AuthorDate: Sun Jan 22 15:10:12 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Jan 22 16:04:42 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=001f7e2f games-board/pokerth: Remove old Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3597 .../pokerth/files/pokerth-1.1.1-underlinking.patch | 20 --- games-board/pokerth/pokerth-1.1.1-r1.ebuild| 67 - games-board/pokerth/pokerth-1.1.1.ebuild | 70 -- 3 files changed, 157 deletions(-) diff --git a/games-board/pokerth/files/pokerth-1.1.1-underlinking.patch b/games-board/pokerth/files/pokerth-1.1.1-underlinking.patch deleted file mode 100644 index 397fb7d.. --- a/games-board/pokerth/files/pokerth-1.1.1-underlinking.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Julian Ospald-Date: Thu Aug 16 22:25:12 UTC 2012 -Subject: build system - -fix compilation for linkers that don't permit underlinking -reorder linker line to fix issues with as-needed - pokerth_server.pro -+++ pokerth_server.pro -@@ -114,8 +114,8 @@ - LIBS += -lpokerth_lib \ - -lpokerth_db \ - -lpokerth_protocol \ -- -lcurl \ -- -lircclient -+ -lircclient \ -+ $$system(pkg-config --libs --static libcurl) - - win32 { - DEFINES += CURL_STATICLIB diff --git a/games-board/pokerth/pokerth-1.1.1-r1.ebuild b/games-board/pokerth/pokerth-1.1.1-r1.ebuild deleted file mode 100644 index 965e2467.. --- a/games-board/pokerth/pokerth-1.1.1-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit flag-o-matic eutils qmake-utils games - -MY_P="PokerTH-${PV}-src" -DESCRIPTION="Texas Hold'em poker game" -HOMEPAGE="http://www.pokerth.net/; -SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2" - -LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="dedicated" - -RDEPEND="dev-db/sqlite:3 - dev-libs/boost:=[threads(+)] - dev-libs/protobuf - dev-libs/libgcrypt:0 - dev-libs/tinyxml[stl] - >=net-libs/libircclient-1.6-r2 - >=net-misc/curl-7.16 - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - virtual/gsasl - !dedicated? ( - media-libs/libsdl:0 - media-libs/sdl-mixer[mod,vorbis] - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - )" -DEPEND="${RDEPEND} - !dedicated? ( dev-qt/qtsql:5 ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - if use dedicated ; then - sed -i -e 's/pokerth_game.pro//' pokerth.pro || die - fi - - sed -i -e '/no_dead_strip_inits_and_terms/d' *pro || die - - epatch "${FILESDIR}"/${P}-qt5.patch \ - "${FILESDIR}/${P}-boost-1.60.patch" -} - -src_configure() { - eqmake5 pokerth.pro -} - -src_install() { - dogamesbin bin/pokerth_server - if ! use dedicated ; then - dogamesbin ${PN} - insinto "${GAMES_DATADIR}/${PN}" - doins -r data - domenu ${PN}.desktop - doicon ${PN}.png - fi - doman docs/pokerth.1 - dodoc ChangeLog TODO docs/{gui_styling,server_setup}_howto.txt - prepgamesdirs -} diff --git a/games-board/pokerth/pokerth-1.1.1.ebuild b/games-board/pokerth/pokerth-1.1.1.ebuild deleted file mode 100644 index d12b3d8.. --- a/games-board/pokerth/pokerth-1.1.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit flag-o-matic eutils qt4-r2 games - -MY_P="PokerTH-${PV}-src" -DESCRIPTION="Texas Hold'em poker game" -HOMEPAGE="http://www.pokerth.net/; -SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2" - -LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="dedicated" - -RDEPEND="dev-db/sqlite:3 - dev-libs/boost:=[threads(+)] - dev-libs/protobuf - dev-libs/libgcrypt:0 - dev-libs/tinyxml[stl] - amd64? ( net-libs/libircclient ) - ppc? ( >=net-libs/libircclient-1.6-r2 ) - x86? ( net-libs/libircclient ) - >=net-misc/curl-7.16 - dev-qt/qtcore:4 - virtual/gsasl - !dedicated? ( - media-libs/libsdl:0 - media-libs/sdl-mixer[mod,vorbis] - dev-qt/qtgui:4 - )" -DEPEND="${RDEPEND} - !dedicated? ( dev-qt/qtsql:4 ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - if use dedicated ; then - sed -i \ - -e 's/pokerth_game.pro//' \ - pokerth.pro || die - fi - -
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/
commit: 864ff496bcda69860cf1883e37046661c0767d86 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jan 22 15:01:33 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jan 22 15:01:33 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=864ff496 games-board/pokerth: x86 stable wrt bug #600862 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> games-board/pokerth/pokerth-1.1.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-board/pokerth/pokerth-1.1.1-r2.ebuild b/games-board/pokerth/pokerth-1.1.1-r2.ebuild index 5eba2da..8dbc7c5 100644 --- a/games-board/pokerth/pokerth-1.1.1-r2.ebuild +++ b/games-board/pokerth/pokerth-1.1.1-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2" LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="dedicated" RDEPEND="dev-db/sqlite:3
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/
commit: 8480b7983946ecd0e210bfca0cdc6e8291f7a90a Author: Tobias Klausmann gentoo org> AuthorDate: Sun Jan 22 12:05:47 2017 + Commit: Tobias Klausmann gentoo org> CommitDate: Sun Jan 22 12:05:47 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8480b798 games-board/pokerth-1.1.1-r2: stable on amd64 Gentoo-Bug: 600862 games-board/pokerth/pokerth-1.1.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-board/pokerth/pokerth-1.1.1-r2.ebuild b/games-board/pokerth/pokerth-1.1.1-r2.ebuild index 3c3d066..5eba2da 100644 --- a/games-board/pokerth/pokerth-1.1.1-r2.ebuild +++ b/games-board/pokerth/pokerth-1.1.1-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2" LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="dedicated" RDEPEND="dev-db/sqlite:3
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/files/, games-board/pokerth/
commit: 0da8e9aaebe287713c18dd20850851e1ad09f2b4 Author: David Seifert gentoo org> AuthorDate: Sun Jan 22 11:34:39 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Jan 22 11:35:01 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0da8e9aa games-board/pokerth: Fix boost noexcept() errors Gentoo-bug: 600862 * Also allow for compiling with GCC 6 Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../files/pokerth-1.1.1-boost-noexcept.patch | 80 .../pokerth/files/pokerth-1.1.1-qmake-gcc-6.patch | 86 ++ games-board/pokerth/pokerth-1.1.1-r2.ebuild| 16 ++-- 3 files changed, 177 insertions(+), 5 deletions(-) diff --git a/games-board/pokerth/files/pokerth-1.1.1-boost-noexcept.patch b/games-board/pokerth/files/pokerth-1.1.1-boost-noexcept.patch new file mode 100644 index ..ab112e8 --- /dev/null +++ b/games-board/pokerth/files/pokerth-1.1.1-boost-noexcept.patch @@ -0,0 +1,80 @@ +Keep dynamic exception specifications in sync with boost. +See also: https://bugs.gentoo.org/show_bug.cgi?id=603354 + +--- a/src/third_party/websocketpp/websocketpp/error.hpp b/src/third_party/websocketpp/websocketpp/error.hpp +@@ -122,7 +122,7 @@ + public: + category() {} + +-char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ { ++char const * name() const BOOST_SYSTEM_NOEXCEPT { + return "websocketpp"; + } + +--- a/src/third_party/websocketpp/websocketpp/extensions/extension.hpp b/src/third_party/websocketpp/websocketpp/extensions/extension.hpp +@@ -62,7 +62,7 @@ + public: + category() {} + +-const char *name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ { ++const char *name() const BOOST_SYSTEM_NOEXCEPT { + return "websocketpp.extension"; + } + +--- a/src/third_party/websocketpp/websocketpp/processors/base.hpp b/src/third_party/websocketpp/websocketpp/processors/base.hpp +@@ -159,7 +159,7 @@ + public: + processor_category() {} + +-char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ { ++char const * name() const BOOST_SYSTEM_NOEXCEPT { + return "websocketpp.processor"; + } + +--- a/src/third_party/websocketpp/websocketpp/transport/asio/base.hpp b/src/third_party/websocketpp/websocketpp/transport/asio/base.hpp +@@ -202,7 +202,7 @@ + /// Asio transport error category + class category : public lib::error_category { + public: +-char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ { ++char const * name() const BOOST_SYSTEM_NOEXCEPT { + return "websocketpp.transport.asio"; + } + +--- a/src/third_party/websocketpp/websocketpp/transport/asio/security/base.hpp b/src/third_party/websocketpp/websocketpp/transport/asio/security/base.hpp +@@ -102,7 +102,7 @@ + /// Error category related to asio transport socket policies + class socket_category : public lib::error_category { + public: +-const char *name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ { ++const char *name() const BOOST_SYSTEM_NOEXCEPT { + return "websocketpp.transport.asio.socket"; + } + +--- a/src/third_party/websocketpp/websocketpp/transport/base/connection.hpp b/src/third_party/websocketpp/websocketpp/transport/base/connection.hpp +@@ -179,7 +179,7 @@ + public: + category() {} + +-char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ { ++char const * name() const BOOST_SYSTEM_NOEXCEPT { + return "websocketpp.transport"; + } + +--- a/src/third_party/websocketpp/websocketpp/transport/iostream/base.hpp b/src/third_party/websocketpp/websocketpp/transport/iostream/base.hpp +@@ -64,7 +64,7 @@ + public: + category() {} + +-char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ { ++char const * name() const BOOST_SYSTEM_NOEXCEPT { + return "websocketpp.transport.iostream"; + } + diff --git a/games-board/pokerth/files/pokerth-1.1.1-qmake-gcc-6.patch b/games-board/pokerth/files/pokerth-1.1.1-qmake-gcc-6.patch new file mode 100644 index ..aebf2b0 --- /dev/null +++ b/games-board/pokerth/files/pokerth-1.1.1-qmake-gcc-6.patch @@ -0,0 +1,86 @@ +From: Markus Koschany+Date: Tue, 23 Aug 2016 17:50:52 +0200 +Subject: qmake gcc-6 + +--- + chatcleaner.pro | 1 - + pokerth_db.pro | 1 - + pokerth_game.pro | 1 - + pokerth_lib.pro | 2 +- + pokerth_protocol.pro | 1 - + pokerth_server.pro | 1 - + 6 files changed, 1 insertion(+), 6 deletions(-) + +diff --git a/chatcleaner.pro b/chatcleaner.pro +index 6d63b4a..56070d8 100644 +--- a/chatcleaner.pro b/chatcleaner.pro +@@ -49,7 +49,6 @@ win32 { + !win32{ + # My release static build options + #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections +- INCLUDEPATH += $${PREFIX}/include + } + mac { + # make it x86_64 only +diff --git a/pokerth_db.pro b/pokerth_db.pro +index 7c2d142..c524ee3 100644 +--- a/pokerth_db.pro b/pokerth_db.pro +@@ -49,7 +49,6 @@ win32{ +
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/
commit: c381fd611fb42f52876775b7479978e100ac1726 Author: Austin English gentoo org> AuthorDate: Tue Aug 2 21:04:28 2016 + Commit: Austin English gentoo org> CommitDate: Tue Aug 2 21:33:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c381fd61 games-board/pokerth: remove deprecated games eclass Also update to EAPI 6 Gentoo-Bug: https://bugs.gentoo.org/574082 Package-Manager: portage-2.3.0 games-board/pokerth/pokerth-1.1.1-r2.ebuild | 70 + 1 file changed, 70 insertions(+) diff --git a/games-board/pokerth/pokerth-1.1.1-r2.ebuild b/games-board/pokerth/pokerth-1.1.1-r2.ebuild new file mode 100644 index 000..32febcd --- /dev/null +++ b/games-board/pokerth/pokerth-1.1.1-r2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit flag-o-matic eutils qmake-utils + +MY_P="PokerTH-${PV}-src" +DESCRIPTION="Texas Hold'em poker game" +HOMEPAGE="http://www.pokerth.net/; +SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2" + +LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dedicated" + +RDEPEND="dev-db/sqlite:3 + dev-libs/boost:=[threads(+)] + dev-libs/libgcrypt:0 + dev-libs/protobuf + dev-libs/tinyxml[stl] + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + >=net-libs/libircclient-1.6-r2 + >=net-misc/curl-7.16 + virtual/gsasl + !dedicated? ( + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + media-libs/libsdl:0 + media-libs/sdl-mixer[mod,vorbis] + )" +DEPEND="${RDEPEND} + !dedicated? ( dev-qt/qtsql:5 ) + virtual/pkgconfig" + +S=${WORKDIR}/${MY_P} + +PATCHES=( + "${FILESDIR}/${P}-qt5.patch" + "${FILESDIR}/${P}-boost-1.60.patch" +) + +src_prepare() { + default + + if use dedicated ; then + sed -i -e 's/pokerth_game.pro//' pokerth.pro || die + fi + + sed -i -e '/no_dead_strip_inits_and_terms/d' *pro || die +} + +src_configure() { + eqmake5 pokerth.pro +} + +src_install() { + dobin bin/pokerth_server + if ! use dedicated ; then + dobin ${PN} + insinto /usr/share/${PN} + doins -r data + domenu ${PN}.desktop + doicon ${PN}.png + fi + doman docs/pokerth.1 + dodoc ChangeLog TODO docs/{gui_styling,server_setup}_howto.txt +}
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/
commit: 00ab0956a5d82e15253bca84aabe9d32518bfd9c Author: David Seifert gentoo org> AuthorDate: Sun Apr 3 10:02:00 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Apr 3 10:02:00 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00ab0956 games-board/pokerth: Add upstream patch to qualify {i,o}fstream Gentoo-Bug: 578890 * Taken from https://github.com/pokerth/pokerth/commit/69f820bb3d7c4dc8c838f115cb4c7ee5fd188721 Package-Manager: portage-2.2.28 .../pokerth/files/pokerth-1.1.1-boost-1.60.patch | 150 + games-board/pokerth/pokerth-1.1.1-r1.ebuild| 3 +- 2 files changed, 152 insertions(+), 1 deletion(-) diff --git a/games-board/pokerth/files/pokerth-1.1.1-boost-1.60.patch b/games-board/pokerth/files/pokerth-1.1.1-boost-1.60.patch new file mode 100644 index 000..daaeca0 --- /dev/null +++ b/games-board/pokerth/files/pokerth-1.1.1-boost-1.60.patch @@ -0,0 +1,150 @@ +From 69f820bb3d7c4dc8c838f115cb4c7ee5fd188721 Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely+Date: Thu, 26 Nov 2015 16:27:52 + +Subject: [PATCH] Qualify std::ifstream and std::ofstream + +Starting with Boost 1.60.0 includes +, which declares ifstream and ofstream +types that make the unqualified names ifstream and ofstream ambiguous. +The names must be qualified to refer to the std versions. +--- + src/core/common/avatarmanager.cpp| 4 ++-- + src/core/common/loghelper_server.cpp | 6 +++--- + src/net/common/clientstate.cpp | 4 ++-- + src/net/common/clientthread.cpp | 4 ++-- + src/net/common/downloaderthread.cpp | 2 +- + src/pokerth_server.cpp | 2 +- + src/zlib_compress.cpp| 4 ++-- + 7 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp +index a8a52e4..0246b72 100644 +--- a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp +@@ -61,7 +61,7 @@ using namespace std; + using namespace boost::filesystem; + + struct AvatarFileState { +- ifstreaminputStream; ++ std::ifstream inputStream; + }; + + AvatarManager::AvatarManager(bool useExternalServer, const std::string , +@@ -371,7 +371,7 @@ AvatarManager::StoreAvatarInCache(const MD5Buf , AvatarFileType avatarFil + path tmpPath(cacheDir); + tmpPath /= (md5buf.ToString() + ext); + string fileName(tmpPath.file_string()); +- ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc); ++ std::ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc); + if (!o.fail()) { + o.write((const char *)data, size); + o.close(); +diff --git a/src/core/common/loghelper_server.cpp b/src/core/common/loghelper_server.cpp +index f79e4ca..a0d0350 100644 +--- a/src/core/common/loghelper_server.cpp b/src/core/common/loghelper_server.cpp +@@ -67,7 +67,7 @@ void + internal_log_err(const string ) + { + if (!g_logFile.empty()) { +- ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); ++ std::ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); + if (!o.fail()) { + o << second_clock::local_time() << " ERR: " << msg; + o.flush(); +@@ -80,7 +80,7 @@ internal_log_msg(const std::string ) + { + if (g_logLevel) { + if (!g_logFile.empty()) { +- ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); ++ std::ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); + if (!o.fail()) + o << second_clock::local_time() << " MSG: " << msg; + } +@@ -92,7 +92,7 @@ internal_log_level(const std::string , int logLevel) + { + if (g_logLevel >= logLevel) { + if (!g_logFile.empty()) { +- ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); ++ std::ofstream o(g_logFile.c_str(), ios_base::out | ios_base::app); + if (!o.fail()) + o << second_clock::local_time() << " OUT: " << msg; + } +diff --git a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp +index 143773b..080da2d 100644 +--- a/src/net/common/clientstate.cpp b/src/net/common/clientstate.cpp +@@ -308,8 +308,8 @@ ClientStateReadingServerList::Enter(boost::shared_ptr client) + + // Unzip the file using zlib. + try { +- ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary); +-
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/
commit: e8da960e4b7af528e34ee38f9baa82e2b3c6e908 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Mar 19 16:31:23 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Mar 19 16:31:23 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8da960e games-board/pokerth: amd64 stable wrt bug #577662 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> games-board/pokerth/pokerth-1.1.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-board/pokerth/pokerth-1.1.1-r1.ebuild b/games-board/pokerth/pokerth-1.1.1-r1.ebuild index 357ab9d..1c2e78e 100644 --- a/games-board/pokerth/pokerth-1.1.1-r1.ebuild +++ b/games-board/pokerth/pokerth-1.1.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2" LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="dedicated" RDEPEND="dev-db/sqlite:3
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/
commit: 9edee6a4e156b7084e580fad9853ba43da641746 Author: Michael Sterrett gentoo org> AuthorDate: Tue Feb 16 08:14:46 2016 + Commit: Michael Sterrett gentoo org> CommitDate: Tue Feb 16 08:14:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9edee6a4 games-board/pokerth: dev-qt/qtnetwork is always needed Package-Manager: portage-2.2.26 games-board/pokerth/pokerth-1.1.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-board/pokerth/pokerth-1.1.1-r1.ebuild b/games-board/pokerth/pokerth-1.1.1-r1.ebuild index 977229d..357ab9d 100644 --- a/games-board/pokerth/pokerth-1.1.1-r1.ebuild +++ b/games-board/pokerth/pokerth-1.1.1-r1.ebuild @@ -23,13 +23,13 @@ RDEPEND="dev-db/sqlite:3 >=net-libs/libircclient-1.6-r2 >=net-misc/curl-7.16 dev-qt/qtcore:5 + dev-qt/qtnetwork:5 virtual/gsasl !dedicated? ( media-libs/libsdl:0 media-libs/sdl-mixer[mod,vorbis] dev-qt/qtgui:5 dev-qt/qtwidgets:5 - dev-qt/qtnetwork:5 )" DEPEND="${RDEPEND} !dedicated? ( dev-qt/qtsql:5 )
[gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/files/, games-board/pokerth/
commit: bbfaabe4a1ed7fb66220b22424490763ab214d80 Author: Michael Sterrett gentoo org> AuthorDate: Sun Jan 31 22:31:18 2016 + Commit: Michael Sterrett gentoo org> CommitDate: Sun Jan 31 22:32:37 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbfaabe4 games-board/pokerth: rev bump to move to qt5 (bug #572678) Package-Manager: portage-2.2.26 games-board/pokerth/files/pokerth-1.1.1-qt5.patch | 19 +++ games-board/pokerth/pokerth-1.1.1-r1.ebuild | 66 +++ 2 files changed, 85 insertions(+) diff --git a/games-board/pokerth/files/pokerth-1.1.1-qt5.patch b/games-board/pokerth/files/pokerth-1.1.1-qt5.patch new file mode 100644 index 000..1d3dd63 --- /dev/null +++ b/games-board/pokerth/files/pokerth-1.1.1-qt5.patch @@ -0,0 +1,19 @@ +From 731f5f05f54065a67fa7c9f9bc8fe992390cb979 Mon Sep 17 00:00:00 2001 +From: Felix Hammer+Date: Fri, 7 Aug 2015 00:57:51 +0200 +Subject: [PATCH] Qt 5.5.0 patch for qtsingleapplication + +--- + src/third_party/qtsingleapplication/qtlocalpeer.cpp | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/third_party/qtsingleapplication/qtlocalpeer.cpp b/src/third_party/qtsingleapplication/qtlocalpeer.cpp +@@ -31,6 +31,7 @@ + + #include + #include ++#include + + #if defined(Q_OS_WIN) + #include diff --git a/games-board/pokerth/pokerth-1.1.1-r1.ebuild b/games-board/pokerth/pokerth-1.1.1-r1.ebuild new file mode 100644 index 000..977229d --- /dev/null +++ b/games-board/pokerth/pokerth-1.1.1-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit flag-o-matic eutils qmake-utils games + +MY_P="PokerTH-${PV}-src" +DESCRIPTION="Texas Hold'em poker game" +HOMEPAGE="http://www.pokerth.net/; +SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2" + +LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dedicated" + +RDEPEND="dev-db/sqlite:3 + dev-libs/boost:=[threads(+)] + dev-libs/protobuf + dev-libs/libgcrypt:0 + dev-libs/tinyxml[stl] + >=net-libs/libircclient-1.6-r2 + >=net-misc/curl-7.16 + dev-qt/qtcore:5 + virtual/gsasl + !dedicated? ( + media-libs/libsdl:0 + media-libs/sdl-mixer[mod,vorbis] + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtnetwork:5 + )" +DEPEND="${RDEPEND} + !dedicated? ( dev-qt/qtsql:5 ) + virtual/pkgconfig" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + if use dedicated ; then + sed -i -e 's/pokerth_game.pro//' pokerth.pro || die + fi + + sed -i -e '/no_dead_strip_inits_and_terms/d' *pro || die + + epatch "${FILESDIR}"/${P}-qt5.patch +} + +src_configure() { + eqmake5 pokerth.pro +} + +src_install() { + dogamesbin bin/pokerth_server + if ! use dedicated ; then + dogamesbin ${PN} + insinto "${GAMES_DATADIR}/${PN}" + doins -r data + domenu ${PN}.desktop + doicon ${PN}.png + fi + doman docs/pokerth.1 + dodoc ChangeLog TODO docs/{gui_styling,server_setup}_howto.txt + prepgamesdirs +}