* [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/files/, games-board/pokerth/
@ 2016-01-31 22:32 Michael Sterrett
0 siblings, 0 replies; 5+ messages in thread
From: Michael Sterrett @ 2016-01-31 22:32 UTC (permalink / raw
To: gentoo-commits
commit: bbfaabe4a1ed7fb66220b22424490763ab214d80
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 22:31:18 2016 +0000
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 22:32:37 2016 +0000
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 0000000..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 <f.hammer@web.de>
+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 <QCoreApplication>
+ #include <QTime>
++#include <QDataStream>
+
+ #if defined(Q_OS_WIN)
+ #include <QLibrary>
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 0000000..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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/files/, games-board/pokerth/
@ 2017-01-22 11:35 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2017-01-22 11:35 UTC (permalink / raw
To: gentoo-commits
commit: 0da8e9aaebe287713c18dd20850851e1ad09f2b4
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 11:34:39 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 11:35:01 2017 +0000
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 00000000..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 00000000..aebf2b0
--- /dev/null
+++ b/games-board/pokerth/files/pokerth-1.1.1-qmake-gcc-6.patch
@@ -0,0 +1,86 @@
+From: Markus Koschany <apo@debian.org>
+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{
+ !win32{
+ ##### My release static build options
+ #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+- INCLUDEPATH += $${PREFIX}/include
+ }
+
+ mac{
+diff --git a/pokerth_game.pro b/pokerth_game.pro
+index e3ddb03..e0e8660 100644
+--- a/pokerth_game.pro
++++ b/pokerth_game.pro
+@@ -404,7 +404,6 @@ unix:!mac {
+ # #### My release static build options
+ # QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+ # QMAKE_LFLAGS += -Wl,--gc-sections
+- INCLUDEPATH += $${PREFIX}/include
+ QMAKE_LIBDIR += lib
+ !android{
+ LIBPATH += $${PREFIX}/lib /opt/gsasl/lib
+diff --git a/pokerth_lib.pro b/pokerth_lib.pro
+index 6db489d..498d06e 100644
+--- a/pokerth_lib.pro
++++ b/pokerth_lib.pro
+@@ -243,7 +243,7 @@ win32{
+ !win32{
+ ##### My release static build options
+ #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+- INCLUDEPATH += $${PREFIX}/include /opt/gsasl/include
++ INCLUDEPATH += /opt/gsasl/include
+ }
+
+ mac{
+diff --git a/pokerth_protocol.pro b/pokerth_protocol.pro
+index 7a331df..2ead0ec 100644
+--- a/pokerth_protocol.pro
++++ b/pokerth_protocol.pro
+@@ -33,7 +33,6 @@ win32 {
+ DEFINES += _WIN32_WINNT=0x0501
+ }
+ unix : !mac {
+- INCLUDEPATH += $${PREFIX}/include
+ system(protoc pokerth.proto --cpp_out=src/third_party/protobuf)
+ system(protoc chatcleaner.proto --cpp_out=src/third_party/protobuf)
+ system(protoc pokerth.proto --java_out=tests/src)
+diff --git a/pokerth_server.pro b/pokerth_server.pro
+index 706475f..43b30f3 100644
+--- a/pokerth_server.pro
++++ b/pokerth_server.pro
+@@ -174,7 +174,6 @@ unix : !mac {
+ #QMAKE_LFLAGS += -Wl,--gc-sections
+
+ LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib
+- INCLUDEPATH += $${PREFIX}/include
+ LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
+ BOOST_FS = boost_filesystem boost_filesystem-mt
+ BOOST_THREAD = boost_thread boost_thread-mt
diff --git a/games-board/pokerth/pokerth-1.1.1-r2.ebuild b/games-board/pokerth/pokerth-1.1.1-r2.ebuild
index 32febcd..3c3d066 100644
--- a/games-board/pokerth/pokerth-1.1.1-r2.ebuild
+++ b/games-board/pokerth/pokerth-1.1.1-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
-inherit flag-o-matic eutils qmake-utils
+
+inherit eutils flag-o-matic qmake-utils
MY_P="PokerTH-${PV}-src"
DESCRIPTION="Texas Hold'em poker game"
@@ -40,12 +41,14 @@ 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"
)
src_prepare() {
default
- if use dedicated ; then
+ if use dedicated; then
sed -i -e 's/pokerth_game.pro//' pokerth.pro || die
fi
@@ -58,13 +61,16 @@ src_configure() {
src_install() {
dobin bin/pokerth_server
- if ! use dedicated ; then
+ if ! use dedicated; then
dobin ${PN}
insinto /usr/share/${PN}
doins -r data
domenu ${PN}.desktop
doicon ${PN}.png
fi
+
+ einstalldocs
+ dodoc docs/{gui_styling,server_setup}_howto.txt
+
doman docs/pokerth.1
- dodoc ChangeLog TODO docs/{gui_styling,server_setup}_howto.txt
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/files/, games-board/pokerth/
@ 2019-08-11 19:12 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2019-08-11 19:12 UTC (permalink / raw
To: gentoo-commits
commit: a3f67754346ac4fc694059dc38790058aa37cc40
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 19:12:05 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 19:12:05 2019 +0000
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 <soap <AT> 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 00000000000..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 &error)
+ {
+ 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> 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 00000000000..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 <locutusofborg@debian.org>
+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 += /opt/boost/include
+--- a/pokerth_db.pro
++++ b/pokerth_db.pro
+@@ -52,7 +52,6 @@
+ !win32{
+ ##### My release static build options
+ #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+- INCLUDEPATH += $${PREFIX}/include
+ }
+
+ mac{
+--- a/pokerth_game.pro
++++ b/pokerth_game.pro
+@@ -405,7 +405,6 @@
+ # #### My release static build options
+ # QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+ # QMAKE_LFLAGS += -Wl,--gc-sections
+- INCLUDEPATH += $${PREFIX}/include
+ QMAKE_LIBDIR += lib
+ !android{
+ LIBPATH += $${PREFIX}/lib /opt/gsasl/lib
+--- a/pokerth_lib.pro
++++ b/pokerth_lib.pro
+@@ -269,7 +269,7 @@
+ src/dbofficial/asyncdbadminplayers.cpp \
+ src/dbofficial/asyncdbblockplayer.cpp \
+ src/dbofficial/dbidmanager.cpp
+- INCLUDEPATH += /usr/include \
++ INCLUDEPATH += \
+ /usr/include/mysql \
+ /usr/include/mysql++
+ }
+@@ -286,7 +286,7 @@
+ !win32{
+ ##### My release static build options
+ #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
+- INCLUDEPATH += $${PREFIX}/include /opt/gsasl/include
++ INCLUDEPATH += opt/gsasl/include
+ }
+
+ mac{
+--- a/pokerth_protocol.pro
++++ b/pokerth_protocol.pro
+@@ -40,7 +40,6 @@
+ system(protoc pokerth.proto --java_out=tests/src)
+ }
+ unix : !mac {
+- INCLUDEPATH += $${PREFIX}/include
+ system(protoc pokerth.proto --cpp_out=src/third_party/protobuf)
+ system(protoc chatcleaner.proto --cpp_out=src/third_party/protobuf)
+ system(protoc pokerth.proto --java_out=tests/src)
+--- a/pokerth_server.pro
++++ b/pokerth_server.pro
+@@ -177,7 +177,6 @@
+ #QMAKE_LFLAGS += -Wl,--gc-sections
+
+ LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib
+- INCLUDEPATH += $${PREFIX}/include
+ # see issue https://github.com/pokerth/pokerth/issues/282
+ INCLUDEPATH += $${PREFIX}/include/libircclient
+ LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
diff --git a/games-board/pokerth/files/pokerth-1.1.2-system-websockets.patch b/games-board/pokerth/files/pokerth-1.1.2-system-websockets.patch
new file mode 100644
index 00000000000..25c757bc905
--- /dev/null
+++ b/games-board/pokerth/files/pokerth-1.1.2-system-websockets.patch
@@ -0,0 +1,17 @@
+Description: force use of system websocketpp library
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+
+Index: pokerth-1.1.2/pokerth_lib.pro
+===================================================================
+--- pokerth-1.1.2.orig/pokerth_lib.pro
++++ pokerth-1.1.2/pokerth_lib.pro
+@@ -30,8 +30,7 @@
+ src/engine/local_engine \
+ src/engine/network_engine \
+ src/config \
+- src/core \
+- src/third_party/websocketpp
++ src/core
+
+ DEPENDPATH += . \
+ src \
diff --git a/games-board/pokerth/pokerth-1.1.2.ebuild b/games-board/pokerth/pokerth-1.1.2.ebuild
index 5aa49bfc497..685ac05c300 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-1.70:0=[threads(+)]
+ dev-libs/boost:0=[threads(+)]
dev-libs/libgcrypt:0
dev-libs/protobuf:0=
dev-libs/tinyxml[stl]
@@ -31,6 +31,7 @@ RDEPEND="dev-db/sqlite:3
media-libs/sdl-mixer[mod,vorbis]
)"
DEPEND="${RDEPEND}
+ dev-cpp/websocketpp
!dedicated? ( dev-qt/qtsql:5 )
virtual/pkgconfig"
@@ -39,11 +40,18 @@ S="${WORKDIR}/${P}-rc"
PATCHES=(
"${FILESDIR}"/${PN}-1.1.1-boost-1.65-ambiguous-advance.patch
"${FILESDIR}"/${PN}-1.1.2-protobuf.patch
+ "${FILESDIR}"/${PN}-1.1.2-boost-1.66.patch
+ "${FILESDIR}"/${PN}-1.1.2-fix-includes.patch
+ # unbundle dev-cpp/websocketpp
+ "${FILESDIR}"/${PN}-1.1.2-system-websockets.patch
)
src_prepare() {
default
sed -i 's/!client//' *.pro || die
+
+ # delete bundled dev-cpp/websocketpp to be safe
+ rm -r src/third_party/websocketpp || die
}
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/files/, games-board/pokerth/
@ 2020-05-18 1:35 Stefan Strogin
0 siblings, 0 replies; 5+ messages in thread
From: Stefan Strogin @ 2020-05-18 1:35 UTC (permalink / raw
To: gentoo-commits
commit: 37c8f41312b0ad6f990df3b17eba2b06aabc38e9
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Mon May 18 01:30:28 2020 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Mon May 18 01:33:27 2020 +0000
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 <steils <AT> 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 00000000000..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 <steils@gentoo.org>
+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 <steils@gentoo.org>
+---
+ 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 <boost/bind/bind.hpp>
+ #include <net/serveracceptwebhelper.h>
+ #include <net/sessiondata.h>
+ #include <net/webreceivebuffer.h>
+@@ -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(&ServerAcceptWebHelper::validate), this, _1));
+- m_webSocketServer->set_open_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_open), this, _1));
+- m_webSocketServer->set_close_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_close), this, _1));
+- m_webSocketServer->set_message_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_message), this, _1, _2));
++ m_webSocketServer->set_validate_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::validate), this, boost::placeholders::_1));
++ m_webSocketServer->set_open_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_open), this, boost::placeholders::_1));
++ m_webSocketServer->set_close_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_close), this, boost::placeholders::_1));
++ m_webSocketServer->set_message_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::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() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/files/, games-board/pokerth/
@ 2024-07-12 20:56 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-07-12 20:56 UTC (permalink / raw
To: gentoo-commits
commit: df074f42f06206b342aa61a2718cbb31947a16a7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 20:54:29 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 20:54:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df074f42
games-board/pokerth: fix build w/ boost-1.85
Closes: https://bugs.gentoo.org/933265
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../pokerth/files/pokerth-1.1.2-boost-1.85.patch | 249 +++++++++++++++++++++
games-board/pokerth/pokerth-1.1.2-r1.ebuild | 1 +
2 files changed, 250 insertions(+)
diff --git a/games-board/pokerth/files/pokerth-1.1.2-boost-1.85.patch b/games-board/pokerth/files/pokerth-1.1.2-boost-1.85.patch
new file mode 100644
index 000000000000..c928afa4f136
--- /dev/null
+++ b/games-board/pokerth/files/pokerth-1.1.2-boost-1.85.patch
@@ -0,0 +1,249 @@
+https://bugs.gentoo.org/933265
+--- a/src/core/common/avatarmanager.cpp
++++ b/src/core/common/avatarmanager.cpp
+@@ -87,20 +87,20 @@ AvatarManager::Init(const string &dataDir, const string &cacheDir)
+ path tmpDataPath(dataDir);
+ {
+ boost::mutex::scoped_lock lock(m_cacheDirMutex);
+- m_cacheDir = tmpCachePath.directory_string();
++ m_cacheDir = tmpCachePath.string();
+ }
+ {
+ boost::mutex::scoped_lock lock(m_avatarsMutex);
+- tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/people/").directory_string(), m_avatars);
++ tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/people/").string(), m_avatars);
+ retVal = retVal && tmpRet;
+- tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/misc/").directory_string(), m_avatars);
++ tmpRet = InternalReadDirectory((tmpDataPath / "gfx/avatars/default/misc/").string(), m_avatars);
+ retVal = retVal && tmpRet;
+ }
+ if (cacheDir.empty() || tmpCachePath.empty())
+ LOG_ERROR("Cache directory was not set!");
+ else {
+ boost::mutex::scoped_lock lock(m_cachedAvatarsMutex);
+- tmpRet = InternalReadDirectory(tmpCachePath.directory_string(), m_cachedAvatars);
++ tmpRet = InternalReadDirectory(tmpCachePath.string(), m_cachedAvatars);
+ retVal = retVal && tmpRet;
+ }
+
+@@ -113,7 +113,7 @@ AvatarManager::AddSingleAvatar(const std::string &fileName)
+ {
+ bool retVal = false;
+ path filePath(fileName);
+- string tmpFileName(filePath.file_string());
++ string tmpFileName(filePath.string());
+
+ if (!fileName.empty() && !tmpFileName.empty()) {
+ unsigned outFileSize = 0;
+@@ -240,7 +240,7 @@ AvatarManager::GetAvatarFileType(const string &fileName)
+ AvatarFileType fileType;
+
+ path filePath(fileName);
+- string ext(extension(filePath));
++ string ext(filePath.extension().string());
+ if (boost::algorithm::iequals(ext, ".png"))
+ fileType = AVATAR_FILE_TYPE_PNG;
+ else if (boost::algorithm::iequals(ext, ".jpg") || boost::algorithm::iequals(ext, ".jpeg"))
+@@ -362,7 +362,7 @@ AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFil
+ if (IsValidAvatarFileType(avatarFileType, data, size)) {
+ path tmpPath(cacheDir);
+ tmpPath /= (md5buf.ToString() + ext);
+- string fileName(tmpPath.file_string());
++ string fileName(tmpPath.string());
+ std::ofstream o(fileName.c_str(), ios_base::out | ios_base::binary | ios_base::trunc);
+ if (!o.fail()) {
+ o.write((const char *)data, size);
+@@ -426,7 +426,7 @@ AvatarManager::RemoveOldAvatarCacheEntries()
+ }
+ try {
+ path cachePath(cacheDir);
+- cacheDir = cachePath.directory_string();
++ cacheDir = cachePath.string();
+ // Never delete anything if we do not have a special cache dir set.
+ if (!cacheDir.empty()) {
+ boost::mutex::scoped_lock lock(m_cachedAvatarsMutex);
+@@ -441,12 +441,12 @@ AvatarManager::RemoveOldAvatarCacheEntries()
+ while (i != end) {
+ bool keepFile = false;
+ path filePath(i->second);
+- string fileString(filePath.file_string());
++ string fileString(filePath.string());
+ // Only consider files which are definitely in the cache dir.
+ if (fileString.size() > cacheDir.size() && fileString.substr(0, cacheDir.size()) == cacheDir) {
+ // Only consider files with MD5 as file name.
+ MD5Buf tmpBuf;
+- if (exists(filePath) && tmpBuf.FromString(basename(filePath))) {
++ if (exists(filePath) && tmpBuf.FromString(filePath.stem().string())) {
+ timeMap.insert(TimeAvatarMap::value_type(last_write_time(filePath), i->first));
+ keepFile = true;
+ }
+@@ -520,10 +520,10 @@ AvatarManager::InternalReadDirectory(const std::string &dir, AvatarMap &avatars)
+ directory_iterator end;
+
+ while (i != end) {
+- if (is_regular(i->status())) {
+- string md5sum(basename(i->path()));
++ if (is_regular_file(i->status())) {
++ string md5sum(i->path().stem().string());
+ MD5Buf md5buf;
+- string fileName(i->path().file_string());
++ string fileName(i->path().string());
+ if (md5buf.FromString(md5sum)) {
+ // Only consider files with md5sum as name.
+ avatars.insert(AvatarMap::value_type(md5buf, fileName));
+--- a/src/core/common/loghelper_server.cpp
++++ b/src/core/common/loghelper_server.cpp
+@@ -59,7 +59,7 @@ loghelper_init(const string &logDir, int logLevel)
+ path tmpLogFile(logDir);
+ tmpLogFile /= SERVER_MSG_LOG_FILE_NAME;
+
+- g_logFile = tmpLogFile.directory_string();
++ g_logFile = tmpLogFile.string();
+ g_logLevel = logLevel;
+ }
+
+--- a/src/engine/log.cpp
++++ b/src/engine/log.cpp
+@@ -84,7 +84,7 @@ Log::init()
+ mySqliteLogFileName /= string("pokerth-log-") + curDateTime + ".pdb";
+
+ // open sqlite-db
+- sqlite3_open(mySqliteLogFileName.directory_string().c_str(), &mySqliteLogDb);
++ sqlite3_open(mySqliteLogFileName.string().c_str(), &mySqliteLogDb);
+ if( mySqliteLogDb != 0 ) {
+
+ int i;
+--- a/src/engine/log.h
++++ b/src/engine/log.h
+@@ -73,7 +73,7 @@ public:
+
+ std::string getMySqliteLogFileName()
+ {
+- return mySqliteLogFileName.directory_string();
++ return mySqliteLogFileName.string();
+ }
+
+ private:
+--- a/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp
++++ b/src/gui/qt/qttools/nonqthelper/nonqthelper.cpp
+@@ -65,7 +65,7 @@ std::string
+ NonQtHelper::getDataPathStdString(const char *argv0)
+ {
+ boost::filesystem::path startPath(argv0);
+- startPath = startPath.remove_leaf();
++ startPath = startPath.remove_filename();
+ startPath /= "data";
+- return stringToUtf8(startPath.directory_string());
++ return stringToUtf8(startPath.string());
+ }
+--- a/src/net/common/clientstate.cpp
++++ b/src/net/common/clientstate.cpp
+@@ -211,7 +211,7 @@ ClientStateStartServerListDownload::Enter(boost::shared_ptr<ClientThread> client
+ } else {
+ // Download the server list.
+ boost::shared_ptr<DownloadHelper> downloader(new DownloadHelper);
+- downloader->Init(client->GetContext().GetServerListUrl(), tmpServerListPath.directory_string());
++ downloader->Init(client->GetContext().GetServerListUrl(), tmpServerListPath.string());
+ ClientStateDownloadingServerList::Instance().SetDownloadHelper(downloader);
+ client->SetState(ClientStateDownloadingServerList::Instance());
+ }
+@@ -303,13 +303,13 @@ ClientStateReadingServerList::Enter(boost::shared_ptr<ClientThread> client)
+ path zippedServerListPath(context.GetCacheDir());
+ zippedServerListPath /= context.GetServerListUrl().substr(context.GetServerListUrl().find_last_of('/') + 1);
+ path xmlServerListPath;
+- if (extension(zippedServerListPath) == ".z") {
+- xmlServerListPath = change_extension(zippedServerListPath, "");
++ if (zippedServerListPath.extension().string() == ".z") {
++ xmlServerListPath = zippedServerListPath.replace_extension("");
+
+ // Unzip the file using zlib.
+ try {
+- std::ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary);
+- std::ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out | ios_base::trunc);
++ std::ifstream inFile(zippedServerListPath.string().c_str(), ios_base::in | ios_base::binary);
++ std::ofstream outFile(xmlServerListPath.string().c_str(), ios_base::out | ios_base::trunc);
+ boost::iostreams::filtering_streambuf<boost::iostreams::input> in;
+ in.push(boost::iostreams::zlib_decompressor());
+ in.push(inFile);
+@@ -321,7 +321,7 @@ ClientStateReadingServerList::Enter(boost::shared_ptr<ClientThread> client)
+ xmlServerListPath = zippedServerListPath;
+
+ // Parse the server address.
+- TiXmlDocument doc(xmlServerListPath.directory_string());
++ TiXmlDocument doc(xmlServerListPath.string());
+
+ if (doc.LoadFile()) {
+ client->ClearServerInfoMap();
+--- a/src/net/common/clientthread.cpp
++++ b/src/net/common/clientthread.cpp
+@@ -977,7 +977,7 @@ ClientThread::GetCacheServerListFileName()
+ size_t pos = serverListUrl.find_last_of('/');
+ if (!GetContext().GetCacheDir().empty() && !serverListUrl.empty() && pos != string::npos && ++pos < serverListUrl.length()) {
+ tmpServerListPath /= serverListUrl.substr(pos);
+- fileName = tmpServerListPath.directory_string();
++ fileName = tmpServerListPath.string();
+ }
+ return fileName;
+ }
+--- a/src/net/common/downloaderthread.cpp
++++ b/src/net/common/downloaderthread.cpp
+@@ -96,7 +96,7 @@ DownloaderThread::Main()
+ // Previous download was finished.
+ if (m_curDownloadData) {
+ path filepath(m_curDownloadData->filename);
+- std::ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary);
++ std::ifstream instream(filepath.string().c_str(), ios_base::in | ios_base::binary);
+ // Find out file size.
+ // Not fully portable, but works on win/linux/mac.
+ instream.seekg(0, ios_base::beg);
+@@ -132,7 +132,7 @@ DownloaderThread::Main()
+ }
+ if (m_curDownloadData && !m_curDownloadData->filename.empty()) {
+ path filepath(m_curDownloadData->filename);
+- m_downloadHelper->Init(m_curDownloadData->address, filepath.file_string());
++ m_downloadHelper->Init(m_curDownloadData->address, filepath.string());
+ m_downloadInProgress = true;
+ }
+ }
+--- a/src/net/common/serverlobbythread.cpp
++++ b/src/net/common/serverlobbythread.cpp
+@@ -275,7 +275,7 @@ ServerLobbyThread::Init(const string &logDir)
+ boost::filesystem::path logPath(logDir);
+ if (!logDir.empty()) {
+ logPath /= SERVER_STATISTICS_FILE_NAME;
+- m_statisticsFileName = logPath.directory_string();
++ m_statisticsFileName = logPath.string();
+ ReadStatisticsFile();
+ }
+ }
+@@ -1261,7 +1261,7 @@ ServerLobbyThread::HandleNetPacketAvatarEnd(boost::shared_ptr<SessionData> sessi
+ // Init finished - start session.
+ EstablishSession(session);
+ LOG_MSG("Client \"" << session->GetClientAddr() << "\" uploaded avatar \""
+- << boost::filesystem::path(avatarFileName).file_string() << "\".");
++ << boost::filesystem::path(avatarFileName).string() << "\".");
+ } else
+ SessionError(session, ERR_NET_WRONG_AVATAR_SIZE);
+ }
+--- a/src/net/common/uploaderthread.cpp
++++ b/src/net/common/uploaderthread.cpp
+@@ -94,7 +94,7 @@ UploaderThread::Main()
+ url += filepath.filename().string();
+ #endif
+ }
+- m_uploadHelper->Init(url, filepath.file_string(), data.user, data.pwd, data.filesize, data.httpPost);
++ m_uploadHelper->Init(url, filepath.string(), data.user, data.pwd, data.filesize, data.httpPost);
+ m_uploadInProgress = true;
+ }
+ }
+--- a/src/pokerth_server.cpp
++++ b/src/pokerth_server.cpp
+@@ -158,7 +158,7 @@ main(int argc, char *argv[])
+ if (pidFile.empty()) {
+ path tmpPidPath(myConfig->readConfigString("LogDir"));
+ tmpPidPath /= "pokerth.pid";
+- pidFile = tmpPidPath.directory_string();
++ pidFile = tmpPidPath.string();
+ }
+ {
+ std::ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc);
diff --git a/games-board/pokerth/pokerth-1.1.2-r1.ebuild b/games-board/pokerth/pokerth-1.1.2-r1.ebuild
index a5ec7b42c8e1..70d57e0843f2 100644
--- a/games-board/pokerth/pokerth-1.1.2-r1.ebuild
+++ b/games-board/pokerth/pokerth-1.1.2-r1.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
"${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
+ "${FILESDIR}"/${PN}-1.1.2-boost-1.85.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-07-12 20:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-12 20:56 [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/files/, games-board/pokerth/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-05-18 1:35 Stefan Strogin
2019-08-11 19:12 David Seifert
2017-01-22 11:35 David Seifert
2016-01-31 22:32 Michael Sterrett
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox