summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-04-28 07:22:45 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-04-28 07:22:45 +0000
commit36fccc171ef9c256203dca9ba4a62980a1a00295 (patch)
tree356b8e8ff5bdab3dee15ffe021a9f74bd910fd1c /games-emulation
parentVersion Bump. (diff)
downloadhistorical-36fccc171ef9c256203dca9ba4a62980a1a00295.tar.gz
historical-36fccc171ef9c256203dca9ba4a62980a1a00295.tar.bz2
historical-36fccc171ef9c256203dca9ba4a62980a1a00295.zip
Build with gcc-4.6 Bug #364231
Package-Manager: portage-2.1.9.46/cvs/Linux x86_64
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/dosbox/ChangeLog8
-rw-r--r--games-emulation/dosbox/Manifest15
-rw-r--r--games-emulation/dosbox/dosbox-0.74.ebuild7
-rw-r--r--games-emulation/dosbox/files/dosbox-0.74-gcc46.patch10
4 files changed, 34 insertions, 6 deletions
diff --git a/games-emulation/dosbox/ChangeLog b/games-emulation/dosbox/ChangeLog
index 4c8035c1c1c8..9324bbb570ce 100644
--- a/games-emulation/dosbox/ChangeLog
+++ b/games-emulation/dosbox/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-emulation/dosbox
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v 1.55 2010/11/23 09:24:23 tupone Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v 1.56 2011/04/28 07:22:45 tupone Exp $
+
+ 28 Apr 2011; Tupone Alfredo <tupone@gentoo.org> dosbox-0.74.ebuild,
+ +files/dosbox-0.74-gcc46.patch:
+ Build with gcc-4.6 Bug #364231 by Philipp
23 Nov 2010; Tupone Alfredo <tupone@gentoo.org> dosbox-0.74.ebuild:
media-libs/libsdl need to be built with X. Fix bug #346241 by Tom Noonan
diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index cda8a83b7c91..61bc770875a5 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX dosbox-0.74-gcc46.patch 274 RMD160 270ced750e5ca6809623be432f798d954e0777e6 SHA1 161ac94f1957d2ff048b00ceb55dec2f3fab8bf3 SHA256 0977ad33852dcebf63bfb596d59676a7c7e8f9dfd03e7bc4e08e3177e00d3b0e
DIST dosbox-0.74.tar.gz 1265711 RMD160 4534d87206de8401cd0de471d8172726f2c6b788 SHA1 2d99f0013350efb29b769ff19ddc8e4d86f4e77e SHA256 13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05
-EBUILD dosbox-0.74.ebuild 1082 RMD160 d8e8689294acaca29cbeedc88200723ee6faffde SHA1 5cc0fd2ce70bd9ab37562e2faed0a46eb9b9ecb4 SHA256 3f9ffbca6b9e403276616f365d0d75cedf3a986736b930c4053a823697b4158d
+EBUILD dosbox-0.74.ebuild 1143 RMD160 ac4fe5e4f9c5b83d6b03dbc755d09ede4ff63710 SHA1 33b7f5129934b2aa8c23f4fc8f46ee932b62d904 SHA256 c2fd62049a7fcbf9c89ae97950959fb94a5e0fb7a863150a1b865383434fb62d
EBUILD dosbox-9999.ebuild 1221 RMD160 17b03ba35e67599f338c9f3709fda488c9924a7f SHA1 6b940324abfe7a292b9443926568aea8c3321c3e SHA256 8e4d11d1bda5168f5c630e69e505194e75b25508318588b8fcbf901478e20ac6
-MISC ChangeLog 7749 RMD160 cee3cff507ea6e6149592feac51d4773927153a1 SHA1 28c2156479c61121047743789f7d68d5393ea329 SHA256 a183e988e614dca8e3f1f12487707d63792943722fd8c0cf18b099605d7ea21e
+MISC ChangeLog 7898 RMD160 80bb59a6ad26c72eb913b703652c5dc82f288a2b SHA1 b8193a2645416c748998afca6a65e6d3c01a2542 SHA256 311bc3dd6d9d17971f3f28a7f1e606d60972c6d39575edecbbbad3a8b8ff431d
MISC metadata.xml 221 RMD160 617e2d275f39c937dfdc8ae1ebc0b4fac331d0a9 SHA1 e947c4afb6291420a09d464cb18472cfcf1cb498 SHA256 80c34a967b80bba5f0f27215677fdad5b1ed739678287b62db1f6c345cf69811
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk25Fc8ACgkQIY77eQFFFC0L+wCg2M5Q/SgtgZeuOP7t2XCfbF2P
+k/sAoNfpNjy5UbGEC1ctzZcM+N4zA4U1
+=o+/4
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/dosbox/dosbox-0.74.ebuild b/games-emulation/dosbox/dosbox-0.74.ebuild
index 28fc60a73158..a6902f4a4c0a 100644
--- a/games-emulation/dosbox/dosbox-0.74.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-0.74.ebuild,v 1.7 2010/11/28 00:57:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-0.74.ebuild,v 1.8 2011/04/28 07:22:45 tupone Exp $
EAPI=2
inherit eutils games
@@ -21,6 +21,9 @@ DEPEND="alsa? ( media-libs/alsa-lib )
media-libs/libsdl[joystick,video,X]
media-libs/sdl-net
media-libs/sdl-sound"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc46.patch )
src_configure() {
egamesconf \
diff --git a/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch b/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch
new file mode 100644
index 000000000000..16811d47d640
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch
@@ -0,0 +1,10 @@
+--- include/dos_inc.h.old 2011-04-28 08:46:04.505011354 +0200
++++ include/dos_inc.h 2011-04-28 08:46:27.104408178 +0200
+@@ -21,6 +21,7 @@
+ #ifndef DOSBOX_DOS_INC_H
+ #define DOSBOX_DOS_INC_H
+
++#include <cstddef>
+ #ifndef DOSBOX_DOS_SYSTEM_H
+ #include "dos_system.h"
+ #endif