diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2008-03-31 20:50:54 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2008-03-31 20:50:54 +0000 |
| commit | c774fa38a573dec61c4a681a06e76a0628f8a468 (patch) | |
| tree | 77702cd3e2180254d792f074339ccc670292800b /net-misc | |
| parent | mention quotes I added (diff) | |
| download | gentoo-2-c774fa38a573dec61c4a681a06e76a0628f8a468.tar.gz gentoo-2-c774fa38a573dec61c4a681a06e76a0628f8a468.tar.bz2 gentoo-2-c774fa38a573dec61c4a681a06e76a0628f8a468.zip | |
Fix GCC 4.3 compilation, bug #215489
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/nx/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/nx/files/nx-3.1.0-gcc-4.3.patch | 24 | ||||
| -rw-r--r-- | net-misc/nx/nx-3.1.0-r1.ebuild | 3 |
3 files changed, 32 insertions, 2 deletions
diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog index 8a58392b8bcd..c2ee59be9408 100644 --- a/net-misc/nx/ChangeLog +++ b/net-misc/nx/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/nx # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.16 2008/02/18 17:51:11 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.17 2008/03/31 20:50:53 voyageur Exp $ + + 31 Mar 2008; Bernard Cafarelli <voyageur@gentoo.org> + +files/nx-3.1.0-gcc-4.3.patch, nx-3.1.0-r1.ebuild: + Fix GCC 4.3 compilation, thanks Martin Väth + <vaeth@mathematik.uni-wuerzburg.de> in bug #215489 18 Feb 2008; Christian Faulhammer <opfer@gentoo.org> nx-3.1.0-r1.ebuild: stable x86, security bug 210317 diff --git a/net-misc/nx/files/nx-3.1.0-gcc-4.3.patch b/net-misc/nx/files/nx-3.1.0-gcc-4.3.patch new file mode 100644 index 000000000000..112c697e104b --- /dev/null +++ b/net-misc/nx/files/nx-3.1.0-gcc-4.3.patch @@ -0,0 +1,24 @@ +--- nxcompshad/Misc.h ++++ nxcompshad/Misc.h +@@ -18,10 +18,10 @@ + #ifndef Misc_H + #define Misc_H + +-#include <iostream.h> ++#include <iostream> + +-#include <errno.h> +-#include <string.h> ++#include <cerrno> ++#include <cstring> + + // + // Error handling macros. +@@ -35,6 +35,6 @@ + // Log file. + // + +-extern ostream *logofs; ++extern std::ostream *logofs; + + #endif /* Misc_H */ diff --git a/net-misc/nx/nx-3.1.0-r1.ebuild b/net-misc/nx/nx-3.1.0-r1.ebuild index 91ef7c048295..94d8743ea2c0 100644 --- a/net-misc/nx/nx-3.1.0-r1.ebuild +++ b/net-misc/nx/nx-3.1.0-r1.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/net-misc/nx/nx-3.1.0-r1.ebuild,v 1.2 2008/02/18 17:51:11 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.1.0-r1.ebuild,v 1.3 2008/03/31 20:50:53 voyageur Exp $ inherit autotools eutils multilib @@ -63,6 +63,7 @@ src_unpack() { cd "${WORKDIR}" epatch "${FILESDIR}"/1.5.0/nx-x11-1.5.0-tmp-exec.patch epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch + epatch "${FILESDIR}"/${P}-gcc-4.3.patch cd "${WORKDIR}"/nxcomp epatch "${FILESDIR}"/${PN}-2.1.0-deprecated-headers.patch |