Add patch to fix compilation with gcc-4.0; bug #118914

Package-Manager: portage-2.1_pre3-r1

4 files changed, 66 insertions, 14 deletions

diff --git a/net-fs/ncpfs/ChangeLog b/net-fs/ncpfs/ChangeLog
index e57296e062aa..0b7018ffa046 100644
--- a/net-fs/ncpfs/ChangeLog
+++ b/net-fs/ncpfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/ncpfs
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ChangeLog,v 1.20 2005/01/29 08:36:38 corsair Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ChangeLog,v 1.21 2006/01/28 05:40:03 halcy0n Exp $
+
+  28 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/ncpfs-2.2.6-gcc4.patch, ncpfs-2.2.6.ebuild:
+  Add patch to fix compilation with gcc-4.0; bug #118914
 
   29 Jan 2005; Markus Rothe <corsair@gentoo.org> ncpfs-2.2.6.ebuild:
   Stable on ppc64; bug #77414
diff --git a/net-fs/ncpfs/Manifest b/net-fs/ncpfs/Manifest
index 7b4ea364291f..2a88125649e2 100644
--- a/net-fs/ncpfs/Manifest
+++ b/net-fs/ncpfs/Manifest
@@ -1,15 +1,26 @@
-MD5 6dd2ca09e9cf8805295cd88fa3d0ff7f ChangeLog 2374
-MD5 c9e5871c825d1968d24662100bab7b2c metadata.xml 290
-MD5 57899ae34bf2427a8b5725b1008e1619 ncpfs-2.2.0.19-r1.ebuild 944
-MD5 8f95e569a67f7f23172f7d75d946ebda ncpfs-2.2.0.19-r2.ebuild 987
-MD5 b9a976d20bfd39a3e1c6c17fb9a12e91 ncpfs-2.2.0.19.ebuild 732
-MD5 c7d2a68cc89c164a2022c4d7cf270d5e ncpfs-2.2.3.ebuild 959
-MD5 9d486449be9d79517a06d9de5dab75d9 ncpfs-2.2.5.ebuild 1350
-MD5 f5a194d3db7012defca088b66884d30b ncpfs-2.2.6.ebuild 1260
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e9f7d4ca7077ff3c37837c31ab22aabc ChangeLog 2533
 MD5 922a7aee31b05e5c9fe29c08ad41efbb files/digest-ncpfs-2.2.0.19 67
 MD5 922a7aee31b05e5c9fe29c08ad41efbb files/digest-ncpfs-2.2.0.19-r1 67
 MD5 922a7aee31b05e5c9fe29c08ad41efbb files/digest-ncpfs-2.2.0.19-r2 67
 MD5 26e01ffe1e892a30ca35b773ed1ad014 files/digest-ncpfs-2.2.3 64
 MD5 28e54a3c45d44a003fc1f5764a7e2b63 files/digest-ncpfs-2.2.5 64
-MD5 221f5197d914c3526e1d965bf62d9535 files/ncpfs-2.2.5-php.patch 555
 MD5 6894750817d66de3a8383dd2d668ea39 files/digest-ncpfs-2.2.6 64
+MD5 221f5197d914c3526e1d965bf62d9535 files/ncpfs-2.2.5-php.patch 555
+MD5 092609494c8d03e8a2272dea609a3e48 files/ncpfs-2.2.6-gcc4.patch 1291
+MD5 c9e5871c825d1968d24662100bab7b2c metadata.xml 290
+MD5 57899ae34bf2427a8b5725b1008e1619 ncpfs-2.2.0.19-r1.ebuild 944
+MD5 8f95e569a67f7f23172f7d75d946ebda ncpfs-2.2.0.19-r2.ebuild 987
+MD5 b9a976d20bfd39a3e1c6c17fb9a12e91 ncpfs-2.2.0.19.ebuild 732
+MD5 c7d2a68cc89c164a2022c4d7cf270d5e ncpfs-2.2.3.ebuild 959
+MD5 9d486449be9d79517a06d9de5dab75d9 ncpfs-2.2.5.ebuild 1350
+MD5 63cf42ca2eea6a66de6a33c46e58fee1 ncpfs-2.2.6.ebuild 1300
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD2wPBCRZPokWLroQRAps9AKCF1tMYyWWkc0GGZgX0tvD2cKLwLwCbBpEL
+EQDLqtcF/R6ctcGWIER3n7Y=
+=TSaf
+-----END PGP SIGNATURE-----
diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-gcc4.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-gcc4.patch
new file mode 100644
index 000000000000..7223b232c60a
--- /dev/null
+++ b/net-fs/ncpfs/files/ncpfs-2.2.6-gcc4.patch
@@ -0,0 +1,36 @@
+diff -ur ncpfs-2.2.6-orig/lib/ncplib.c ncpfs-2.2.6/lib/ncplib.c
+--- ncpfs-2.2.6-orig/lib/ncplib.c	2006-01-13 16:55:05.000000000 -0500
++++ ncpfs-2.2.6/lib/ncplib.c	2006-01-13 16:56:08.000000000 -0500
+@@ -2421,7 +2421,7 @@
+ 	int i = 1;
+ 	NWCCODE nwerr;
+ 
+-	static int get_argument(int arg_no, const char **target) {
++	int get_argument(int arg_no, const char **target) {
+ 		int count = 1;
+ 
+ 		if (target != NULL) {
+diff -ur ncpfs-2.2.6-orig/util/nwpjmv.c ncpfs-2.2.6/util/nwpjmv.c
+--- ncpfs-2.2.6-orig/util/nwpjmv.c	2006-01-13 16:55:05.000000000 -0500
++++ ncpfs-2.2.6/util/nwpjmv.c	2006-01-13 16:55:50.000000000 -0500
+@@ -131,7 +131,7 @@
+ 	char *s = q->command;
+ 	char *target_end = target + target_size;
+ 
+-	static void add_string(const char *str)
++	void add_string(const char *str)
+ 	{
+ 		int len = strlen(str);
+ 		if (target + len + 1 > target_end)
+diff -ur ncpfs-2.2.6-orig/util/pserver.c ncpfs-2.2.6/util/pserver.c
+--- ncpfs-2.2.6-orig/util/pserver.c	2006-01-13 16:55:05.000000000 -0500
++++ ncpfs-2.2.6/util/pserver.c	2006-01-13 16:55:36.000000000 -0500
+@@ -153,7 +153,7 @@
+ 	char *s = q->command;
+ 	char *target_end = target + target_size;
+ 
+-	static void add_string(const char *str)
++	void add_string(const char *str)
+ 	{
+ 		int len = strlen(str);
+ 		if (target + len + 1 > target_end)
diff --git a/net-fs/ncpfs/ncpfs-2.2.6.ebuild b/net-fs/ncpfs/ncpfs-2.2.6.ebuild
index 78a54af0fe5d..9b6e709d9158 100644
--- a/net-fs/ncpfs/ncpfs-2.2.6.ebuild
+++ b/net-fs/ncpfs/ncpfs-2.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ncpfs-2.2.6.ebuild,v 1.2 2005/01/29 08:36:38 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ncpfs-2.2.6.ebuild,v 1.3 2006/01/28 05:40:03 halcy0n Exp $
 
 inherit eutils confutils
 
@@ -23,7 +23,8 @@ src_unpack() {
 
 	# add patch for PHP extension sandbox violation
 	cd ${S} || die "Unable to cd to ${S}"
-	epatch ${FILESDIR}/${PN}-2.2.5-php.patch || die "Unable to apply PHP patch"
+	epatch "${FILESDIR}"/${PN}-2.2.5-php.patch || die "Unable to apply PHP patch"
+	epatch "${FILESDIR}"/${P}-gcc4.patch
 }
 
 src_compile() {