* [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/
@ 2016-04-03 10:02 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2016-04-03 10:02 UTC (permalink / raw
To: gentoo-commits
commit: 00ab0956a5d82e15253bca84aabe9d32518bfd9c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 3 10:02:00 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 3 10:02:00 2016 +0000
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 0000000..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 <github@kayari.org>
+Date: Thu, 26 Nov 2015 16:27:52 +0000
+Subject: [PATCH] Qualify std::ifstream and std::ofstream
+
+Starting with Boost 1.60.0 <boost/filesystem.hpp> includes
+<boost/filesystem/fstream.hpp>, 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 {
+- ifstream inputStream;
++ std::ifstream inputStream;
+ };
+
+ AvatarManager::AvatarManager(bool useExternalServer, const std::string &externalServerAddress,
+@@ -371,7 +371,7 @@ AvatarManager::StoreAvatarInCache(const MD5Buf &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 &msg)
+ {
+ 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 &msg)
+ {
+ 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 &msg, 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<ClientThread> client)
+
+ // Unzip the file using zlib.
+ try {
+- ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary);
+- ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out | ios_base::trunc);
++ 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);
+ boost::iostreams::filtering_streambuf<boost::iostreams::input> in;
+ in.push(boost::iostreams::zlib_decompressor());
+ in.push(inFile);
+diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp
+index d60a535..1f3a619 100644
+--- a/src/net/common/clientthread.cpp
++++ b/src/net/common/clientthread.cpp
+@@ -1695,7 +1695,7 @@ void
+ ClientThread::ReadSessionGuidFromFile()
+ {
+ string guidFileName(GetContext().GetCacheDir() + TEMP_GUID_FILENAME);
+- ifstream guidStream(guidFileName.c_str(), ios::in | ios::binary);
++ std::ifstream guidStream(guidFileName.c_str(), ios::in | ios::binary);
+ if (guidStream.good()) {
+ std::vector<char> tmpGuid(CLIENT_GUID_SIZE);
+ guidStream.read(&tmpGuid[0], CLIENT_GUID_SIZE);
+@@ -1707,7 +1707,7 @@ void
+ ClientThread::WriteSessionGuidToFile() const
+ {
+ string guidFileName(GetContext().GetCacheDir() + TEMP_GUID_FILENAME);
+- ofstream guidStream(guidFileName.c_str(), ios::out | ios::trunc | ios::binary);
++ std::ofstream guidStream(guidFileName.c_str(), ios::out | ios::trunc | ios::binary);
+ if (guidStream.good()) {
+ guidStream.write(GetContext().GetSessionGuid().c_str(), GetContext().GetSessionGuid().size());
+ }
+diff --git a/src/net/common/downloaderthread.cpp b/src/net/common/downloaderthread.cpp
+index e58e3f8..56a9526 100644
+--- 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);
+- ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary);
++ std::ifstream instream(filepath.file_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);
+diff --git a/src/pokerth_server.cpp b/src/pokerth_server.cpp
+index 3b93d46..450a47e 100644
+--- a/src/pokerth_server.cpp
++++ b/src/pokerth_server.cpp
+@@ -161,7 +161,7 @@ main(int argc, char *argv[])
+ pidFile = tmpPidPath.directory_string();
+ }
+ {
+- ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc);
++ std::ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc);
+ if (!pidStream.fail())
+ pidStream << getpid();
+ else
+diff --git a/src/zlib_compress.cpp b/src/zlib_compress.cpp
+index e3fd72d..4b04817 100644
+--- a/src/zlib_compress.cpp
++++ b/src/zlib_compress.cpp
+@@ -59,8 +59,8 @@ main(int argc, char *argv[])
+ return 2;
+ }
+ try {
+- ifstream inFile(inputFilePath.directory_string().c_str(), ios_base::in);
+- ofstream outFile(outputFilePath.directory_string().c_str(), ios_base::out | ios_base::binary);
++ std::ifstream inFile(inputFilePath.directory_string().c_str(), ios_base::in);
++ std::ofstream outFile(outputFilePath.directory_string().c_str(), ios_base::out | ios_base::binary);
+ boost::iostreams::filtering_streambuf<boost::iostreams::output> out;
+ out.push(boost::iostreams::zlib_compressor());
+ out.push(outFile);
diff --git a/games-board/pokerth/pokerth-1.1.1-r1.ebuild b/games-board/pokerth/pokerth-1.1.1-r1.ebuild
index 1c2e78e..54b8748 100644
--- a/games-board/pokerth/pokerth-1.1.1-r1.ebuild
+++ b/games-board/pokerth/pokerth-1.1.1-r1.ebuild
@@ -44,7 +44,8 @@ src_prepare() {
sed -i -e '/no_dead_strip_inits_and_terms/d' *pro || die
- epatch "${FILESDIR}"/${P}-qt5.patch
+ epatch "${FILESDIR}"/${P}-qt5.patch \
+ "${FILESDIR}/${P}-boost-1.60.patch"
}
src_configure() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/
@ 2017-01-22 16:04 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2017-01-22 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 001f7e2fd0c9334bbe2ddb4308ac1c78d90f0ad6
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 15:10:12 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 16:04:42 2017 +0000
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..00000000
--- a/games-board/pokerth/files/pokerth-1.1.1-underlinking.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-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..00000000
--- 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..00000000
--- 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
-
- sed -i \
- -e '/no_dead_strip_inits_and_terms/d' \
- *pro || die
-
- #epatch "${FILESDIR}"/${P}-underlinking.patch
-}
-
-src_configure() {
- eqmake4
-}
-
-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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/
@ 2017-09-07 7:13 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2017-09-07 7:13 UTC (permalink / raw
To: gentoo-commits
commit: 1f6eeb3ae3f00b88fa38398613a63d08422e320f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 7 07:13:02 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Sep 7 07:13:20 2017 +0000
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 00000000000..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<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-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() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/
@ 2018-04-27 21:51 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2018-04-27 21:51 UTC (permalink / raw
To: gentoo-commits
commit: b1e9b981d868caa32a59110e89eda03bafcbe155
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 27 21:49:39 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 21:49:39 2018 +0000
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 00000000000..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 00000000000..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; }
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/
@ 2018-04-27 21:51 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2018-04-27 21:51 UTC (permalink / raw
To: gentoo-commits
commit: 5491d810d06b16b7606169535c25c74ced1adb49
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 27 21:50:45 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 21:50:45 2018 +0000
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..00000000000
--- 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 <github@kayari.org>
-Date: Thu, 26 Nov 2015 16:27:52 +0000
-Subject: [PATCH] Qualify std::ifstream and std::ofstream
-
-Starting with Boost 1.60.0 <boost/filesystem.hpp> includes
-<boost/filesystem/fstream.hpp>, 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 {
-- ifstream inputStream;
-+ std::ifstream inputStream;
- };
-
- AvatarManager::AvatarManager(bool useExternalServer, const std::string &externalServerAddress,
-@@ -371,7 +371,7 @@ AvatarManager::StoreAvatarInCache(const MD5Buf &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 &msg)
- {
- 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 &msg)
- {
- 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 &msg, 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<ClientThread> client)
-
- // Unzip the file using zlib.
- try {
-- ifstream inFile(zippedServerListPath.directory_string().c_str(), ios_base::in | ios_base::binary);
-- ofstream outFile(xmlServerListPath.directory_string().c_str(), ios_base::out | ios_base::trunc);
-+ 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);
- boost::iostreams::filtering_streambuf<boost::iostreams::input> in;
- in.push(boost::iostreams::zlib_decompressor());
- in.push(inFile);
-diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp
-index d60a535..1f3a619 100644
---- a/src/net/common/clientthread.cpp
-+++ b/src/net/common/clientthread.cpp
-@@ -1695,7 +1695,7 @@ void
- ClientThread::ReadSessionGuidFromFile()
- {
- string guidFileName(GetContext().GetCacheDir() + TEMP_GUID_FILENAME);
-- ifstream guidStream(guidFileName.c_str(), ios::in | ios::binary);
-+ std::ifstream guidStream(guidFileName.c_str(), ios::in | ios::binary);
- if (guidStream.good()) {
- std::vector<char> tmpGuid(CLIENT_GUID_SIZE);
- guidStream.read(&tmpGuid[0], CLIENT_GUID_SIZE);
-@@ -1707,7 +1707,7 @@ void
- ClientThread::WriteSessionGuidToFile() const
- {
- string guidFileName(GetContext().GetCacheDir() + TEMP_GUID_FILENAME);
-- ofstream guidStream(guidFileName.c_str(), ios::out | ios::trunc | ios::binary);
-+ std::ofstream guidStream(guidFileName.c_str(), ios::out | ios::trunc | ios::binary);
- if (guidStream.good()) {
- guidStream.write(GetContext().GetSessionGuid().c_str(), GetContext().GetSessionGuid().size());
- }
-diff --git a/src/net/common/downloaderthread.cpp b/src/net/common/downloaderthread.cpp
-index e58e3f8..56a9526 100644
---- 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);
-- ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary);
-+ std::ifstream instream(filepath.file_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);
-diff --git a/src/pokerth_server.cpp b/src/pokerth_server.cpp
-index 3b93d46..450a47e 100644
---- a/src/pokerth_server.cpp
-+++ b/src/pokerth_server.cpp
-@@ -161,7 +161,7 @@ main(int argc, char *argv[])
- pidFile = tmpPidPath.directory_string();
- }
- {
-- ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc);
-+ std::ofstream pidStream(pidFile.c_str(), ios_base::out | ios_base::trunc);
- if (!pidStream.fail())
- pidStream << getpid();
- else
-diff --git a/src/zlib_compress.cpp b/src/zlib_compress.cpp
-index e3fd72d..4b04817 100644
---- a/src/zlib_compress.cpp
-+++ b/src/zlib_compress.cpp
-@@ -59,8 +59,8 @@ main(int argc, char *argv[])
- return 2;
- }
- try {
-- ifstream inFile(inputFilePath.directory_string().c_str(), ios_base::in);
-- ofstream outFile(outputFilePath.directory_string().c_str(), ios_base::out | ios_base::binary);
-+ std::ifstream inFile(inputFilePath.directory_string().c_str(), ios_base::in);
-+ std::ofstream outFile(outputFilePath.directory_string().c_str(), ios_base::out | ios_base::binary);
- boost::iostreams::filtering_streambuf<boost::iostreams::output> out;
- out.push(boost::iostreams::zlib_compressor());
- out.push(outFile);
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
deleted file mode 100644
index ab112e831a0..00000000000
--- a/games-board/pokerth/files/pokerth-1.1.1-boost-noexcept.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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
deleted file mode 100644
index aebf2b0ab94..00000000000
--- a/games-board/pokerth/files/pokerth-1.1.1-qmake-gcc-6.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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/files/pokerth-1.1.1-qt5.patch b/games-board/pokerth/files/pokerth-1.1.1-qt5.patch
deleted file mode 100644
index 1d3dd63922f..00000000000
--- a/games-board/pokerth/files/pokerth-1.1.1-qt5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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-r2.ebuild b/games-board/pokerth/pokerth-1.1.1-r2.ebuild
deleted file mode 100644
index a7c17d19809..00000000000
--- a/games-board/pokerth/pokerth-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic qmake-utils
-
-MY_P="PokerTH-${PV}-src"
-DESCRIPTION="Texas Hold'em poker game"
-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"
-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}"/${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() {
- 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
-
- einstalldocs
- dodoc docs/{gui_styling,server_setup}_howto.txt
-
- doman docs/pokerth.1
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/
@ 2023-10-10 0:55 Stefan Strogin
0 siblings, 0 replies; 6+ messages in thread
From: Stefan Strogin @ 2023-10-10 0:55 UTC (permalink / raw
To: gentoo-commits
commit: db417400c886b07681470089828ec6679a643730
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 00:43:53 2023 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 00:54:52 2023 +0000
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 <steils <AT> 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 000000000000..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 <stefan@steils.org>
+Date: Tue, 10 Oct 2023 00:30:29 +0000
+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() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-10-10 0:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-22 16:04 [gentoo-commits] repo/gentoo:master commit in: games-board/pokerth/, games-board/pokerth/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2023-10-10 0:55 Stefan Strogin
2018-04-27 21:51 James Le Cuirot
2018-04-27 21:51 James Le Cuirot
2017-09-07 7:13 David Seifert
2016-04-03 10:02 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox