summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-12 00:56:56 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-12 00:56:56 +0000
commit6f45b45f56ba3df8f0153ff82005e715455a3096 (patch)
tree5c4e34ecb909458050552ed5de491f16f6d0a0bd /games-board/hearts
parentRevert accidental changes in src_test(). (diff)
downloadhistorical-6f45b45f56ba3df8f0153ff82005e715455a3096.tar.gz
historical-6f45b45f56ba3df8f0153ff82005e715455a3096.tar.bz2
historical-6f45b45f56ba3df8f0153ff82005e715455a3096.zip
Fix building with GCC 4.4+ wrt #273560.
Package-Manager: portage-2.2_rc36/cvs/Linux x86_64
Diffstat (limited to 'games-board/hearts')
-rw-r--r--games-board/hearts/ChangeLog6
-rw-r--r--games-board/hearts/Manifest15
-rw-r--r--games-board/hearts/files/hearts-1.98-gcc44.patch10
-rw-r--r--games-board/hearts/hearts-1.98.ebuild8
4 files changed, 23 insertions, 16 deletions
diff --git a/games-board/hearts/ChangeLog b/games-board/hearts/ChangeLog
index 72d12eba92a6..5d4506b7d041 100644
--- a/games-board/hearts/ChangeLog
+++ b/games-board/hearts/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-board/hearts
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/hearts/ChangeLog,v 1.4 2009/01/19 14:54:44 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/hearts/ChangeLog,v 1.5 2009/08/12 00:56:56 ssuominen Exp $
+
+ 12 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> hearts-1.98.ebuild,
+ +files/hearts-1.98-gcc44.patch:
+ Fix building with GCC 4.4+ wrt #273560.
19 Jan 2009; Alfredo Tupone <tupone@gentoo.org>
+files/hearts-1.98-gcc43.patch, hearts-1.98.ebuild:
diff --git a/games-board/hearts/Manifest b/games-board/hearts/Manifest
index d51a54469171..1aa59a69811a 100644
--- a/games-board/hearts/Manifest
+++ b/games-board/hearts/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX hearts-1.98-gcc.patch 752 RMD160 83ea63eb422d7dd5d99d5e0cb3eddc26c613a537 SHA1 31ae5d695e9bec8e8e4cd6a9b810ad3beb7c9307 SHA256 80114764955766083533aef6a13ce4fff3c14bfa23eb11b9dcdf3a3e9e188ff7
AUX hearts-1.98-gcc43.patch 357 RMD160 15b2d23d38f92a21c697e8265157768732e2109b SHA1 6371c7f8e7e18c9f10052e8148b626bea649db61 SHA256 4654af8ffc0e073911b806743339f93836f80a3c521fb80334d170ad2fc77d82
+AUX hearts-1.98-gcc44.patch 414 RMD160 b5cf03ea9f134870437ab5e28c52e0abd17a94c2 SHA1 e65f011e9c277b2246217398eb56840f0219d764 SHA256 0fa84bd45bfccac2a5d0243719d3cc11e69546dd8a4bd8e0710dad7cb106bbfa
DIST hearts-1.98.tar.bz2 563077 RMD160 7d53ee259fd4425b86c68f0b28e0845305b0b224 SHA1 e8541e7f6b1c7ed6cc4b34e4da44406244b5a09a SHA256 1e16435d6fd03477620b91513b34ad289d2846956073d86d70377cb24917c028
-EBUILD hearts-1.98.ebuild 650 RMD160 6176cad4b2ea17c1949da23f0268faaf0d1dd299 SHA1 0b78034c062d6e18495b7681fb2ce70ad306f799 SHA256 a4e78c6cbe107bcdc2a4e3ac11633628bf48ecd6ac95d62f17010a9e2048ff3d
-MISC ChangeLog 715 RMD160 6413c3b0c2a3cbdfe4b1385f73ec93e7866972af SHA1 4c714ee3c35897ccb72ad6c42a5631acbbef2526 SHA256 ba3cd2d7124f80ba7479479763a0a3bbf9a27886fd146f57ebcc5c78078d9657
+EBUILD hearts-1.98.ebuild 690 RMD160 1896ad6992eee9142a3a8d20b0b4b2b4d492a6d9 SHA1 f511942a3f1a2d4bf79e738a4e08a9e455236cf8 SHA256 1badf2f6020298c0d23f00056ff866338b603490224df2a2bfa32a82b61377ee
+MISC ChangeLog 869 RMD160 ad39ee825026d9bbfea1dcf464c96204c006dc25 SHA1 561066fc673fbcc4ca564f19370f20f61b98267d SHA256 0839c6893f4cc32cee95474108d78f0b639d3b92593af464a978e74e0dec3a17
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoX3mMACgkQdz7hIScOURFTnACg9U9S655EukQyYM+2cdIJ0Nqa
-X6gAoNMpV1ibjduQ1q2NaDn83MvBKaqZ
-=/CAG
------END PGP SIGNATURE-----
diff --git a/games-board/hearts/files/hearts-1.98-gcc44.patch b/games-board/hearts/files/hearts-1.98-gcc44.patch
new file mode 100644
index 000000000000..ec21a82103c6
--- /dev/null
+++ b/games-board/hearts/files/hearts-1.98-gcc44.patch
@@ -0,0 +1,10 @@
+diff -ur hearts-1.98.orig/common/communication/protocol.cpp hearts-1.98/common/communication/protocol.cpp
+--- hearts-1.98.orig/common/communication/protocol.cpp 2004-02-03 01:57:42.000000000 +0200
++++ hearts-1.98/common/communication/protocol.cpp 2009-08-12 03:16:25.000000000 +0300
+@@ -1,5 +1,6 @@
+ #include "protocol.h"
+ #include "general/helper.h"
++#include <cstdio>
+ #include <cassert>
+
+ using namespace std;
diff --git a/games-board/hearts/hearts-1.98.ebuild b/games-board/hearts/hearts-1.98.ebuild
index d681395bafb1..c12f7b9c5267 100644
--- a/games-board/hearts/hearts-1.98.ebuild
+++ b/games-board/hearts/hearts-1.98.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/hearts/hearts-1.98.ebuild,v 1.5 2009/05/23 11:30:37 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/hearts/hearts-1.98.ebuild,v 1.6 2009/08/12 00:56:56 ssuominen Exp $
inherit eutils kde
@@ -13,9 +13,11 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
-need-kde 3
+need-kde 3.5
-PATCHES=( "${FILESDIR}"/${P}-gcc.patch "${FILESDIR}"/${P}-gcc43.patch )
+PATCHES=( "${FILESDIR}"/${P}-gcc.patch
+ "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-gcc44.patch )
src_install() {
kde_src_install