diff options
Diffstat (limited to 'sysutils/nautilus-cd-burner/files')
5 files changed, 78 insertions, 14 deletions
diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-recorder.c b/sysutils/nautilus-cd-burner/files/patch-cd-recorder.c new file mode 100644 index 000000000..40433a3e5 --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-cd-recorder.c @@ -0,0 +1,26 @@ +--- cd-recorder.c.orig Wed Dec 10 14:36:05 2003 ++++ cd-recorder.c Wed Dec 10 14:36:38 2003 +@@ -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->contents.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->contents.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->contents.audio.filename); + /* TODO: handle CD-TEXT somehow */ + break; + default: diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-recorder.h b/sysutils/nautilus-cd-burner/files/patch-cd-recorder.h new file mode 100644 index 000000000..e56b93b00 --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-cd-recorder.h @@ -0,0 +1,11 @@ +--- cd-recorder.h.orig Wed Dec 10 14:28:50 2003 ++++ cd-recorder.h Wed Dec 10 14:29:00 2003 +@@ -31,7 +31,7 @@ + struct { + char *filename; + } data; +- }; ++ } contents; + }; + + #define CD_TYPE_RECORDER (cd_recorder_get_type ()) diff --git a/sysutils/nautilus-cd-burner/files/patch-configure b/sysutils/nautilus-cd-burner/files/patch-configure deleted file mode 100644 index ff42da02d..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Wed Dec 11 15:37:55 2002 -+++ configure Wed Dec 11 15:38:17 2002 -@@ -7313,6 +7313,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/sysutils/nautilus-cd-burner/files/patch-make-iso.c b/sysutils/nautilus-cd-burner/files/patch-make-iso.c index 958fe4cd0..8f06ab42c 100644 --- a/sysutils/nautilus-cd-burner/files/patch-make-iso.c +++ b/sysutils/nautilus-cd-burner/files/patch-make-iso.c @@ -1,6 +1,6 @@ ---- make-iso.c.orig Mon Sep 8 21:24:07 2003 -+++ make-iso.c Thu Oct 2 21:06:43 2003 -@@ -545,6 +545,7 @@ +--- make-iso.c.orig Fri Dec 5 15:16:04 2003 ++++ make-iso.c Wed Dec 10 14:30:52 2003 +@@ -551,6 +551,7 @@ argv[i++] = "mkisofs"; argv[i++] = "-r"; argv[i++] = "-J"; @@ -8,7 +8,7 @@ argv[i++] = "-graft-points"; argv[i++] = "-path-list"; argv[i++] = filelist; -@@ -598,6 +599,7 @@ +@@ -611,6 +612,7 @@ argv[i++] = "mkisofs"; argv[i++] = "-r"; argv[i++] = "-J"; @@ -16,3 +16,14 @@ argv[i++] = "-graft-points"; argv[i++] = "-path-list"; argv[i++] = filelist; +@@ -715,8 +717,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->contents.audio.filename = backing; ++ track->contents.audio.cdtext = NULL; + list = g_list_prepend (list, track); + } + } diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c new file mode 100644 index 000000000..a4286e8cb --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c @@ -0,0 +1,26 @@ +--- nautilus-cd-burner.c.orig Wed Dec 10 14:36:52 2003 ++++ nautilus-cd-burner.c Wed Dec 10 14:37:13 2003 +@@ -558,11 +558,11 @@ + { + switch (track->type) { + case TRACK_TYPE_DATA: +- g_free (track->data.filename); ++ g_free (track->contents.data.filename); + break; + case TRACK_TYPE_AUDIO: +- g_free (track->audio.filename); +- g_free (track->audio.cdtext); ++ g_free (track->contents.audio.filename); ++ g_free (track->contents.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->contents.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); |