Patch to fix compilaton under gcc-2. Closes bug #42873.

4 files changed, 93 insertions, 5 deletions

diff --git a/gnome-extra/nautilus-cd-burner/ChangeLog b/gnome-extra/nautilus-cd-burner/ChangeLog
index d4572ee0625f..27883891723d 100644
--- a/gnome-extra/nautilus-cd-burner/ChangeLog
+++ b/gnome-extra/nautilus-cd-burner/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for gnome-extra/nautilus-cd-burner
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.22 2004/02/10 14:36:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.23 2004/03/08 01:22:36 leonardop Exp $
 
+  07 Mar 2004; L. Boshell <leonardop@gentoo.org>
+  nautilus-cd-burner-0.6.1.ebuild,
+  files/nautilus-cd-burner-0.6.1-gcc2_fix.patch:
+  Added patch to make it compile under gcc-2. Closes bug #42873.
+  
   10 Feb 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   nautilus-cd-burner-0.6.1.ebuild:
   stable on hppa
diff --git a/gnome-extra/nautilus-cd-burner/Manifest b/gnome-extra/nautilus-cd-burner/Manifest
index 9b2fe61dab72..e4c9f3bd853d 100644
--- a/gnome-extra/nautilus-cd-burner/Manifest
+++ b/gnome-extra/nautilus-cd-burner/Manifest
@@ -1,6 +1,7 @@
-MD5 40f80530cc7bef320d313ea87b24ee22 ChangeLog 3141
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 5a5bac080cbfa1959b7575ef70ae15ca ChangeLog 3343
 MD5 3fd19ba7a12b8422115149343a707655 nautilus-cd-burner-0.5.3.ebuild 721
-MD5 cae9a5feb305d7f38e81d5efc81c18c7 nautilus-cd-burner-0.6.1.ebuild 1048
+MD5 ac4e98189377cc91d4515e3f59c0c6ed nautilus-cd-burner-0.6.1.ebuild 1090
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 60a07dd45831b81036471b5b20dcb4a8 files/digest-nautilus-cd-burner-0.5.3 77
 MD5 5c5b2951cc6f2fe0138c0f5ac4bc97d4 files/digest-nautilus-cd-burner-0.6.1 77
+MD5 0cc10acbcdaa96ade28aa3b589287e72 files/nautilus-cd-burner-0.6.1-gcc2_fix.patch 3099
diff --git a/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-0.6.1-gcc2_fix.patch b/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-0.6.1-gcc2_fix.patch
new file mode 100644
index 000000000000..c1f265de8d88
--- /dev/null
+++ b/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-0.6.1-gcc2_fix.patch
@@ -0,0 +1,80 @@
+diff -NurB nautilus-cd-burner-0.6.1-orig/cd-recorder.c nautilus-cd-burner-0.6.1/cd-recorder.c
+--- nautilus-cd-burner-0.6.1-orig/cd-recorder.c	2004-03-07 19:49:43.000000000 -0500
++++ nautilus-cd-burner-0.6.1/cd-recorder.c	2004-03-07 19:59:05.000000000 -0500
+@@ -480,7 +480,7 @@
+ 
+ 	g_ptr_array_add (argv, "-Z");
+ 
+-	dev_str = g_strdup_printf ("%s=%s", recorder->device, t->data.filename);
++	dev_str = g_strdup_printf ("%s=%s", recorder->device, t->fields.data.filename);
+ 	g_ptr_array_add (argv, dev_str);
+ 
+ 	g_ptr_array_add (argv, NULL);
+@@ -634,12 +634,12 @@
+ 		case TRACK_TYPE_DATA:
+ 			g_ptr_array_add (argv, "-data");
+ 			g_ptr_array_add (argv, "-nopad"); /* TODO? */
+-			g_ptr_array_add (argv, track->data.filename);
++			g_ptr_array_add (argv, track->fields.data.filename);
+ 			break;
+ 		case TRACK_TYPE_AUDIO:
+ 			g_ptr_array_add (argv, "-audio");
+ 			g_ptr_array_add (argv, "-pad");
+-			g_ptr_array_add (argv, track->audio.filename);
++			g_ptr_array_add (argv, track->fields.audio.filename);
+ 			/* TODO: handle CD-TEXT somehow */
+ 			break;
+ 		default:
+diff -NurB nautilus-cd-burner-0.6.1-orig/cd-recorder.h nautilus-cd-burner-0.6.1/cd-recorder.h
+--- nautilus-cd-burner-0.6.1-orig/cd-recorder.h	2004-03-07 19:49:43.000000000 -0500
++++ nautilus-cd-burner-0.6.1/cd-recorder.h	2004-03-07 19:53:23.000000000 -0500
+@@ -31,7 +31,7 @@
+     struct {
+       char *filename;
+     } data;
+-  };
++  } fields;
+ };
+ 
+ #define CD_TYPE_RECORDER            (cd_recorder_get_type ())
+diff -NurB nautilus-cd-burner-0.6.1-orig/make-iso.c nautilus-cd-burner-0.6.1/make-iso.c
+--- nautilus-cd-burner-0.6.1-orig/make-iso.c	2004-03-07 19:49:43.000000000 -0500
++++ nautilus-cd-burner-0.6.1/make-iso.c	2004-03-07 19:58:19.000000000 -0500
+@@ -715,8 +715,8 @@
+ 			backing = get_backing_file (info->name);
+ 			track = g_new0 (Track, 1);
+ 			track->type = TRACK_TYPE_AUDIO;
+-			track->audio.filename = backing;
+-			track->audio.cdtext = NULL;
++			track->fields.audio.filename = backing;
++			track->fields.audio.cdtext = NULL;
+ 			list = g_list_prepend (list, track);
+ 		}
+ 	}
+diff -NurB nautilus-cd-burner-0.6.1-orig/nautilus-cd-burner.c nautilus-cd-burner-0.6.1/nautilus-cd-burner.c
+--- nautilus-cd-burner-0.6.1-orig/nautilus-cd-burner.c	2004-03-07 19:49:43.000000000 -0500
++++ nautilus-cd-burner-0.6.1/nautilus-cd-burner.c	2004-03-07 19:56:13.000000000 -0500
+@@ -558,11 +558,11 @@
+ {
+ 	switch (track->type) {
+ 	case TRACK_TYPE_DATA:
+-		g_free (track->data.filename);
++		g_free (track->fields.data.filename);
+ 		break;
+ 	case TRACK_TYPE_AUDIO:
+-		g_free (track->audio.filename);
+-		g_free (track->audio.cdtext);
++		g_free (track->fields.audio.filename);
++		g_free (track->fields.audio.cdtext);
+ 		break;
+ 	default:
+ 		g_warning ("Invalid track type %d", track->type);
+@@ -864,7 +864,7 @@
+ 			Track *track;
+ 			track = g_new0 (Track, 1);
+ 			track->type = TRACK_TYPE_DATA;
+-			track->data.filename = g_strdup (filename);
++			track->fields.data.filename = g_strdup (filename);
+ 			tracks = g_list_prepend (tracks, track);
+ 		}
+ 		res = cd_recorder_write_tracks (cdrecorder, rec, tracks, speed, eject_cd, blank_cd, dummy);
diff --git a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-0.6.1.ebuild b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-0.6.1.ebuild
index 3804e511ae06..2dfb874a6687 100644
--- a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-0.6.1.ebuild
+++ b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-0.6.1.ebuild,v 1.7 2004/02/10 14:36:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-0.6.1.ebuild,v 1.8 2004/03/08 01:22:36 leonardop Exp $
 
 inherit gnome2
 
@@ -33,5 +33,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	intltoolize --force
+
+	epatch ${FILESDIR}/${P}-gcc2_fix.patch
 }
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"