summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-11 06:15:02 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-11 06:15:02 +0000
commitb6f73e8ba235db040b18f05bc1ed2484bdaa1367 (patch)
treea64e6fe38fc0c837d47f3e7969328a4dd0265f38 /games-engines
parentVersion bump. (diff)
downloadhistorical-b6f73e8ba235db040b18f05bc1ed2484bdaa1367.tar.gz
historical-b6f73e8ba235db040b18f05bc1ed2484bdaa1367.tar.bz2
historical-b6f73e8ba235db040b18f05bc1ed2484bdaa1367.zip
Fix building with GCC 4.4+ wrt #273534, thanks to Arttu Valo for patch.
Package-Manager: portage-2.2_rc36/cvs/Linux x86_64
Diffstat (limited to 'games-engines')
-rw-r--r--games-engines/stratagus/ChangeLog8
-rw-r--r--games-engines/stratagus/Manifest5
-rw-r--r--games-engines/stratagus/files/stratagus-2.2.4-gcc44.patch11
-rw-r--r--games-engines/stratagus/stratagus-2.2.4.ebuild7
4 files changed, 24 insertions, 7 deletions
diff --git a/games-engines/stratagus/ChangeLog b/games-engines/stratagus/ChangeLog
index 310937a388dd..b2aa789bba63 100644
--- a/games-engines/stratagus/ChangeLog
+++ b/games-engines/stratagus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-engines/stratagus
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.17 2008/12/17 15:41:37 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.18 2009/08/11 06:15:01 ssuominen Exp $
+
+ 11 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+ stratagus-2.2.4.ebuild, +files/stratagus-2.2.4-gcc44.patch:
+ Fix building with GCC 4.4+ wrt #273534, thanks to Arttu Valo for patch.
17 Dec 2008; Michael Sterrett <mr_bones_@gentoo.org>
+files/stratagus-2.2.4-gcc43.patch, stratagus-2.2.4.ebuild:
diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
index e4f939b45f1a..5a2a8042499a 100644
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -1,5 +1,6 @@
AUX stratagus-2.2.4-gcc43.patch 340 RMD160 9a1b3d17cdc4684cbc0ad77a481938686c36587f SHA1 5bed334d19f3d7c936075cbe1d198288db9ebaea SHA256 d3cf45e7c5c5f9202240f497975a700f2c72328933001c9c0cf6730a86881688
+AUX stratagus-2.2.4-gcc44.patch 452 RMD160 f212572ee13f38bf108d7cb1b797ab159aef4865 SHA1 92d5e2e03ed168275a558808a92479235f12019c SHA256 fe8bc56ca3061cf260a6f068affcbabcb958655cc9c4aeb1ef46818a1ba66c3e
DIST stratagus-2.2.4-src.tar.gz 939353 RMD160 1efbb7a5033c6389ee00ff2e9df248bd4fdb8855 SHA1 d3e15d6137503d79ab1d5ac5ddb1d01a20173671 SHA256 66a96dd7712e9b007420dbe2a1257985daa9c758648fad36696c527c15d5a77d
-EBUILD stratagus-2.2.4.ebuild 1438 RMD160 c80366a77192e8e18de7a939b270a5481db535ed SHA1 3f6c845ce4cbe36008d5f7d239d1b9f093db4170 SHA256 4bb5bd37ee5e2f78d8632d1c12b21b7723fd1e871e9928c4868895bb64ecc1f9
-MISC ChangeLog 2628 RMD160 548f094f1787dccec2f8f0d71fd1df2736ba323e SHA1 c05defd0163c7ffb6b52d65326f1045fb94bee4f SHA256 e74bf0f42005eb380b667e634ba009f419ffb3ec80b2215179c54d160a95aec1
+EBUILD stratagus-2.2.4.ebuild 1473 RMD160 00fc59e2eadc72d07c8abfa2ce05080a38b2a7b1 SHA1 67e4d0fd07111fece74b3a5b7ece1155b856d0bb SHA256 d47be6819f7a50307f6151f36decfd2c408ca5ffbcf93b8c40a59b39da573119
+MISC ChangeLog 2819 RMD160 3b1ea7066be1de5d1c41af5a065dc111c26bfb1e SHA1 fe1e25d0cc70688d097e1a1e647c93bd4a9a3b0e SHA256 b6dd32706ae39765882bada6200f8d2d0b7dfdeac676eb026419daeebffb12fa
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-engines/stratagus/files/stratagus-2.2.4-gcc44.patch b/games-engines/stratagus/files/stratagus-2.2.4-gcc44.patch
new file mode 100644
index 000000000000..0259adf5d3cd
--- /dev/null
+++ b/games-engines/stratagus/files/stratagus-2.2.4-gcc44.patch
@@ -0,0 +1,11 @@
+diff -ur stratagus-2.2.4.orig/src/stratagus/util.cpp stratagus-2.2.4/src/stratagus/util.cpp
+--- stratagus-2.2.4.orig/src/stratagus/util.cpp 2006-11-26 23:34:36.000000000 +0200
++++ stratagus-2.2.4/src/stratagus/util.cpp 2009-08-11 09:14:05.000000000 +0300
+@@ -28,6 +28,7 @@
+ //
+ // $Id: stratagus-2.2.4-gcc44.patch,v 1.1 2009/08/11 06:15:02 ssuominen Exp $
+
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
diff --git a/games-engines/stratagus/stratagus-2.2.4.ebuild b/games-engines/stratagus/stratagus-2.2.4.ebuild
index 2223fd345c32..dc408ea9bca0 100644
--- a/games-engines/stratagus/stratagus-2.2.4.ebuild
+++ b/games-engines/stratagus/stratagus-2.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.2.4.ebuild,v 1.2 2008/12/17 15:41:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.2.4.ebuild,v 1.3 2009/08/11 06:15:01 ssuominen Exp $
inherit eutils games
@@ -33,7 +33,8 @@ src_unpack() {
-e 's/-O.*\(-fsigned-char\).*/\1"/' \
configure \
|| die "sed failed"
- epatch "${FILESDIR}"/${P}-gcc43.patch
+ epatch "${FILESDIR}"/${P}-gcc43.patch \
+ "${FILESDIR}"/${P}-gcc44.patch
}
src_compile() {