Date: Monday, November 6, 2017 @ 00:12:51
Author: svenstaro
Revision: 265502
upgpkg: pokerth 1.1.2-1
Modified:
pokerth/trunk/PKGBUILD
Deleted:
pokerth/trunk/0001-Qt-5.5.0-patch-for-qtsingleapplication.patch
pokerth/trunk/pokerth-1.1.1-Qualify-std-ifstream-and-std-ofstream.patch
pokerth/trunk/pokerth-c++11.patch
pokerth/trunk/pokerth-gcc6.patch
-----------------------------------------------------------+
0001-Qt-5.5.0-patch-for-qtsingleapplication.patch | 24 -
PKGBUILD | 46 +--
pokerth-1.1.1-Qualify-std-ifstream-and-std-ofstream.patch | 153 ------------
pokerth-c++11.patch | 95 -------
pokerth-gcc6.patch | 41 ---
5 files changed, 15 insertions(+), 344 deletions(-)
Deleted: 0001-Qt-5.5.0-patch-for-qtsingleapplication.patch
===================================================================
--- 0001-Qt-5.5.0-patch-for-qtsingleapplication.patch 2017-11-05 23:31:51 UTC
(rev 265501)
+++ 0001-Qt-5.5.0-patch-for-qtsingleapplication.patch 2017-11-06 00:12:51 UTC
(rev 265502)
@@ -1,24 +0,0 @@
-From 731f5f05f54065a67fa7c9f9bc8fe992390cb979 Mon Sep 17 00:00:00 2001
-From: Felix Hammer <f.ham...@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(+)
-
-diff --git a/src/third_party/qtsingleapplication/qtlocalpeer.cpp
b/src/third_party/qtsingleapplication/qtlocalpeer.cpp
-index 43e6bf4..e0ddc07 100644
---- 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>
---
-2.5.3
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-11-05 23:31:51 UTC (rev 265501)
+++ PKGBUILD 2017-11-06 00:12:51 UTC (rev 265502)
@@ -6,9 +6,9 @@
# Contributor: Federico Cinelli <cine...@aur.archlinux.org>
pkgname=pokerth
-_realname=PokerTH
-pkgver=1.1.1
-pkgrel=21
+pkgver=1.1.2
+_pkgver=1.1.2-rc
+pkgrel=1
pkgdesc="Open source Texas Hold'em Poker simulator"
arch=('i686' 'x86_64')
url="http://www.pokerth.net/";
@@ -16,48 +16,32 @@
depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf' 'libxkbcommon-x11'
'qt5-base' 'sdl_mixer' 'libircclient' 'tinyxml')
makedepends=('boost')
-source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2";
- '0001-Qt-5.5.0-patch-for-qtsingleapplication.patch'
- 'pokerth-1.1.1-Qualify-std-ifstream-and-std-ofstream.patch'
- 'pokerth-1.1.1-boost-1.65-ambiguous-advance.patch'
- 'pokerth-gcc6.patch'
- 'pokerth-c++11.patch')
-md5sums=('a7f76f95782099f966e5f2b6809f502a'
- 'f4ecab0a6435f1b3b0654145b75d6e7c'
- '26b02c7e5c50484485570ace9b63be5b'
- 'db0435312ea44dadd8aed8729cd9c112'
- '39070e7d656ae654e54ec9e25f9eea83'
- 'ee027e6bd85d245f6f3ae74c68ed91cb')
+source=("https://downloads.sourceforge.net/project/pokerth/pokerth/$_pkgver/pokerth-$_pkgver.tar.gz";
+ pokerth-1.1.1-boost-1.65-ambiguous-advance.patch)
+sha512sums=('d54c84f199636eb5a53580213e5e4ccc828cf565bf4b055797daa82e2ad54d8c52c7a16a781b82c8cc89d184a2b3c4105922394d08c7d2e06383b96963c36b5a'
+
'af91b98c04f844504c46b01c76a360d00bfe3993d6acdbc9800f2466833da42ad5e76a0ca3e197cb63aca10e4cb1eae73996b67691587eae2f2ee3975a33410e')
prepare() {
- cd "$srcdir/$_realname-$pkgver-src"
+ cd "$pkgname-$_pkgver"
- # https://github.com/pokerth/pokerth/commit/731f5f05f540
- patch -Np1 -i ../0001-Qt-5.5.0-patch-for-qtsingleapplication.patch
-
- # https://github.com/pokerth/pokerth/commit/69f820bb3
- patch -p1 -i ../pokerth-1.1.1-Qualify-std-ifstream-and-std-ofstream.patch
-
- # Fix build with GCC 6
- patch -p1 -i ../pokerth-gcc6.patch
- patch -p1 -i ../pokerth-c++11.patch
-
- # Kudos to Gentoo
- patch -p1 -i ../pokerth-1.1.1-boost-1.65-ambiguous-advance.patch
+ patch -Np1 < "$srcdir"/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch
}
build() {
- cd "$srcdir/$_realname-$pkgver-src"
+ cd "$pkgname-$_pkgver"
- qmake-qt5 "$pkgname.pro"
+ qmake-qt5 "$pkgname.pro" QMAKE_CFLAGS_ISYSTEM="" CONFIG+=client
make
}
package() {
- cd "$srcdir/$_realname-$pkgver-src"
+ cd "$pkgname-$_pkgver"
+ # The make install target doesn't do shit anymore for some reason.
make INSTALL_ROOT="$pkgdir" install
+ # mkdir -p "$pkgdir"/usr/share/pokerth
+ # cp -r data "$pkgdir"/usr/share/pokerth
install -Dm644 "docs/pokerth.1" "$pkgdir/usr/share/man/man1/pokerth.1"
install -Dm644 "data/data-copyright.txt"
"$pkgdir/usr/share/licenses/pokerth/data-copyright.txt"
}
Deleted: pokerth-1.1.1-Qualify-std-ifstream-and-std-ofstream.patch
===================================================================
--- pokerth-1.1.1-Qualify-std-ifstream-and-std-ofstream.patch 2017-11-05
23:31:51 UTC (rev 265501)
+++ pokerth-1.1.1-Qualify-std-ifstream-and-std-ofstream.patch 2017-11-06
00:12:51 UTC (rev 265502)
@@ -1,153 +0,0 @@
-From 69f820bb3d7c4dc8c838f115cb4c7ee5fd188721 Mon Sep 17 00:00:00 2001
-From: Jonathan Wakely <git...@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);
---
-2.6.4
-
Deleted: pokerth-c++11.patch
===================================================================
--- pokerth-c++11.patch 2017-11-05 23:31:51 UTC (rev 265501)
+++ pokerth-c++11.patch 2017-11-06 00:12:51 UTC (rev 265502)
@@ -1,95 +0,0 @@
-From 924fcd64044bd17c683345627def83df044ce867 Mon Sep 17 00:00:00 2001
-From: Felix Hammer <f.ham...@web.de>
-Date: Wed, 19 Aug 2015 15:02:10 +0200
-Subject: [PATCH] Linux Desktop build fix
-
----
- pokerth_lib.pro | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/pokerth_lib.pro b/pokerth_lib.pro
-index 6ab18b9..e9f1e3a 100644
---- a/pokerth_lib.pro
-+++ b/pokerth_lib.pro
-@@ -256,6 +256,8 @@ win32{
- ##### My release static build options
- #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
- INCLUDEPATH += /opt/gsasl/include
-+ DEFINES += _WEBSOCKETPP_CPP11_STL_
-+ QMAKE_CXXFLAGS += -std=gnu++11
- }
-
- mac{
-#diff --git a/pokerth_qml-client.pro b/pokerth_qml-client.pro
-#index 6e5223f..eec1feb 100644
-#--- a/pokerth_qml-client.pro
-#+++ b/pokerth_qml-client.pro
-#@@ -6,7 +6,6 @@ isEmpty( PREFIX ){
-# DEFINES += PREFIX=\"$${PREFIX}\"
-#
-# TEMPLATE = app
-#-TARGET = pokerth
-# CODECFORSRC = UTF-8
-# QT += core qml quick widgets svg sql
-# CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on
-diff --git a/src/net/common/sessiondata.cpp b/src/net/common/sessiondata.cpp
-index 06f7146..69bcdb7 100644
---- a/src/net/common/sessiondata.cpp
-+++ b/src/net/common/sessiondata.cpp
-@@ -318,8 +318,9 @@ void
- SessionData::CloseWebSocketHandle()
- {
- if (m_webData) {
-- boost::system::error_code ec;
-- m_webData->webSocketServer->close(m_webData->webHandle,
websocketpp::close::status::normal, "PokerTH server closed the connection.",
ec);
-+// boost::system::error_code ec;
-+ std::error_code std_ec;
-+ m_webData->webSocketServer->close(m_webData->webHandle,
websocketpp::close::status::normal, "PokerTH server closed the connection.",
std_ec);
- }
- }
-
-diff --git a/src/net/common/websendbuffer.cpp
b/src/net/common/websendbuffer.cpp
-index 2ba665a..3130373 100644
---- a/src/net/common/websendbuffer.cpp
-+++ b/src/net/common/websendbuffer.cpp
-@@ -57,9 +57,10 @@ void
- WebSendBuffer::AsyncSendNextPacket(boost::shared_ptr<SessionData> session)
- {
- if (closeAfterSend) {
-- boost::system::error_code ec;
-+// boost::system::error_code ec;
-+ std::error_code std_ec;
- boost::shared_ptr<WebSocketData> webData =
session->GetWebData();
-- webData->webSocketServer->close(webData->webHandle,
websocketpp::close::status::normal, "PokerTH server closed the connection.",
ec);
-+ webData->webSocketServer->close(webData->webHandle,
websocketpp::close::status::normal, "PokerTH server closed the connection.",
std_ec);
- }
- }
-
-@@ -70,10 +71,11 @@
WebSendBuffer::InternalStorePacket(boost::shared_ptr<SessionData> session, boost
- google::protobuf::uint8 *buf = new google::protobuf::uint8[packetSize];
- packet->GetMsg()->SerializeWithCachedSizesToArray(buf);
-
-- boost::system::error_code ec;
-+// boost::system::error_code ec;
-+ std::error_code std_ec;
- boost::shared_ptr<WebSocketData> webData = session->GetWebData();
-- webData->webSocketServer->send(webData->webHandle, string((const char
*)buf, packetSize), websocketpp::frame::opcode::BINARY, ec);
-- if (ec) {
-+ webData->webSocketServer->send(webData->webHandle, string((const char
*)buf, packetSize), websocketpp::frame::opcode::BINARY, std_ec);
-+ if (std_ec) {
- SetCloseAfterSend();
- }
-
-diff --git a/src/net/serveracceptwebhelper.h b/src/net/serveracceptwebhelper.h
-index a1d371e..f7e8123 100644
---- a/src/net/serveracceptwebhelper.h
-+++ b/src/net/serveracceptwebhelper.h
-@@ -52,7 +53,7 @@ class ServerAcceptWebHelper : public ServerAcceptInterface
-
- protected:
-
-- typedef std::map<websocketpp::connection_hdl,
boost::weak_ptr<SessionData> > SessionMap;
-+ typedef std::map<websocketpp::connection_hdl,
boost::weak_ptr<SessionData>, std::owner_less<websocketpp::connection_hdl> >
SessionMap;
-
- bool validate(websocketpp::connection_hdl hdl);
- void on_open(websocketpp::connection_hdl hdl);
Deleted: pokerth-gcc6.patch
===================================================================
--- pokerth-gcc6.patch 2017-11-05 23:31:51 UTC (rev 265501)
+++ pokerth-gcc6.patch 2017-11-06 00:12:51 UTC (rev 265502)
@@ -1,41 +0,0 @@
---- PokerTH-1.1.1-src/pokerth_db.pro.orig 2016-05-12 20:20:57.336018308
+0000
-+++ PokerTH-1.1.1-src/pokerth_db.pro 2016-05-12 20:21:14.335959204 +0000
-@@ -49,7 +49,6 @@
- !win32{
- ##### My release static build options
- #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
-- INCLUDEPATH += $${PREFIX}/include
- }
-
- mac{
---- PokerTH-1.1.1-src/pokerth_lib.pro.orig 2016-05-12 20:24:53.581864921
+0000
-+++ PokerTH-1.1.1-src/pokerth_lib.pro 2016-05-12 20:25:20.441771862 +0000
-@@ -243,7 +243,7 @@
- !win32{
- ##### My release static build options
- #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
-- INCLUDEPATH += $${PREFIX}/include /opt/gsasl/include
-+ INCLUDEPATH += /opt/gsasl/include
- }
-
- mac{
---- PokerTH-1.1.1-src/pokerth_game.pro.orig 2016-05-12 21:02:08.527791266
+0000
-+++ PokerTH-1.1.1-src/pokerth_game.pro 2016-05-12 21:02:19.027758386 +0000
-@@ -402,7 +402,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
---- PokerTH-1.1.1-src/pokerth_server.pro.orig 2016-05-12 21:10:02.469679181
+0000
-+++ PokerTH-1.1.1-src/pokerth_server.pro 2016-05-12 21:10:34.106251260
+0000
-@@ -174,7 +174,6 @@
- #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
