summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-05-11 16:46:25 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-05-11 16:46:25 +0000
commitfe005261eb098aaebd020d234464f0af39834bdb (patch)
tree40f1b10c4b703d541f0c5131e36189f70f6b0332 /app-emulation
parentDrop musicbrainz dependency once and for all. As per upstream bug #63 by Rafa... (diff)
downloadhistorical-fe005261eb098aaebd020d234464f0af39834bdb.tar.gz
historical-fe005261eb098aaebd020d234464f0af39834bdb.tar.bz2
historical-fe005261eb098aaebd020d234464f0af39834bdb.zip
Fix compile with GCC 4.4 wrt #269311, thanks to Martin Väth.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/vice/ChangeLog6
-rw-r--r--app-emulation/vice/Manifest5
-rw-r--r--app-emulation/vice/files/vice-2.1-gcc44.patch11
-rw-r--r--app-emulation/vice/vice-2.1.ebuild6
4 files changed, 24 insertions, 4 deletions
diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog
index b7976c6ffe8d..600690c10d7b 100644
--- a/app-emulation/vice/ChangeLog
+++ b/app-emulation/vice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/vice
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.61 2009/01/25 03:59:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.62 2009/05/11 16:46:24 ssuominen Exp $
+
+ 11 May 2009; Samuli Suominen <ssuominen@gentoo.org> vice-2.1.ebuild,
+ +files/vice-2.1-gcc44.patch:
+ Fix compile with GCC 4.4 wrt #269311, thanks to Martin Väth.
*vice-2.1 (25 Jan 2009)
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index a31af3f52a92..1a477a342e8e 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,10 +1,11 @@
AUX vice-2.0-gnome-palemu.patch 723 RMD160 68dc407ceb4d282fef24221bc7dcb12cca5a217f SHA1 c4de57c1f1f2eccd6286ae7fbf3acbd0284a4aeb SHA256 a31d78f924b238106aa4ad8e24600e7dc89eebd520f0b0f59063390faae49cb3
AUX vice-2.0-gtk-bigendian-fix.patch 1643 RMD160 3263c8394570f1058ee3fb98cccc08ae54d27d3f SHA1 375fe5e5edd2b7a6b60a66d005b38b76e2284e40 SHA256 e9f202e65f8d6cb55deacc6ae0cf0da37a98d33f43f4593d64fbf7459f87ee73
+AUX vice-2.1-gcc44.patch 218 RMD160 3d14faf8527894b83de5a0c7cf70b811b4364d62 SHA1 9db442b6fed66c760953b0a2ca5167a1f0f44512 SHA256 1816007ac07855bed75ff40bbaead7bb83b6392c338a7a24dbef9bdff7d46b08
DIST vice-1.22.tar.gz 6088483 RMD160 ca93fc424e617e38f27e288ebcdfbab2aa3659db SHA1 55e0047824f64173539e03ddd2d5ab51cd581fbb SHA256 cd45ce3eea98ce70ae03002a4d02bb3188c982ee7fb7435ac8777bc8a780ef01
DIST vice-2.0.tar.gz 7442564 RMD160 84991407563fd8ee6d96951e39a370e0f3c0d430 SHA1 c0934f59caf573d60ca569cbe6fa0d814934255b SHA256 3f53e8fd9bb033df1c55bc045066b3a033000c887ce315fa07ce044078a8ee47
DIST vice-2.1.tar.gz 8097482 RMD160 218a3b111d9c3bfcea06cea30299f7b471a57232 SHA1 0adf7a1d13c7b3af7b8d2d21c17b6dc0f055ff67 SHA256 dc42df924bd4b4ab4af43e372d873a79ea035059f31f2f5c297c234b1c532c66
EBUILD vice-1.22.ebuild 2203 RMD160 c361d57226b61d5bd0f528c8b4853a0166885ab4 SHA1 9b7d8468e0994f8a2602736506d75946ffa6987d SHA256 d40962622be962189de959c9133aa91c4441dc709e409524c11deb8e33dc39c1
EBUILD vice-2.0.ebuild 2272 RMD160 37b8eb32dd56e453c97bb50c3726932c25669569 SHA1 72d9616114540c5a0bc8d2563db99af935114ccf SHA256 0a3c32534e6d4170c3d85f2f1533ee54b469a0795a52895a4e8756dd4fb29143
-EBUILD vice-2.1.ebuild 2095 RMD160 14c6d2dd2747d55a2ecceb3e59665c3aca87bf52 SHA1 011581a9901187f0d1db8221a67eaac9bbe373fe SHA256 d44f3818d4a77ca9f37d1ed1a34fcbd3c138910da1c2520e8ec3a500112044ce
-MISC ChangeLog 7759 RMD160 5e70bbcbbecf5296a74926ce1e9e98472dee451b SHA1 487d6161c7549f65bed1a4db4ab85055d086bed9 SHA256 227218e9a5e5efe8ca5ec1ee76f50979da9d77a11dd0f669938858281c26a38d
+EBUILD vice-2.1.ebuild 2153 RMD160 014e977b42c70f30863d11799217053f861ead5d SHA1 8a83f813d0f76751b19eb44196e9c31e089eaaca SHA256 882ccccfc0ea47a1cb8dafbddb5c6b5fc874e460bd5c7a0badb73950a3134438
+MISC ChangeLog 7926 RMD160 d41d2e3966c654b9e0fb99d3e6dc80b17cce3a78 SHA1 9cef73f49b716ea4538edd477c4718aaeb0ebde9 SHA256 4048167495805ad2d15d96fbdc3cac6c5bdb1bb1983cd3d483162b257bd0381f
MISC metadata.xml 321 RMD160 6709c07341536778184c86e920569d23e00f94b3 SHA1 c482881ba2599e5a49fec4f34acb13856b4eb2da SHA256 7c918d9c1645188c60a72a4e8f0dd0a7fde2b553400c79e748d0d4a24b702393
diff --git a/app-emulation/vice/files/vice-2.1-gcc44.patch b/app-emulation/vice/files/vice-2.1-gcc44.patch
new file mode 100644
index 000000000000..505d73694385
--- /dev/null
+++ b/app-emulation/vice/files/vice-2.1-gcc44.patch
@@ -0,0 +1,11 @@
+--- src/arch/unix/joy.c
++++ src/arch/unix/joy.c
+@@ -124,7 +124,7 @@
+ #define JS_DATA_TYPE joystick
+ #define JS_RETURN sizeof(struct joystick)
+ int use_old_api=1;
+-#elif
++#else
+ #error Unknown Joystick
+ #endif
+
diff --git a/app-emulation/vice/vice-2.1.ebuild b/app-emulation/vice/vice-2.1.ebuild
index 93b2cb625aea..922fcf54f4c2 100644
--- a/app-emulation/vice/vice-2.1.ebuild
+++ b/app-emulation/vice/vice-2.1.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/app-emulation/vice/vice-2.1.ebuild,v 1.1 2009/01/25 03:59:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.1.ebuild,v 1.2 2009/05/11 16:46:24 ssuominen Exp $
EAPI=2
inherit eutils games
@@ -53,6 +53,10 @@ DEPEND="${RDEPEND}
xv? ( x11-proto/videoproto )
nls? ( sys-devel/gettext )"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
src_configure() {
egamesconf \
--disable-dependency-tracking \