diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-11-21 15:06:54 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-11-21 15:06:54 +0800 |
| commit | 47b9e912659d6e7d9bcf3e65ca587809379bb350 (patch) | |
| tree | 23db050f92629b990497ab7301de7c6f301e5dc6 /sysutils | |
| parent | 2ad89fe00a9decc02595351c283a08cf66c44935 (diff) | |
| download | marcuscom-ports-47b9e912659d6e7d9bcf3e65ca587809379bb350.tar marcuscom-ports-47b9e912659d6e7d9bcf3e65ca587809379bb350.tar.gz marcuscom-ports-47b9e912659d6e7d9bcf3e65ca587809379bb350.tar.bz2 marcuscom-ports-47b9e912659d6e7d9bcf3e65ca587809379bb350.tar.lz marcuscom-ports-47b9e912659d6e7d9bcf3e65ca587809379bb350.tar.xz marcuscom-ports-47b9e912659d6e7d9bcf3e65ca587809379bb350.tar.zst marcuscom-ports-47b9e912659d6e7d9bcf3e65ca587809379bb350.zip | |
Fix arguments to growisofs and friends.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7943 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/nautilus-cd-burner/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c | 35 |
2 files changed, 4 insertions, 35 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index bf4cadf1d..44671d134 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.118 2006/11/07 16:08:54 ahze Exp $ +# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.119 2006/11/20 06:09:56 marcus Exp $ # PORTNAME= nautilus-cd-burner PORTVERSION= 2.17.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c index 6d811ffd7..186f433fb 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c @@ -1,18 +1,5 @@ ---- src/nautilus-burn-recorder.c.orig Sun Nov 19 13:39:57 2006 -+++ src/nautilus-burn-recorder.c Sun Nov 19 13:40:58 2006 -@@ -1153,10 +1153,10 @@ nautilus_burn_recorder_write_growisofs ( - - dev_str = NULL; - if (t->type == NAUTILUS_BURN_RECORDER_TRACK_TYPE_DATA) { -- dev_str = g_strdup_printf ("%s=%s", nautilus_burn_drive_get_device (drive), t->contents.data.filename); -+ dev_str = g_strdup_printf ("%s=%s", nautilus_burn_drive_get_cdrecord_device (drive), t->contents.data.filename); - g_ptr_array_add (argv, dev_str); - } else { -- g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_device (drive)); -+ g_ptr_array_add (argv, (char *)nautilus_burn_drive_get_cdrecord_device (drive)); - - /* mkisofs options */ - if (ncb_mkisofs_supports_utf8 ()) { +--- src/nautilus-burn-recorder.c.orig Fri Sep 29 14:18:37 2006 ++++ src/nautilus-burn-recorder.c Mon Nov 20 18:13:24 2006 @@ -1343,7 +1343,7 @@ nautilus_burn_recorder_write_cdrecord (N g_ptr_array_add (argv, "cdrdao"); g_ptr_array_add (argv, "write"); @@ -40,21 +27,3 @@ g_ptr_array_add (argv, dev_str); g_ptr_array_add (argv, "-v"); -@@ -1560,7 +1560,7 @@ nautilus_burn_recorder_blank_disc_dvdrw_ - g_ptr_array_add (argv, "growisofs"); - g_ptr_array_add (argv, "-Z"); - -- dev_str = g_strdup_printf ("%s=%s", nautilus_burn_drive_get_device (drive), "/dev/zero"); -+ dev_str = g_strdup_printf ("%s=%s", nautilus_burn_drive_get_cdrecord_device (drive), "/dev/zero"); - g_ptr_array_add (argv, dev_str); - g_ptr_array_add (argv, NULL); - -@@ -1583,7 +1583,7 @@ nautilus_burn_recorder_blank_disc_dvdrw_ - g_ptr_array_add (argv, blank_str); - } - -- dev_str = g_strdup_printf ("%s", nautilus_burn_drive_get_device (drive)); -+ dev_str = g_strdup_printf ("%s", nautilus_burn_drive_get_cdrecord_device (drive)); - g_ptr_array_add (argv, dev_str); - g_ptr_array_add (argv, NULL); - |