summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2008-04-15 18:10:16 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2008-04-15 18:10:16 +0000
commitc32062cc729a8f7abcd767d3a632ba5233101a6b (patch)
tree162312957dec27e293198183b2bd291230e78625 /games-puzzle
parentVersion bump (bug #216208). (diff)
downloadhistorical-c32062cc729a8f7abcd767d3a632ba5233101a6b.tar.gz
historical-c32062cc729a8f7abcd767d3a632ba5233101a6b.tar.bz2
historical-c32062cc729a8f7abcd767d3a632ba5233101a6b.zip
add patch for gcc-4.3 support submitted by Peter Alfredsen via bug #217601
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/einstein/ChangeLog6
-rw-r--r--games-puzzle/einstein/Manifest5
-rw-r--r--games-puzzle/einstein/einstein-2.0.ebuild4
-rw-r--r--games-puzzle/einstein/files/einstein-2.0-gcc43.patch20
4 files changed, 30 insertions, 5 deletions
diff --git a/games-puzzle/einstein/ChangeLog b/games-puzzle/einstein/ChangeLog
index ef7306e84b04..faef304e00f5 100644
--- a/games-puzzle/einstein/ChangeLog
+++ b/games-puzzle/einstein/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-puzzle/einstein
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/einstein/ChangeLog,v 1.6 2008/03/07 19:09:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/einstein/ChangeLog,v 1.7 2008/04/15 18:10:15 mr_bones_ Exp $
+
+ 15 Apr 2008; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/einstein-2.0-gcc43.patch, einstein-2.0.ebuild:
+ add patch for gcc-4.3 support submitted by Peter Alfredsen via bug #217601
07 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> einstein-2.0.ebuild:
QA cleanup: Fix quoting.
diff --git a/games-puzzle/einstein/Manifest b/games-puzzle/einstein/Manifest
index 630f120f3410..16b5ae7e6e7c 100644
--- a/games-puzzle/einstein/Manifest
+++ b/games-puzzle/einstein/Manifest
@@ -1,6 +1,7 @@
AUX einstein-2.0-64bit.patch 1131 RMD160 fd3621247686f5aeef5d1a0694c3589e9722933f SHA1 96ff771f4c7d1a8af2cf6cb865bf7a4513404c96 SHA256 5acd4eb1942ecbebe116c0638db020480c7aced37d0d3434c61e2db95a343192
+AUX einstein-2.0-gcc43.patch 531 RMD160 27b138a1e3c637c33b3a4c971d22d0b73cd28439 SHA1 0a10c4160bb7f33497b87cd1d56be7cea3984104 SHA256 7f5f99228a9f29619fb7493e8d3ac2fb51f5217fa4ed10655337f2d2421b77a4
DIST einstein-2.0-src.tar.gz 722301 RMD160 f19b1f86b33d805300c4423aeb2d88f1f5cae3c5 SHA1 866a9a1c115014d7f6a241bc22b251907f63f8bc SHA256 0f2d1c7d46d36f27a856b98cd4bbb95813970c8e803444772be7bd9bec45a548
DIST einstein.png 932 RMD160 17be94533f9f164b46581f255da909f0273c987f SHA1 0a37400205ffb9e58484152edd237b31aaf08ca2 SHA256 87416ad30823294a55be626adf3bbf3d32f98cf7c8d7e9e65470d78ed37a66a5
-EBUILD einstein-2.0.ebuild 1296 RMD160 75f905cf8802c613280b6bd0962f97c5ec56de2c SHA1 e8c9e616c780ba164c5db4993c7b035c39ba8b02 SHA256 5c3aa4c86fe5db6147f9a77ec48a72c1baa2a296294850a07c1981185d8dae14
-MISC ChangeLog 992 RMD160 35987b86e4c11b2d701688ac76b18c5154c111a1 SHA1 c6b25e84eb0c8f08c6e143fc0018bc1d3bd847aa SHA256 7a0ee44c85d9062cff5a410b500233e92ea8f2c616935134e98545f68ec4be39
+EBUILD einstein-2.0.ebuild 1293 RMD160 74e58254646a6dea31e8a8b9adc7ca68996acf15 SHA1 c99e20396fa843567d18b3501de124198332d716 SHA256 3bc5330585ee9b46d3d6b25f916826f3d564c17375de4e660b708345a0367195
+MISC ChangeLog 1182 RMD160 fd35c70937373e53b979143a43be2bc61f6dcfb1 SHA1 4bdf78eef08d8aa677f20421271cc8d0bc0d5dbd SHA256 7f73aa22904dfe718f6d7033100aa9969043507bbf351cc05fae3a570ca38036
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/einstein/einstein-2.0.ebuild b/games-puzzle/einstein/einstein-2.0.ebuild
index 6b2be313c5a5..8a41decca935 100644
--- a/games-puzzle/einstein/einstein-2.0.ebuild
+++ b/games-puzzle/einstein/einstein-2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/einstein/einstein-2.0.ebuild,v 1.6 2008/03/07 19:09:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/einstein/einstein-2.0.ebuild,v 1.7 2008/04/15 18:10:15 mr_bones_ Exp $
inherit eutils games
@@ -22,7 +22,7 @@ DEPEND="media-libs/libsdl
src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}"/${P}-64bit.patch
+ epatch "${FILESDIR}"/${P}-*.patch
sed -i \
-e "/PREFIX/s:/usr/local:${GAMES_PREFIX}:" \
-e "s:\$(PREFIX)/share/einstein:${GAMES_DATADIR}/${PN}:" \
diff --git a/games-puzzle/einstein/files/einstein-2.0-gcc43.patch b/games-puzzle/einstein/files/einstein-2.0-gcc43.patch
new file mode 100644
index 000000000000..f793dfc1b8e3
--- /dev/null
+++ b/games-puzzle/einstein/files/einstein-2.0-gcc43.patch
@@ -0,0 +1,20 @@
+--- ../orig/einstein-2.0.dfsg.2/convert.h 2005-08-14 04:40:58.000000000 +0200
++++ convert.h 2007-08-31 11:33:06.000000000 +0200
+@@ -5,6 +5,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <string>
++#include <typeinfo>
+
+ #include "exceptions.h"
+ #include "unicode.h"
+
+--- ../orig/einstein-2.0.dfsg.2/unicode.cpp 2005-08-14 04:40:58.000000000 +0200
++++ ./unicode.cpp 2008-01-26 11:49:10.000000000 +0100
+@@ -1,5 +1,6 @@
+ #include <wchar.h>
+ #include <stdlib.h>
++#include <string.h>
+ #ifdef WIN32
+ #include <windows.h>
+ #endif