Add patch by KIMURA Masaru to build with GCC 4.1.0, closes bug #123932.

(Portage version: 2.1_pre5-r4)

3 files changed, 80 insertions, 3 deletions

diff --git a/media-video/xanim/ChangeLog b/media-video/xanim/ChangeLog
index 9527e687a3d1..c2ceb1a99f78 100644
--- a/media-video/xanim/ChangeLog
+++ b/media-video/xanim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/xanim
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/ChangeLog,v 1.25 2006/02/25 07:33:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/ChangeLog,v 1.26 2006/03/06 12:12:34 flameeyes Exp $
+
+  06 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/xanim-2.80.1-gcc41.patch, xanim-2.80.1-r4.ebuild:
+  Add patch by KIMURA Masaru to build with GCC 4.1.0, closes bug #123932.
 
   25 Feb 2006; Mike Frysinger <vapier@gentoo.org> xanim-2.80.1-r4.ebuild:
   Simplify code to get rid of global calls to tr and fix building with modular X.
diff --git a/media-video/xanim/files/xanim-2.80.1-gcc41.patch b/media-video/xanim/files/xanim-2.80.1-gcc41.patch
new file mode 100644
index 000000000000..3652989c32da
--- /dev/null
+++ b/media-video/xanim/files/xanim-2.80.1-gcc41.patch
@@ -0,0 +1,71 @@
+--- xanim2801/xa_input.c.orig	2006-02-24 23:01:28.000000000 +0900
++++ xanim2801/xa_input.c	2006-02-24 23:07:28.000000000 +0900
+@@ -952,13 +952,6 @@
+   else						return(xaFALSE);
+ }
+ 
+-xaULONG xa_ftp_abort(xin)
+-XA_INPUT xin;
+-{
+-  return(xaFALSE);
+-}
+-
+-
+ /************************
+  *
+  *********/
+@@ -1025,28 +1018,28 @@
+   memset(&data,0,sizeof(data));
+   memset(&from,0,sizeof(from));
+   if (gethostname(hostname, sizeof(hostname)) < 0)
+-						return(xa_ftp_abort(xin));
++						return(xaFALSE);
+   if ((host= (struct hostent *)gethostbyname(hostname)) == 0)
+-						return(xa_ftp_abort(xin));
++						return(xaFALSE);
+   data.sin_family = host->h_addrtype;
+   memcpy( (char *)&data.sin_addr, (char *)host->h_addr_list[0], host->h_length);
+   if ((tmp_sock = socket ( AF_INET  , SOCK_STREAM , 0 )) < 0)
+-						return(xa_ftp_abort(xin));
++						return(xaFALSE);
+   len = 1;
+   if (setsockopt(tmp_sock, SOL_SOCKET, SO_REUSEADDR,
+ 			(char *)(&len), sizeof(len)) < 0)
+-			{ close(tmp_sock); return(xa_ftp_abort(xin)); }
++			{ close(tmp_sock); return(xaFALSE); }
+ 
+   data.sin_port = 0;
+   if ( bind(tmp_sock, (struct sockaddr *)&data, sizeof(data)) < 0 )
+-			{ close(tmp_sock); return(xa_ftp_abort(xin)); }
++			{ close(tmp_sock); return(xaFALSE); }
+ 
+   len = sizeof(data);
+   if (getsockname(tmp_sock, (struct sockaddr *)&data, &len) < 0 )
+-			{ close(tmp_sock); return(xa_ftp_abort(xin)); }
++			{ close(tmp_sock); return(xaFALSE); }
+ 
+   if (listen(tmp_sock, 4) < 0 )
+-			{ close(tmp_sock); return(xa_ftp_abort(xin)); }
++			{ close(tmp_sock); return(xaFALSE); }
+ 
+      /* POD add support for PORT command? */
+   addr = (xaUBYTE *) (&data.sin_addr);
+@@ -1059,15 +1052,15 @@
+ 
+   if (xa_ftp_send_cmd(xin, port_cmd, &retcode) == xaFALSE) 
+ 	{ fprintf(stderr,"FTP: send cmd err\n"); 
+-	  close(tmp_sock); return(xa_ftp_abort(xin)); }
++	  close(tmp_sock); return(xaFALSE); }
+ 
+   if (xa_ftp_send_cmd(xin, file_cmd, &retcode) == xaFALSE) 
+ 	{ fprintf(stderr,"FTP: send cmd err\n"); 
+-	  close(tmp_sock); return(xa_ftp_abort(xin)); }
++	  close(tmp_sock); return(xaFALSE); }
+ 
+   len = sizeof(from);
+   xin->dsock = accept((int)tmp_sock, (struct sockaddr *) &from, (int *)&len);
+-  if (xin->dsock < 0) { close(tmp_sock); return(xa_ftp_abort(xin)); }
++  if (xin->dsock < 0) { close(tmp_sock); return(xaFALSE); }
+   close(tmp_sock);
+   return(xaTRUE);
+ }
diff --git a/media-video/xanim/xanim-2.80.1-r4.ebuild b/media-video/xanim/xanim-2.80.1-r4.ebuild
index fde8a14b9f22..b4f1d3c31a58 100644
--- a/media-video/xanim/xanim-2.80.1-r4.ebuild
+++ b/media-video/xanim/xanim-2.80.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/xanim-2.80.1-r4.ebuild,v 1.32 2006/02/25 07:33:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim/xanim-2.80.1-r4.ebuild,v 1.33 2006/03/06 12:12:34 flameeyes Exp $
 
 inherit flag-o-matic toolchain-funcs
 
@@ -85,7 +85,9 @@ src_unpack() {
 		unpack ${_XA_IV32}${_XA_EXT}
 	fi
 	cd "${S}"
-	sed -i 's:/usr/X11R6:/usr:g' Makefile*
+	sed -i -e 's:/usr/X11R6:/usr:g' Makefile*
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
 }
 
 src_compile() {