diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2006-01-15 12:24:35 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-01-15 12:24:35 +0000 |
| commit | ccaabff985597525f34a58f1b5238af8f51669da (patch) | |
| tree | 3f5a00daee097783c5690441d280d944cb02066e /x11-misc/3ddesktop | |
| parent | stable amd64 (diff) | |
| download | historical-ccaabff985597525f34a58f1b5238af8f51669da.tar.gz historical-ccaabff985597525f34a58f1b5238af8f51669da.tar.bz2 historical-ccaabff985597525f34a58f1b5238af8f51669da.zip | |
Fix compiling with gcc 4, see bug #118458.
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'x11-misc/3ddesktop')
| -rw-r--r-- | x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild | 11 | ||||
| -rw-r--r-- | x11-misc/3ddesktop/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/3ddesktop/Manifest | 15 | ||||
| -rw-r--r-- | x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch | 13 |
4 files changed, 31 insertions, 15 deletions
diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild index 4686df1dc335..9fb28c570ab7 100644 --- a/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild +++ b/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild,v 1.6 2006/01/15 01:40:24 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild,v 1.7 2006/01/15 12:24:35 nelchael Exp $ + +inherit eutils DESCRIPTION="OpenGL virtual desktop switching" HOMEPAGE="http://desk3d.sourceforge.net/" @@ -27,7 +29,12 @@ DEPEND="${RDEPEND} x11-proto/xproto ) virtual/x11 )" -src_install () { +src_unpack() { + unpack "${A}" + epatch "${FILESDIR}/${P}-gcc4.patch" +} + +src_install() { make DESTDIR="${D}" install || die dodoc README AUTHORS TODO ChangeLog README.windowmanagers } diff --git a/x11-misc/3ddesktop/ChangeLog b/x11-misc/3ddesktop/ChangeLog index 944c6cb4403b..d5389d8d0454 100644 --- a/x11-misc/3ddesktop/ChangeLog +++ b/x11-misc/3ddesktop/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/3ddesktop # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/ChangeLog,v 1.32 2006/01/15 01:40:24 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/ChangeLog,v 1.33 2006/01/15 12:24:35 nelchael Exp $ + + 15 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> + +files/3ddesktop-0.2.9-gcc4.patch, 3ddesktop-0.2.9.ebuild: + Fix compiling with gcc 4. Patch supplied by Simon Strandman + <simon.strandman@telia.com>, see bug #118458. 15 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> 3ddesktop-0.2.9.ebuild: Stable on amd64, bug 118966. diff --git a/x11-misc/3ddesktop/Manifest b/x11-misc/3ddesktop/Manifest index eccb16ea969a..6bced1125c0c 100644 --- a/x11-misc/3ddesktop/Manifest +++ b/x11-misc/3ddesktop/Manifest @@ -1,16 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 21da5e54c31bd482bdc4cb445b2bae96 3ddesktop-0.2.8.ebuild 597 -MD5 5d9ceddab45c5aeb8424e21d35f33995 3ddesktop-0.2.9.ebuild 1368 -MD5 3f491c3cb3305ccd8dd6ce46499db454 ChangeLog 3918 +MD5 72ee5d821d78af885cb7d1d90d8bb755 3ddesktop-0.2.9.ebuild 1457 +MD5 5e4f7b5860189ced08f6d24197a2b47e ChangeLog 4146 +MD5 9aac53edbd737f827651470da4e5a7b2 files/3ddesktop-0.2.9-gcc4.patch 541 MD5 f00452b9de2da5a9e4d981f2f03f48c5 files/digest-3ddesktop-0.2.8 67 MD5 120616a127fefe09adc8c8400335f0d9 files/digest-3ddesktop-0.2.9 67 MD5 e465243d3626f791491c00b7913a36d6 metadata.xml 436 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDyagantT9W3vfTuoRAlu6AJ4y/HVLR4FZUIQyQfd+mgvyjXC9/QCfbuQN -ANJT6d8c3yrk+gDhziIYQTw= -=lDy3 ------END PGP SIGNATURE----- diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch new file mode 100644 index 000000000000..95404894c23b --- /dev/null +++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-gcc4.patch @@ -0,0 +1,13 @@ +diff -urNad 3ddesktop-0.2.9/event.hpp /tmp/dpep.QstFBy/3ddesktop-0.2.9/event.hpp +--- 3ddesktop-0.2.9/event.hpp 2004-12-06 03:57:32.000000000 +0100 ++++ /tmp/dpep.QstFBy/3ddesktop-0.2.9/event.hpp 2005-07-06 21:50:00.000000000 +0200 +@@ -74,7 +74,7 @@ + list<Event *>::iterator k; + for (k = events.begin(); k != events.end(); ++k) { + Event *e = *k; +- printf(":: Event %d 0x%x\n", e->type, (unsigned int)(e->function)); ++ printf(":: Event %d %p\n", e->type, e->function); + } + } + + |