[arch-commits] Commit in pokerth/trunk (2 files)

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Fri Sep 15 19:43:06 UTC 2017


    Date: Friday, September 15, 2017 @ 19:43:01
  Author: bpiotrowski
Revision: 257720

1.1.1-20: rebuild against boost 1.65.1

Added:
  pokerth/trunk/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch
Modified:
  pokerth/trunk/PKGBUILD

--------------------------------------------------+
 PKGBUILD                                         |    7 ++++++-
 pokerth-1.1.1-boost-1.65-ambiguous-advance.patch |   14 ++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-15 19:36:05 UTC (rev 257719)
+++ PKGBUILD	2017-09-15 19:43:01 UTC (rev 257720)
@@ -8,7 +8,7 @@
 pkgname=pokerth
 _realname=PokerTH
 pkgver=1.1.1
-pkgrel=19
+pkgrel=20
 pkgdesc="Open source Texas Hold'em Poker simulator"
 arch=('i686' 'x86_64')
 url="http://www.pokerth.net/"
@@ -19,11 +19,13 @@
 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')
 
@@ -39,6 +41,9 @@
   # 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
 }
 
 build() {

Added: pokerth-1.1.1-boost-1.65-ambiguous-advance.patch
===================================================================
--- pokerth-1.1.1-boost-1.65-ambiguous-advance.patch	                        (rev 0)
+++ pokerth-1.1.1-boost-1.65-ambiguous-advance.patch	2017-09-15 19:43:01 UTC (rev 257720)
@@ -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());
+ 	}
+ }



More information about the arch-commits mailing list