r15921 - in packages/trunk/pokerth/debian: . patches
Markus Koschany
apo at moszumanska.debian.org
Wed Nov 9 21:44:43 UTC 2016
Author: apo
Date: 2016-11-09 21:44:42 +0000 (Wed, 09 Nov 2016)
New Revision: 15921
Added:
packages/trunk/pokerth/debian/patches/pokerth-c++11.patch
Modified:
packages/trunk/pokerth/debian/changelog
packages/trunk/pokerth/debian/compat
packages/trunk/pokerth/debian/control
packages/trunk/pokerth/debian/copyright
packages/trunk/pokerth/debian/patches/series
packages/trunk/pokerth/debian/rules
Log:
Release pokerth 1.1.1-7
Modified: packages/trunk/pokerth/debian/changelog
===================================================================
--- packages/trunk/pokerth/debian/changelog 2016-11-05 23:26:33 UTC (rev 15920)
+++ packages/trunk/pokerth/debian/changelog 2016-11-09 21:44:42 UTC (rev 15921)
@@ -1,3 +1,11 @@
+pokerth (1.1.1-7) unstable; urgency=medium
+
+ * Team upload.
+ * Apply upstream patch and fix FTBFS with c++11. (Closes: #843078)
+ * Switch to compat level 10.
+
+ -- Markus Koschany <apo at debian.org> Wed, 09 Nov 2016 22:21:49 +0100
+
pokerth (1.1.1-6) unstable; urgency=medium
* Team upload.
Modified: packages/trunk/pokerth/debian/compat
===================================================================
--- packages/trunk/pokerth/debian/compat 2016-11-05 23:26:33 UTC (rev 15920)
+++ packages/trunk/pokerth/debian/compat 2016-11-09 21:44:42 UTC (rev 15921)
@@ -1 +1 @@
-9
+10
Modified: packages/trunk/pokerth/debian/control
===================================================================
--- packages/trunk/pokerth/debian/control 2016-11-05 23:26:33 UTC (rev 15920)
+++ packages/trunk/pokerth/debian/control 2016-11-09 21:44:42 UTC (rev 15921)
@@ -5,7 +5,7 @@
Uploaders:
Evgeni Golov <evgeni at debian.org>
Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 10),
dh-systemd,
libboost-date-time-dev (>= 1.42.0),
libboost-filesystem-dev (>= 1.42.0),
Modified: packages/trunk/pokerth/debian/copyright
===================================================================
--- packages/trunk/pokerth/debian/copyright 2016-11-05 23:26:33 UTC (rev 15920)
+++ packages/trunk/pokerth/debian/copyright 2016-11-09 21:44:42 UTC (rev 15921)
@@ -160,6 +160,7 @@
Files: debian/*
Copyright: 2006-2007 Mario Iseli <admin at marioiseli.com>
2007-2013 Evgeni Golov <evgeni at debian.org>
+ 2016, Markus Koschany <apo at debian.org>
License: GPL-2+
License: GPL-2+
Added: packages/trunk/pokerth/debian/patches/pokerth-c++11.patch
===================================================================
--- packages/trunk/pokerth/debian/patches/pokerth-c++11.patch (rev 0)
+++ packages/trunk/pokerth/debian/patches/pokerth-c++11.patch 2016-11-09 21:44:42 UTC (rev 15921)
@@ -0,0 +1,95 @@
+From 924fcd64044bd17c683345627def83df044ce867 Mon Sep 17 00:00:00 2001
+From: Felix Hammer <f.hammer at 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);
Modified: packages/trunk/pokerth/debian/patches/series
===================================================================
--- packages/trunk/pokerth/debian/patches/series 2016-11-05 23:26:33 UTC (rev 15920)
+++ packages/trunk/pokerth/debian/patches/series 2016-11-09 21:44:42 UTC (rev 15921)
@@ -3,3 +3,4 @@
qtsingleapplication-qt55-ftbfs.patch
qmake-gcc-6.patch
std-ifstream-and-std-ofstream.patch
+pokerth-c++11.patch
Modified: packages/trunk/pokerth/debian/rules
===================================================================
--- packages/trunk/pokerth/debian/rules 2016-11-05 23:26:33 UTC (rev 15920)
+++ packages/trunk/pokerth/debian/rules 2016-11-09 21:44:42 UTC (rev 15921)
@@ -12,10 +12,10 @@
export QT_SELECT=$(qt)
%:
- dh $@ --parallel --with systemd
+ dh $@ --with systemd
override_dh_auto_configure:
- dh_auto_configure -- pokerth.pro QMAKE_CXXFLAGS+="-std=gnu++98"
+ dh_auto_configure -- pokerth.pro
# upstream tarball has wrong permissions
find data -type f -exec chmod 644 {} \;
More information about the Pkg-games-commits
mailing list