Fix GCC 4.3 compilation, bug #215489

Package-Manager: portage-2.1.4.4

4 files changed, 35 insertions, 14 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/Manifest b/net-misc/nx/Manifest
index 27cdd67b013c..8dda038ddd50 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.5.0/nx-x11-1.5.0-tmp-exec.patch 349 RMD160 083862e5563962764e9d78f50a37576bac9913cc SHA1 97402172c1039e4f86b977f27a4571a8a77d1c6b SHA256 bbaeeb4e04c04da96f37dfb7ab5e494094d61a390ef2ae24813a5f49b3c44971
 AUX 1.5.0/nxcomp-1.5.0-pic.patch 522 RMD160 2016856cb86605ca7ccb6b2c17a1c096c8e80cea SHA1 f3febd574eb07c244a6fc91323631f99fad5fa34 SHA256 d4fb814d5ee3bd13c39e535b731caab0acb9e552cea471c602c8ff9c8e6d535e
 AUX nx-2.1.0-deprecated-headers.patch 3095 RMD160 1814ed18966606dcdb962c024cc9bc02ca3dd09a SHA1 fc41d3539af12dd3d5a1dafc63b0ca40893fbf1b SHA256 bf00914ec72786701ae5d8e56e18388cbe62eb7280ab11799f840680082cb973
 AUX nx-2.1.0-invalid-options.patch 978 RMD160 34e8c167b60e20032363ac57e4019a77accd8cb1 SHA1 453dbdaa4682d2051f67a17d586983b659ebb628 SHA256 d466e4abb4a1acdadcb9eddfc5651a7914d6b721e0d59e9df20ea4e19e78bd01
+AUX nx-3.1.0-gcc-4.3.patch 373 RMD160 3a8585a19fae38b7814e85c68a475df18765fbc6 SHA1 ba38ca0ee36b2c48ee09d855c4b32027e10c0fcc SHA256 696c7545ebbb14c0bc7c6d88d3ab8b9b7bf0758c4b636c8c3a85b408b5d0c05d
 DIST nx-X11-3.0.0-37.tar.gz 20183918 RMD160 2d8ba625a698d4bd1d8f262a012dcaa9f92d5f20 SHA1 8e875243758722cae03bc8697fd678c08e5e3eb9 SHA256 8f0de96431d17987e1926b800f7aa409efbd02898756fe55b978e1304c32e5df
 DIST nx-X11-3.1.0-1.tar.gz 20175237 RMD160 918ea4f90d463e71dd245d2f54de2a6af267e36e SHA1 f4090090ca573c2915f84d746905c2ef73612ca8 SHA256 1998164fb6741046398cdbe822483f45a438a0c761db61b0b0284030c48d51f9
 DIST nx-X11-3.1.0-4.tar.gz 20193596 RMD160 c242d8455f89920379b3c63c588ddc7480794780 SHA1 83bdcae4a97ab3f33646f3f3155c2ff7e04c4ee4 SHA256 111b58893bfcdf309b585a46758347c141ba12751f47cdc19d4cdc9bdd0d7f48
@@ -26,14 +24,7 @@ DIST nxproxy-3.0.0-4.tar.gz 82730 RMD160 b96e8752fce7015da88e2e304c8647abc659189
 DIST nxproxy-3.1.0-2.tar.gz 80127 RMD160 5fa986880540e61674f2d510d8ae22d4b1bc4825 SHA1 2ed7feaf8aa598f7f0b50be3d4dac3a652d9581c SHA256 a5dc41e4e58cf140b4e735405f98f863fb8dc49cd0ce06571539e1efad5cb2b4
 EBUILD nx-3.0.0-r1.ebuild 3341 RMD160 6c9214ad1fbf334ce331b2b4bb8d3c325a1c65d4 SHA1 3b9c8d479d7b93b68816dc4034e66a1f6be44fc7 SHA256 3117aeff076e3c931ffa3eabe273e30e3f0bf5e29e9d837843e14a39659e9103
 EBUILD nx-3.0.0.ebuild 2900 RMD160 8740586b0a62ea9ad7578cd15b557616678dba50 SHA1 83c8520f928e49fab2a0acfb157c571164f1be91 SHA256 45211d66955c5805c29edfb6d06049fd67a14a472f643b767ab5e90b6c54c5f7
-EBUILD nx-3.1.0-r1.ebuild 3254 RMD160 ba74f3213617c19fc0692197272d7cce64548215 SHA1 00a88f52af7870961d1fa0ebc8cb80f1a4dbaac3 SHA256 1ff77cc3a21ca49295d6039b8e25a1a2d4ed8dc06d6ef3a323e6f57cb318df31
+EBUILD nx-3.1.0-r1.ebuild 3298 RMD160 4d1926629260425299607e63f08e648d618b34e4 SHA1 cc42899413b4273857e3cf5706e88685f668fc30 SHA256 179276715696d99cf42661f6aa1bc6cba7d6974e0a408f7cfaba85542c5aa499
 EBUILD nx-3.1.0.ebuild 3255 RMD160 725ab5d1810d1fdcc4c798be57d8361224511f7d SHA1 751499db3f1e047dea356d46a0eb03046cb7b7a7 SHA256 4e7dfe963df68ec35dc401b091eda88104fe69fcf3b6c85e48518abb70ee927d
-MISC ChangeLog 2772 RMD160 3c771d38052df9e51a76de61e4c641564d003ef2 SHA1 1ce2376e1acb3d7c8368e3ef613bfc1dfdbf7140 SHA256 1e0e30874e02acdfc5b5cf70d4d5a6f84551d6f6c8d2a48dc01e556efd419348
+MISC ChangeLog 2984 RMD160 9c011533ddd3bf2f21faba0c4ed97d8f5dd9591f SHA1 a073a8f53511905cb34748960b79f95320fb8972 SHA256 e163fd0a3ec08508aa0b2f605bc873974c474ce01ab7e1e8b98cc839aa8ed696
 MISC metadata.xml 254 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f SHA1 d4bc63a27b50efd4593005361dc2e6032a34b1a8 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHucX4NQqtfCuFneMRAieAAKCCFCZVm2qcfK45c7lpC5xP3YwzGACghMNR
-d/5N88kBRkRvF4PfaZ2190I=
-=iUu6
------END PGP SIGNATURE-----
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