Added patch for compilation with gcc 3.4. See Bug #123007.

(Portage version: 2.1_rc3)

6 files changed, 62 insertions, 4 deletions

diff --git a/media-video/tuxzap-programs/ChangeLog b/media-video/tuxzap-programs/ChangeLog
index 955132dd7e2f..f9a9e18b1090 100644
--- a/media-video/tuxzap-programs/ChangeLog
+++ b/media-video/tuxzap-programs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/tuxzap-programs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tuxzap-programs/ChangeLog,v 1.11 2006/05/03 21:03:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tuxzap-programs/ChangeLog,v 1.12 2006/05/28 13:11:18 zzam Exp $
+
+  28 May 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/tuxzap-programs-0.5.4-gcc-34.diff, tuxzap-programs-0.5.4.ebuild:
+  Added patch for compilation with gcc 3.4. See Bug #123007.
 
   03 May 2006; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
   Update metadata to list media-video@gentoo.org as maintainer.
diff --git a/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.3 b/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.3
index 0a4022966f96..8223acb6086c 100644
--- a/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.3
+++ b/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.3
@@ -1 +1,3 @@
 MD5 03dc448caf7f401b1a22e7dbd868b960 tuxzap_programs-0.2.3.tar.gz 162160
+RMD160 a0cb1e55f75f969777a769d58c29b65fd5e9d2d6 tuxzap_programs-0.2.3.tar.gz 162160
+SHA256 985307b9f20ba6f25876d76c7e2f3f5db1741259b0e12d798d86bea15fc7611e tuxzap_programs-0.2.3.tar.gz 162160
diff --git a/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.5 b/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.5
index 332562af5eb2..634ed779f275 100644
--- a/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.5
+++ b/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.2.5
@@ -1 +1,3 @@
 MD5 3f62152dc2d4f780fbdcf5f32e659771 tuxzap_programs-0.2.5.tar.gz 162615
+RMD160 b1586e310289e887fb602394bb393f6f9dfe9cb4 tuxzap_programs-0.2.5.tar.gz 162615
+SHA256 216915251a79ceebbe87d2514e9606c2451b9515335b21e5b631a1c5751a8749 tuxzap_programs-0.2.5.tar.gz 162615
diff --git a/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.5.4 b/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.5.4
index aac1e63f4ecb..df4437350ee0 100644
--- a/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.5.4
+++ b/media-video/tuxzap-programs/files/digest-tuxzap-programs-0.5.4
@@ -1 +1,3 @@
 MD5 68b3aac1b941c66172ad2b530c48803b tuxzap_programs-0.5.4.tar.gz 165710
+RMD160 9e41f953f799062d6987c2b2f696fd81811c8e2b tuxzap_programs-0.5.4.tar.gz 165710
+SHA256 a1f967f05dee48f1d28073baed6ceae2f1ea4e2760fbd60895e531f010255aa9 tuxzap_programs-0.5.4.tar.gz 165710
diff --git a/media-video/tuxzap-programs/files/tuxzap-programs-0.5.4-gcc-34.diff b/media-video/tuxzap-programs/files/tuxzap-programs-0.5.4-gcc-34.diff
new file mode 100644
index 000000000000..36a30f3f9b44
--- /dev/null
+++ b/media-video/tuxzap-programs/files/tuxzap-programs-0.5.4-gcc-34.diff
@@ -0,0 +1,42 @@
+Nur in tuxzap_programs-0.5.4/src: cam_set.
+diff -ru tuxzap_programs-0.5.4-orig/src/interface2.cc tuxzap_programs-0.5.4/src/interface2.cc
+--- tuxzap_programs-0.5.4-orig/src/interface2.cc	2006-05-28 13:00:39.379215952 +0200
++++ tuxzap_programs-0.5.4/src/interface2.cc	2006-05-28 13:01:24.615531456 +0200
+@@ -576,7 +576,7 @@
+ 	gtvscreen_get_values(gwid, GTV_NINPUT, &ninput);
+ 
+ 	GtkWidget **intool;
+-	intool = new(GtkWidget *)[ninput];
++	intool = new(GtkWidget * [ninput]);
+ 	// first button of radio box for input switching : tuner
+ 	switch (ninput) {
+ 
+Nur in tuxzap_programs-0.5.4/src: interface2.o.
+Nur in tuxzap_programs-0.5.4/src: ntuxplayer.
+Nur in tuxzap_programs-0.5.4/src: ntuxzap.
+diff -ru tuxzap_programs-0.5.4-orig/src/ntuxzap.cc tuxzap_programs-0.5.4/src/ntuxzap.cc
+--- tuxzap_programs-0.5.4-orig/src/ntuxzap.cc	2006-05-28 13:00:39.379215952 +0200
++++ tuxzap_programs-0.5.4/src/ntuxzap.cc	2006-05-28 13:01:09.494088957 +0200
+@@ -249,7 +249,7 @@
+ 	switch (k){
+ 	case 0:
+ 		num = dvb.num[CHAN];
+-		info = new (char *) [num];
++		info = new (char * [num]);
+ 		for (int i=0; i < num; i++){
+ 			ostringstream str;
+ 			str << dvb.chans[i].name << "  (" << i << ")"<< ends;
+@@ -260,7 +260,7 @@
+ 
+ 	case 1 ... NLIST:
+ 		num = chlist[k-1].NumChan();
+-		info = new (char *) [num];
++		info = new (char * [num]);
+ 		j = 0;
+ 		for (int i = 0; i < num; i++) {
+ 			ostringstream str;
+Nur in tuxzap_programs-0.5.4/src: ntuxzap.o.
+Nur in tuxzap_programs-0.5.4/src: rtuxzap.
+Nur in tuxzap_programs-0.5.4/src: tuxplayer.
+Nur in tuxzap_programs-0.5.4/src: tuxview.
+Nur in tuxzap_programs-0.5.4/src: tuxzap.
diff --git a/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild b/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild
index 467e2944aef6..026354e7fcee 100644
--- a/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild
+++ b/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild
@@ -1,8 +1,8 @@
-# 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/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild,v 1.2 2005/12/08 07:48:45 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/tuxzap-programs/tuxzap-programs-0.5.4.ebuild,v 1.3 2006/05/28 13:11:18 zzam Exp $
 
-inherit multilib
+inherit multilib eutils
 
 MY_P=${PN/-/_}-${PV}
 S=${WORKDIR}/${MY_P}
@@ -20,6 +20,12 @@ DEPEND=">=media-libs/libdvb-0.2.1
 	dev-libs/cdk
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-gcc-34.diff
+}
+
 src_compile() {
 	local myconf=""
 	# not using X use var because gtk is needed too anyway