Added patch to compile with gcc4 (Cardoe will upload the new ebuild).

Package-Manager: portage-2.0.51.22-r1

2 files changed, 79 insertions, 3 deletions

diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index e452b91a7892..f191bdcc4963 100644
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -1,11 +1,11 @@
-MD5 30cbb314644438efeaa6c13fae982178 ChangeLog 8497
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 MD5 b656c9ce1bf60ab75f08e8b4beff94a3 xawtv-3.86-r2.ebuild 2151
+MD5 ff5c156749e2d43ad88a4c376a768afb ChangeLog 8851
 MD5 a30e78add3dba1787b4d427607630d73 xawtv-3.94-r1.ebuild 2347
-MD5 3c0315270bcfc2ee64aa7b5fef1f1dec xawtv-3.94.ebuild 2271
+MD5 9cafb639d28e3851ad5b8483c79d4b8d xawtv-3.94-r2.ebuild 2762
 MD5 1f399235f11cf563eae5d9ca1085b5b2 files/alevtd-style-mozilla.diff 307
 MD5 e115a525876d643613edd9306ecbc01d files/digest-xawtv-3.86-r2 205
-MD5 439d1ef32593121b9afe079f635a9ba0 files/digest-xawtv-3.94 205
+MD5 439d1ef32593121b9afe079f635a9ba0 files/digest-xawtv-3.94-r2 205
 MD5 439d1ef32593121b9afe079f635a9ba0 files/digest-xawtv-3.94-r1 205
 MD5 e4dcb4819e11ae2fb4fa72f4f8420bca files/tv-fonts-1.0-gentoo.diff 426
 MD5 04a2ce4d8937cc7dfc255082396fa5fe files/webcamrc 597
diff --git a/media-tv/xawtv/files/xawtv-3.94-gcc4.patch b/media-tv/xawtv/files/xawtv-3.94-gcc4.patch
new file mode 100644
index 000000000000..50e4387292eb
--- /dev/null
+++ b/media-tv/xawtv/files/xawtv-3.94-gcc4.patch
@@ -0,0 +1,76 @@
+diff -x '*~' -ur xawtv-3.94/console/fbtv.c xawtv-3.94-gcc4/console/fbtv.c
+--- xawtv-3.94/console/fbtv.c	2004-06-30 14:26:52.000000000 +0200
++++ xawtv-3.94-gcc4/console/fbtv.c	2005-05-30 02:09:30.516434608 +0200
+@@ -187,7 +187,7 @@
+ 
+ #define NKEYTAB (sizeof(keytab)/sizeof(struct KEYTAB))
+ 
+-static char              *snapbase;
++char              *snapbase;
+ static char              default_title[128] = "???";
+ static char              message[128] = "";
+ 
+diff -x '*~' -ur xawtv-3.94/console/ftp.c xawtv-3.94-gcc4/console/ftp.c
+--- xawtv-3.94/console/ftp.c	2003-02-14 15:14:04.000000000 +0100
++++ xawtv-3.94-gcc4/console/ftp.c	2005-05-30 02:07:26.185335808 +0200
+@@ -186,7 +186,7 @@
+ 		s->connected = 0;
+ 	    }
+ 	    if (NULL != strstr(p,"Not connected")) {
+-		if (ftp_connected)
++		if (ftp_connected(s))
+ 		    fprintf(stderr,"ftp: lost connection\n");
+ 		s->connected = 0;
+ 	    }
+@@ -236,7 +236,7 @@
+ 	/* login */
+ 	ftp_send(s,3,"user",user,pass);
+ 	if (230 != ftp_recv(s)) {
+-	    if (!ftp_connected)
++	    if (!ftp_connected(s))
+ 		continue;
+ 	    fprintf(stderr,"ftp: login incorrect\n");
+ 	    exit(1);
+diff -x '*~' -ur xawtv-3.94/libng/grab-ng.h xawtv-3.94-gcc4/libng/grab-ng.h
+--- xawtv-3.94/libng/grab-ng.h	2003-02-14 15:14:07.000000000 +0100
++++ xawtv-3.94-gcc4/libng/grab-ng.h	2005-05-30 02:08:39.157242392 +0200
+@@ -25,7 +25,9 @@
+ 
+ #if __STDC_VERSION__ < 199901
+ # define restrict
+-# define bool int
++# ifndef bool
++#  define bool int
++# endif
+ #endif
+ 
+ #define UNSET          (-1U)
+diff -x '*~' -ur xawtv-3.94/libng/plugins/read-avi.c xawtv-3.94-gcc4/libng/plugins/read-avi.c
+--- xawtv-3.94/libng/plugins/read-avi.c	2003-02-14 15:14:05.000000000 +0100
++++ xawtv-3.94-gcc4/libng/plugins/read-avi.c	2005-05-30 02:12:25.081896624 +0200
+@@ -7,6 +7,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <sys/uio.h>
++#include <inttypes.h>
+ 
+ #include "riff.h"
+ #include "list.h"
+@@ -64,7 +65,7 @@
+     h->movi[h->movi_cnt].size  = size;
+     h->movi_cnt++;
+     if (ng_debug)
+-	fprintf(stderr,"%*s[movie data list: 0x%llx+0x%llx]\n",
++	fprintf(stderr,"%*s[movie data list: 0x%" PRIx64 "+0x%" PRIx64 "]\n",
+ 		level, "", start, size);
+ }
+ 
+@@ -213,7 +214,7 @@
+ 	*pos += (chunk.size + 3) & ~0x03; /* 32-bit align */
+ 	if (FCCS(chunk.id) == id) {
+ 	    if (ng_debug)
+-		fprintf(stderr,"avi: chunk %4.4s: 0x%llx+0x%x\n",
++		fprintf(stderr,"avi: chunk %4.4s: 0x%" PRIx64 "+0x%x\n",
+ 			chunk.id,*pos,chunk.size);
+ 	    return chunk.size;
+ 	}