mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-06 02:17:34 -08:00
games-board/pokerth: treeclean
Closes: https://bugs.gentoo.org/946991 (pkgremoved) Closes: https://bugs.gentoo.org/949076 (pkgremoved) Closes: https://bugs.gentoo.org/943002 (pkgremoved) Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
parent
616af77c08
commit
cb8c5152e5
@ -1 +0,0 @@
|
||||
DIST pokerth-1.1.2.tar.gz 21354306 BLAKE2B d8e1ecc46e61d9c16ae3949099f6e72271a5ab2def9799652b0c612980e0c5e96cb2ccf4d659c1a90b9ac6433af95587fa5d44af80c16fb6a34a272751c9fc4a SHA512 d54c84f199636eb5a53580213e5e4ccc828cf565bf4b055797daa82e2ad54d8c52c7a16a781b82c8cc89d184a2b3c4105922394d08c7d2e06383b96963c36b5a
|
||||
@ -1,14 +0,0 @@
|
||||
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());
|
||||
}
|
||||
}
|
||||
@ -1,38 +0,0 @@
|
||||
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));
|
||||
@ -1,42 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,249 +0,0 @@
|
||||
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);
|
||||
@ -1,106 +0,0 @@
|
||||
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)
|
||||
@ -1,57 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
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;
|
||||
@ -1,17 +0,0 @@
|
||||
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 \
|
||||
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>games@gentoo.org</email>
|
||||
<name>Gentoo Games Project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">pokerth</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -1,79 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit desktop qmake-utils xdg
|
||||
|
||||
DESCRIPTION="Texas Hold'em poker game"
|
||||
HOMEPAGE="https://www.pokerth.net/"
|
||||
SRC_URI="https://downloads.sourceforge.net/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:=[zlib]
|
||||
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
|
||||
net-misc/gsasl[client,server]
|
||||
!dedicated? (
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtwidgets:5
|
||||
media-libs/libsdl:0
|
||||
media-libs/sdl-mixer[mod,vorbis]
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-cpp/websocketpp
|
||||
!dedicated? ( dev-qt/qtsql:5 )"
|
||||
BDEPEND="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
|
||||
"${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
|
||||
"${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() {
|
||||
xdg_src_prepare
|
||||
sed -i 's/!client//' *.pro || die
|
||||
|
||||
# delete bundled dev-cpp/websocketpp to be safe
|
||||
rm -r src/third_party/websocketpp || 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
|
||||
}
|
||||
@ -270,11 +270,6 @@ app-misc/taskd
|
||||
x11-apps/radeon-profile
|
||||
x11-apps/radeon-profile-daemon
|
||||
|
||||
# Andreas Sturmlechner <asturm@gentoo.org> (2025-05-01)
|
||||
# Dead upstream for many years, depends on Qt5 and FTB w/ boost-1.87 among
|
||||
# other bugs. Bugs #946991, #949076, #943002; removal on 2025-05-31
|
||||
games-board/pokerth
|
||||
|
||||
# Matt Jolly <kangie@gentoo.org> (2025-04-28)
|
||||
# Unmaintained in Gentoo, depends on masked x11-wm/fvwm,
|
||||
# SRC_URI uses mirror://gentoo and the files don't exist on mirrors.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user