Added patch so splitvt will build with gcc-4.

4 files changed, 145 insertions, 5 deletions

diff --git a/app-misc/splitvt/ChangeLog b/app-misc/splitvt/ChangeLog
index 444f8f688df4..d1b93971ee2f 100644
--- a/app-misc/splitvt/ChangeLog
+++ b/app-misc/splitvt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/splitvt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/splitvt/ChangeLog,v 1.14 2005/03/26 00:00:14 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/splitvt/ChangeLog,v 1.15 2005/05/17 11:27:51 ka0ttic Exp $
+
+  17 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/splitvt-1.6.5-gcc4.diff, splitvt-1.6.5-r1.ebuild:
+  Added patch so splitvt will build with gcc-4.
 
   26 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> splitvt-1.6.5-r1.ebuild:
   Stable on ppc.
diff --git a/app-misc/splitvt/Manifest b/app-misc/splitvt/Manifest
index 70f8f7427163..6a88bb290bb9 100644
--- a/app-misc/splitvt/Manifest
+++ b/app-misc/splitvt/Manifest
@@ -1,6 +1,7 @@
-MD5 1152531db65d40cff4ce7511a24c9534 metadata.xml 166
-MD5 41b16cdba0cf8ee41325b8e540200f6f ChangeLog 1871
 MD5 6ccd0e22262e34cff1aa44e5d0ec5dfa splitvt-1.6.5.ebuild 815
-MD5 613a6ca7a909ff49bc11cff738643c7a splitvt-1.6.5-r1.ebuild 1076
+MD5 d0f3b9f0532d02b53fbe3334cc30668e splitvt-1.6.5-r1.ebuild 1111
+MD5 907f993e7bf939127180477c726049fe ChangeLog 2028
+MD5 1152531db65d40cff4ce7511a24c9534 metadata.xml 166
+MD5 517e90235bf05862aacf6191e308700b files/splitvt-1.6.5-gcc4.diff 4576
 MD5 4675708dafd82ae94d6e1f37569c1a34 files/digest-splitvt-1.6.5 64
 MD5 0a9bb5fcdd5c9c90bc6a3e3c33be6417 files/digest-splitvt-1.6.5-r1 130
diff --git a/app-misc/splitvt/files/splitvt-1.6.5-gcc4.diff b/app-misc/splitvt/files/splitvt-1.6.5-gcc4.diff
new file mode 100644
index 000000000000..c4be974795f3
--- /dev/null
+++ b/app-misc/splitvt/files/splitvt-1.6.5-gcc4.diff
@@ -0,0 +1,134 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN splitvt-1.6.5.orig/config.c splitvt-1.6.5/config.c
+--- splitvt-1.6.5.orig/config.c	2005-05-17 00:47:04.000000000 -0400
++++ splitvt-1.6.5/config.c	2005-05-17 00:55:45.000000000 -0400
+@@ -1,5 +1,7 @@
+ #include	<sys/types.h>
+ #include	<stdio.h>
++#include	<stdlib.h>
++#include	<string.h>
+ #include	<sys/stat.h>
+ #include	<signal.h>
+ 
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN splitvt-1.6.5.orig/cut-paste.c splitvt-1.6.5/cut-paste.c
+--- splitvt-1.6.5.orig/cut-paste.c	2005-05-17 00:47:04.000000000 -0400
++++ splitvt-1.6.5/cut-paste.c	2005-05-17 01:00:55.000000000 -0400
+@@ -2,6 +2,7 @@
+ /* The cut-paste module for splitvt */
+ 
+ #include	<stdio.h>
++#include	<string.h>
+ #include	"vt100.h"
+ #include	"video.h"
+ 
+@@ -280,7 +281,7 @@
+ 					if ( marked ) {
+ 						mark2=cursor;
+ 						/* Copy and deselect area */
+-						buf=extract_sel(thiswin, buf,
++						buf=extract_sel((int)thiswin, buf,
+ 							len, &mark1, &mark2); 
+ 						/* Repaint the screen */
+ 						paint_video(thiswin);
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN splitvt-1.6.5.orig/misc.c splitvt-1.6.5/misc.c
+--- splitvt-1.6.5.orig/misc.c	2005-05-17 00:47:04.000000000 -0400
++++ splitvt-1.6.5/misc.c	2005-05-17 00:55:45.000000000 -0400
+@@ -4,6 +4,8 @@
+ #include	<sys/stat.h>
+ #include	<fcntl.h>
+ #include	<stdio.h>
++#include	<stdlib.h>
++#include	<string.h>
+ #include	<signal.h>
+ 
+ 
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN splitvt-1.6.5.orig/parserc.c splitvt-1.6.5/parserc.c
+--- splitvt-1.6.5.orig/parserc.c	2005-05-17 00:47:04.000000000 -0400
++++ splitvt-1.6.5/parserc.c	2005-05-17 00:59:28.000000000 -0400
+@@ -8,6 +8,7 @@
+ #include <pwd.h>
+ #include <fcntl.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include "splitvt.h"
+ 
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN splitvt-1.6.5.orig/splitvt.c splitvt-1.6.5/splitvt.c
+--- splitvt-1.6.5.orig/splitvt.c	2005-05-17 00:47:04.000000000 -0400
++++ splitvt-1.6.5/splitvt.c	2005-05-17 00:55:45.000000000 -0400
+@@ -19,6 +19,8 @@
+ #include	<fcntl.h>
+ #include	<signal.h>
+ #include	<stdio.h>
++#include	<stdlib.h>
++#include	<string.h>
+ #include	<errno.h>
+ #include	<pwd.h>
+ #ifdef HAVE_UNISTD_H
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN splitvt-1.6.5.orig/terminal.c splitvt-1.6.5/terminal.c
+--- splitvt-1.6.5.orig/terminal.c	2005-05-17 00:47:04.000000000 -0400
++++ splitvt-1.6.5/terminal.c	2005-05-17 00:55:45.000000000 -0400
+@@ -6,6 +6,7 @@
+ 
+ 
+ #include	<stdio.h>
++#include	<string.h>
+ #include	"video.h"
+ #include	"terminal.h"
+ 
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN splitvt-1.6.5.orig/utmp.c splitvt-1.6.5/utmp.c
+--- splitvt-1.6.5.orig/utmp.c	2005-05-17 00:47:04.000000000 -0400
++++ splitvt-1.6.5/utmp.c	2005-05-17 00:55:45.000000000 -0400
+@@ -6,6 +6,8 @@
+ #include	<fcntl.h>
+ #include	<utmp.h>
+ #include	<stdio.h>
++#include	<stdlib.h>
++#include	<string.h>
+ 
+ #ifdef DEBUG_UTMP
+ #undef  UTMP_FILE
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN splitvt-1.6.5.orig/videomem.c splitvt-1.6.5/videomem.c
+--- splitvt-1.6.5.orig/videomem.c	2005-05-17 00:47:04.000000000 -0400
++++ splitvt-1.6.5/videomem.c	2005-05-17 00:55:45.000000000 -0400
+@@ -2,6 +2,7 @@
+ /* This file holds the functions for manipulating video memory */
+ 
+ #include	<stdio.h>
++#include	<stdlib.h>
+ #include	"video.h"
+ #include	"terminal.h"
+ 
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN splitvt-1.6.5.orig/vt100.c splitvt-1.6.5/vt100.c
+--- splitvt-1.6.5.orig/vt100.c	2005-05-17 00:47:04.000000000 -0400
++++ splitvt-1.6.5/vt100.c	2005-05-17 00:55:45.000000000 -0400
+@@ -16,6 +16,8 @@
+ #endif
+ #include	<errno.h>
+ #include	<stdio.h>
++#include	<stdlib.h>
++#include	<string.h>
+ #include	<ctype.h>
+ #include	"vt100.h"
+ #include	"video.h"
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN splitvt-1.6.5.orig/vtmouse.c splitvt-1.6.5/vtmouse.c
+--- splitvt-1.6.5.orig/vtmouse.c	2005-05-17 00:47:04.000000000 -0400
++++ splitvt-1.6.5/vtmouse.c	2005-05-17 00:55:45.000000000 -0400
+@@ -8,6 +8,8 @@
+ #define SPLITVT_SOURCE
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include "vtmouse.h"
+ 
+ extern FILE *safe_popen();		/* From misc.c */
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN splitvt-1.6.5.orig/vtmouse.h splitvt-1.6.5/vtmouse.h
+--- splitvt-1.6.5.orig/vtmouse.h	2005-05-17 00:47:04.000000000 -0400
++++ splitvt-1.6.5/vtmouse.h	2005-05-17 00:58:19.000000000 -0400
+@@ -39,5 +39,5 @@
+ extern int  event_getc();
+ extern void event_quit();
+ 
+-extern FILE *xt_input, *xt_output;	/* Usually untouched */
++//extern FILE *xt_input, *xt_output;	/* Usually untouched */
+ 
diff --git a/app-misc/splitvt/splitvt-1.6.5-r1.ebuild b/app-misc/splitvt/splitvt-1.6.5-r1.ebuild
index 121efc96cabe..efa493335696 100644
--- a/app-misc/splitvt/splitvt-1.6.5-r1.ebuild
+++ b/app-misc/splitvt/splitvt-1.6.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/splitvt/splitvt-1.6.5-r1.ebuild,v 1.4 2005/03/26 00:00:14 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/splitvt/splitvt-1.6.5-r1.ebuild,v 1.5 2005/05/17 11:27:51 ka0ttic Exp $
 
 inherit eutils
 
@@ -23,6 +23,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${WORKDIR}/${MY_P}-${DEB_PL}.diff
+	epatch ${FILESDIR}/${P}-gcc4.diff
 	sed -i "s:/usr/local/bin:${D}/usr/bin:g" config.c
 }