[arch-commits] Commit in pokerth/trunk (PKGBUILD namespace-buildfix.patch)

[Bartłomiej Piotrowski]

    Date: Monday, December 21, 2015 @ 20:09:37
  Author: bpiotrowski
Revision: 154045

Fix build with boost 1.60.0

Added:
  pokerth/trunk/namespace-buildfix.patch
Modified:
  pokerth/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   10 +++++++---
 namespace-buildfix.patch |   22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-21 19:09:24 UTC (rev 154044)
+++ PKGBUILD	2015-12-21 19:09:37 UTC (rev 154045)
@@ -8,7 +8,7 @@
 pkgname=pokerth
 _realname=PokerTH
 pkgver=1.1.1
-pkgrel=8
+pkgrel=9
 pkgdesc="Open source Texas Hold'em Poker simulator"
 arch=('i686' 'x86_64')
 url="http://www.pokerth.net/"
@@ -17,9 +17,11 @@
          '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')
+        '0001-Qt-5.5.0-patch-for-qtsingleapplication.patch'
+        'namespace-buildfix.patch')
 md5sums=('a7f76f95782099f966e5f2b6809f502a'
-         'f4ecab0a6435f1b3b0654145b75d6e7c')
+         'f4ecab0a6435f1b3b0654145b75d6e7c'
+         '5d5e9c90f9c01bb9ff8ba9f10c94c508')
 
 prepare() {
   cd "$srcdir/$_realname-$pkgver-src"
@@ -26,6 +28,8 @@
 
   # https://github.com/pokerth/pokerth/commit/731f5f05f540
   patch -Np1 -i ../0001-Qt-5.5.0-patch-for-qtsingleapplication.patch
+
+  patch -p1 -i ../namespace-buildfix.patch
 }
 
 build() {

Added: namespace-buildfix.patch
===================================================================
--- namespace-buildfix.patch	                        (rev 0)
+++ namespace-buildfix.patch	2015-12-21 19:09:37 UTC (rev 154045)
@@ -0,0 +1,22 @@
+diff --git a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp
+index d9b9fd4..d137a5c 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,
+@@ -363,7 +363,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();