summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-07-04 07:42:21 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-07-04 07:42:21 +0000
commit34cf321f2d0b40b25555b37a69af3b59a7cb1111 (patch)
tree7014a159f838c2ebbd3d936bab4090249b5513c9 /games-board/pokerth
parentVersion bump with a small bug fix (diff)
downloadgentoo-2-34cf321f2d0b40b25555b37a69af3b59a7cb1111.tar.gz
gentoo-2-34cf321f2d0b40b25555b37a69af3b59a7cb1111.tar.bz2
gentoo-2-34cf321f2d0b40b25555b37a69af3b59a7cb1111.zip
Fix build with dev-libs/boost-1.42 and gcc-4.5 Bug #352429
(Portage version: 2.1.10.3/cvs/Linux i686)
Diffstat (limited to 'games-board/pokerth')
-rw-r--r--games-board/pokerth/ChangeLog6
-rw-r--r--games-board/pokerth/files/pokerth-0.8.3-boost142.patch42
-rw-r--r--games-board/pokerth/pokerth-0.8.3.ebuild3
3 files changed, 49 insertions, 2 deletions
diff --git a/games-board/pokerth/ChangeLog b/games-board/pokerth/ChangeLog
index d0ac8d0a993e..4711122cf3e5 100644
--- a/games-board/pokerth/ChangeLog
+++ b/games-board/pokerth/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-board/pokerth
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/ChangeLog,v 1.28 2011/04/26 20:25:14 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/ChangeLog,v 1.29 2011/07/04 07:42:21 tupone Exp $
+
+ 04 Jul 2011; Tupone Alfredo <tupone@gentoo.org> pokerth-0.8.3.ebuild,
+ +files/pokerth-0.8.3-boost142.patch:
+ Fix build with dev-libs/boost-1.42 and gcc-4.5 Bug #352429 by Gef Lebster
26 Apr 2011; Michael Sterrett <mr_bones_@gentoo.org> pokerth-0.8.3.ebuild:
fix building with boost-1.46 (bug #362933)
diff --git a/games-board/pokerth/files/pokerth-0.8.3-boost142.patch b/games-board/pokerth/files/pokerth-0.8.3-boost142.patch
new file mode 100644
index 000000000000..3abe50f18dc6
--- /dev/null
+++ b/games-board/pokerth/files/pokerth-0.8.3-boost142.patch
@@ -0,0 +1,42 @@
+--- pokerth_lib.pro.old 2011-07-03 23:52:06.769035002 +0200
++++ pokerth_lib.pro 2011-07-03 23:52:57.994035008 +0200
+@@ -1,3 +1,4 @@
++### eqmake4 was here ###
+ # QMake pro-file for PokerTH common library
+
+ isEmpty( PREFIX ){
+@@ -14,7 +15,6 @@
+ OBJECTS_DIR = obj
+ DEFINES += ENABLE_IPV6
+ QT -= core gui
+-QMAKE_CXXFLAGS += -std=gnu++0x
+ #PRECOMPILED_HEADER = src/pch_lib.h
+
+ INCLUDEPATH += . \
+@@ -255,3 +255,6 @@
+ INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
+ INCLUDEPATH += /opt/local/include
+ }
++
++CONFIG -= debug_and_release debug
++CONFIG += release
+--- pokerth_game.pro.old 2011-07-04 06:19:32.899038048 +0200
++++ pokerth_game.pro 2011-07-04 06:19:50.507038051 +0200
+@@ -16,7 +16,6 @@
+ warn_on
+ include(src/third_party/qtsingleapplication/qtsingleapplication.pri)
+ QT += sql
+-QMAKE_CXXFLAGS += -std=gnu++0x
+ UI_DIR = uics
+ MOC_DIR = mocs
+ OBJECTS_DIR = obj
+--- pokerth_server.pro.old 2011-07-04 09:01:20.886039321 +0200
++++ pokerth_server.pro 2011-07-04 09:01:32.746039322 +0200
+@@ -18,7 +18,6 @@
+ DEFINES += ENABLE_IPV6
+ DEFINES += PREFIX=\"$${PREFIX}\"
+ QT -= core gui
+-QMAKE_CXXFLAGS += -std=gnu++0x
+ #PRECOMPILED_HEADER = src/pch_lib.h
+
+ INCLUDEPATH += . \
diff --git a/games-board/pokerth/pokerth-0.8.3.ebuild b/games-board/pokerth/pokerth-0.8.3.ebuild
index 123f1f75d2e5..fff85141fae7 100644
--- a/games-board/pokerth/pokerth-0.8.3.ebuild
+++ b/games-board/pokerth/pokerth-0.8.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/pokerth-0.8.3.ebuild,v 1.6 2011/04/26 20:25:14 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/pokerth-0.8.3.ebuild,v 1.7 2011/07/04 07:42:21 tupone Exp $
EAPI=2
inherit multilib flag-o-matic eutils qt4-r2 games
@@ -31,6 +31,7 @@ DEPEND=">=dev-libs/boost-1.41
S=${WORKDIR}/${MY_P}
src_prepare() {
+ epatch "${FILESDIR}"/${P}-boost142.patch
local boost_ver
if use dedicated ; then