From 4fb84e8c432adbdac7f6d1b7de470d6f262cad66 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Fri, 3 Sep 2004 23:50:46 +0000 Subject: Fixed compilation errors with gcc-3.4. Thanks to Anthony Mirabella and Bjarke Istrup Pedersen in bug #58718. --- games-emulation/darcnes/ChangeLog | 9 ++++++++- games-emulation/darcnes/Manifest | 17 ++++++++++++++--- games-emulation/darcnes/darcnes-0401-r1.ebuild | 11 ++++++++++- games-emulation/darcnes/darcnes-0401-r2.ebuild | 11 +++++++++-- games-emulation/darcnes/files/darcnes-0401-gcc34.patch | 11 +++++++++++ 5 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 games-emulation/darcnes/files/darcnes-0401-gcc34.patch (limited to 'games-emulation/darcnes') diff --git a/games-emulation/darcnes/ChangeLog b/games-emulation/darcnes/ChangeLog index 23d399f94af5..41240af6cfdc 100644 --- a/games-emulation/darcnes/ChangeLog +++ b/games-emulation/darcnes/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-emulation/darcnes # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/darcnes/ChangeLog,v 1.7 2004/06/24 22:25:15 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/darcnes/ChangeLog,v 1.8 2004/09/03 23:50:46 swegener Exp $ + + 04 Sep 2004; Sven Wegener + +files/darcnes-0401-gcc34.patch, darcnes-0401-r1.ebuild, + darcnes-0401-r2.ebuild: + Fixed compilation errors with gcc-3.4. Thanks to Anthony Mirabella + and Bjarke Istrup Pedersen + in bug #58718. 06 Jun 2004; Aron Griffis darcnes-0401-r1.ebuild, darcnes-0401-r2.ebuild: diff --git a/games-emulation/darcnes/Manifest b/games-emulation/darcnes/Manifest index 97eb909d3eaf..de37b041929c 100644 --- a/games-emulation/darcnes/Manifest +++ b/games-emulation/darcnes/Manifest @@ -1,6 +1,17 @@ -MD5 f3baae4fe108ca9b1465ad7b9883b90c darcnes-0401-r2.ebuild 1403 -MD5 72a96c5ee5287aaf53ae1627b5cda38c darcnes-0401-r1.ebuild 1102 -MD5 74705860fa7aaec705f8ce5651b72a58 ChangeLog 1602 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 2f325acc219e11ee2c60a675b51db067 darcnes-0401-r1.ebuild 1196 +MD5 6d61d2b47a0c1515b6adac2aaf3de110 darcnes-0401-r2.ebuild 1488 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 +MD5 d046ad9231aec3a8efc2ff729620fec2 ChangeLog 1906 MD5 97092964e106d48cc1b417ed92a14ed7 files/digest-darcnes-0401-r1 57 MD5 97092964e106d48cc1b417ed92a14ed7 files/digest-darcnes-0401-r2 57 +MD5 335dea4e38703d1353b5cca128ec34b9 files/darcnes-0401-gcc34.patch 213 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFBOQXwI1lqEGTUzyQRAkWwAKDP/quUIBhIlirKaCRUqXKofTG7owCgsETE +1HAAw+uGXtM739yj0sdTweI= +=qXYR +-----END PGP SIGNATURE----- diff --git a/games-emulation/darcnes/darcnes-0401-r1.ebuild b/games-emulation/darcnes/darcnes-0401-r1.ebuild index b382eeb400ef..bf85cb41fe44 100644 --- a/games-emulation/darcnes/darcnes-0401-r1.ebuild +++ b/games-emulation/darcnes/darcnes-0401-r1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/darcnes/darcnes-0401-r1.ebuild,v 1.4 2004/06/24 22:25:15 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/darcnes/darcnes-0401-r1.ebuild,v 1.5 2004/09/03 23:50:46 swegener Exp $ + +inherit eutils DESCRIPTION="A multi-system emulator" SRC_URI="http://www.dridus.com/~nyef/darcnes/download/dn9b${PV}.tgz" @@ -17,6 +19,13 @@ DEPEND=">=media-libs/svgalib-1.4.2 S=${WORKDIR}/${PN} +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${P}-gcc34.patch +} + src_compile() { cp cd_unix.c cd_unix.c.orig diff --git a/games-emulation/darcnes/darcnes-0401-r2.ebuild b/games-emulation/darcnes/darcnes-0401-r2.ebuild index 82d0058a7996..b8d8ceec9292 100644 --- a/games-emulation/darcnes/darcnes-0401-r2.ebuild +++ b/games-emulation/darcnes/darcnes-0401-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/darcnes/darcnes-0401-r2.ebuild,v 1.5 2004/06/24 22:25:15 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/darcnes/darcnes-0401-r2.ebuild,v 1.6 2004/09/03 23:50:46 swegener Exp $ -inherit games +inherit games eutils DESCRIPTION="A multi-system emulator" HOMEPAGE="http://www.dridus.com/~nyef/darcnes/" @@ -29,6 +29,13 @@ pkg_setup() { use X && build_X=true } +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/${P}-gcc34.patch +} + src_compile() { if use svga ; then emake TARGET=Linux_svgalib OPTFLAGS="${CFLAGS}" || \ diff --git a/games-emulation/darcnes/files/darcnes-0401-gcc34.patch b/games-emulation/darcnes/files/darcnes-0401-gcc34.patch new file mode 100644 index 000000000000..4f79fb1dce97 --- /dev/null +++ b/games-emulation/darcnes/files/darcnes-0401-gcc34.patch @@ -0,0 +1,11 @@ +diff -Naur old/video_x.c new/video_x.c +--- old/video_x.c 2004-09-04 01:26:41.102187277 +0200 ++++ new/video_x.c 2004-09-04 01:27:51.586427427 +0200 +@@ -366,6 +366,7 @@ + } + + default: ++ break; + } + } + -- cgit v1.2.3-65-gdbad