[Midnightbsd-cvs] mports: sysutils/nautilus-cd-burner: Update to 2.22.0
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jun 1 15:58:46 EDT 2008
Log Message:
-----------
Update to 2.22.0
Modified Files:
--------------
mports/sysutils/nautilus-cd-burner:
Makefile (r1.2 -> r1.3)
distinfo (r1.2 -> r1.3)
pkg-plist (r1.2 -> r1.3)
mports/sysutils/nautilus-cd-burner/files:
patch-src_list_cddrives.c (r1.1 -> r1.2)
patch-src_make-iso.c (r1.1 -> r1.2)
patch-src_nautilus-burn-drive-monitor.c (r1.2 -> r1.3)
patch-src_nautilus-burn-drive-private.h (r1.1 -> r1.2)
patch-src_nautilus-burn-drive.c (r1.1 -> r1.2)
patch-src_nautilus-burn-drive.h (r1.1 -> r1.2)
patch-src_nautilus-burn-recorder.c (r1.1 -> r1.2)
patch-src_nautilus-cd-burner.c (r1.1 -> r1.2)
Removed Files:
-------------
mports/sysutils/nautilus-cd-burner/files:
patch-src_nautilus-burn-drive-selection.c
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/sysutils/nautilus-cd-burner/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sysutils/nautilus-cd-burner/pkg-plist -L sysutils/nautilus-cd-burner/pkg-plist -u -r1.2 -r1.3
--- sysutils/nautilus-cd-burner/pkg-plist
+++ sysutils/nautilus-cd-burner/pkg-plist
@@ -1,5 +1,4 @@
bin/nautilus-cd-burner
-etc/gnome-vfs-2.0/modules/mapping-modules.conf
include/libnautilus-burn/nautilus-burn-drive-monitor.h
include/libnautilus-burn/nautilus-burn-drive-selection.h
include/libnautilus-burn/nautilus-burn-drive.h
@@ -7,18 +6,14 @@
include/libnautilus-burn/nautilus-burn-init.h
include/libnautilus-burn/nautilus-burn-recorder.h
include/libnautilus-burn/nautilus-burn.h
-lib/gnome-vfs-2.0/modules/libmapping.a
-lib/gnome-vfs-2.0/modules/libmapping.la
-lib/gnome-vfs-2.0/modules/libmapping.so
lib/libnautilus-burn.a
lib/libnautilus-burn.la
lib/libnautilus-burn.so
lib/libnautilus-burn.so.4
-lib/nautilus/extensions-1.0/libnautilus-burn-extension.a
-lib/nautilus/extensions-1.0/libnautilus-burn-extension.la
-lib/nautilus/extensions-1.0/libnautilus-burn-extension.so
+lib/nautilus/extensions-2.0/libnautilus-burn-extension.a
+lib/nautilus/extensions-2.0/libnautilus-burn-extension.la
+lib/nautilus/extensions-2.0/libnautilus-burn-extension.so
libdata/pkgconfig/libnautilus-burn.pc
-libexec/mapping-daemon
share/applications/nautilus-cd-burner-open-iso.desktop
share/applications/nautilus-cd-burner.desktop
share/icons/hicolor/16x16/apps/nautilus-cd-burner.png
@@ -27,6 +22,7 @@
share/icons/hicolor/scalable/apps/nautilus-cd-burner.svg
share/locale/am/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ar/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/as/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/az/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/be/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/be at latin/LC_MESSAGES/nautilus-cd-burner.mo
@@ -62,6 +58,7 @@
share/locale/it/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ka/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/kn/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ku/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
@@ -70,6 +67,7 @@
share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ml/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/mr/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo
share/locale/ne/LC_MESSAGES/nautilus-cd-burner.mo
@@ -112,6 +110,7 @@
%%DATADIR%%/cdspin8.png
%%DATADIR%%/nautilus-cd-burner.glade
@dirrm %%DATADIR%%
+ at dirrmtry share/applications
@dirrm include/libnautilus-burn
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@@ -129,6 +128,8 @@
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES
@dirrmtry share/locale/oc
+ at dirrmtry share/locale/mr/LC_MESSAGES
+ at dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@@ -141,4 +142,5 @@
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be at latin/LC_MESSAGES
@dirrmtry share/locale/be at latin
- at dirrmtry share/applications
+ at dirrmtry share/locale/as/LC_MESSAGES
+ at dirrmtry share/locale/as
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/sysutils/nautilus-cd-burner/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sysutils/nautilus-cd-burner/Makefile -L sysutils/nautilus-cd-burner/Makefile -u -r1.2 -r1.3
--- sysutils/nautilus-cd-burner/Makefile
+++ sysutils/nautilus-cd-burner/Makefile
@@ -2,12 +2,12 @@
# Date created: 13 April 2003
# Whom: Joe Marcus Clarke <marcus at FreeBSD.org>
#
-# $MidnighhtBSD$
+# $MidnightBSD$
# $FreeBSD: ports/sysutils/nautilus-cd-burner/Makefile,v 1.42 2007/05/29 04:07:21 mezz Exp $
#
PORTNAME= nautilus-cd-burner
-PORTVERSION= 2.20.0
+PORTVERSION= 2.22.0
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -15,6 +15,7 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= CD burner view for Nautilus
+LICENSE= gpl2
RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao
@@ -35,8 +36,7 @@
GCONF_SCHEMAS= nautilus-cd-burner.schemas
OPTIONS= DVD "Enable DVD support" on \
- CJK "Use cdrtools-cjk instead of cdrtools" off \
- GNOMEMOUNT "Enable sysutils/gnome-mount support" off
+ CJK "Use cdrtools-cjk instead of cdrtools" off
.include <bsd.port.pre.mk>
@@ -48,13 +48,9 @@
RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
.endif
-.if defined(WITH_GNOMEMOUNT)
BUILD_DEPENDS+= gnome-mount:${PORTSDIR}/sysutils/gnome-mount
RUN_DEPENDS+= gnome-mount:${PORTSDIR}/sysutils/gnome-mount
CONFIGURE_ARGS+= --enable-gnome-mount
-.else
-CONFIGURE_ARGS+= --disable-gnome-mount
-.endif
post-install:
- at update-desktop-database
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/sysutils/nautilus-cd-burner/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sysutils/nautilus-cd-burner/distinfo -L sysutils/nautilus-cd-burner/distinfo -u -r1.2 -r1.3
--- sysutils/nautilus-cd-burner/distinfo
+++ sysutils/nautilus-cd-burner/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = a7ddb02c33be107f6c9c1874b7703e9e
-SHA256 (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = fc7a91473bc3cab7cba8ef4185e8f62ea6ad50a4558d8bce1aa639a4397ec905
-SIZE (gnome2/nautilus-cd-burner-2.20.0.tar.bz2) = 730319
+MD5 (gnome2/nautilus-cd-burner-2.22.1.tar.bz2) = 6bf96cb55a11813a26118eabafa69143
+SHA256 (gnome2/nautilus-cd-burner-2.22.1.tar.bz2) = 33cfc61e8f1913350b4796b446010d7f9a9246783b01b93eafdc87ba06cac5ab
+SIZE (gnome2/nautilus-cd-burner-2.22.1.tar.bz2) = 735353
Index: patch-src_make-iso.c
===================================================================
RCS file: /home/cvs/mports/sysutils/nautilus-cd-burner/files/patch-src_make-iso.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sysutils/nautilus-cd-burner/files/patch-src_make-iso.c -L sysutils/nautilus-cd-burner/files/patch-src_make-iso.c -u -r1.1 -r1.2
--- sysutils/nautilus-cd-burner/files/patch-src_make-iso.c
+++ sysutils/nautilus-cd-burner/files/patch-src_make-iso.c
@@ -1,38 +1,38 @@
---- src/make-iso.c.orig Sun Nov 19 13:34:29 2006
-+++ src/make-iso.c Sun Nov 19 13:36:03 2006
+--- src/make-iso.c.orig Sun Nov 19 13:34:29 2006
++++ src/make-iso.c Sun Nov 19 13:36:03 2006
@@ -1367,7 +1367,7 @@ get_disc_info (NautilusBurnIso *iso,
- &has_data,
- &_has_audio);
- if (_has_audio) {
-- device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_device (drive));
-+ device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_cdrecord_device (drive));
+ &has_data,
+ &_has_audio);
+ if (_has_audio) {
+- device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_device (drive));
++ device_arg = g_strdup_printf ("%s", nautilus_burn_drive_get_cdrecord_device (drive));
- argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "cdrdao");
+ argv = g_ptr_array_new ();
+ g_ptr_array_add (argv, "cdrdao");
@@ -1377,7 +1377,7 @@ get_disc_info (NautilusBurnIso *iso,
- g_ptr_array_add (argv, NULL);
+ g_ptr_array_add (argv, NULL);
- } else {
-- device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive));
-+ device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
+ } else {
+- device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_device (drive));
++ device_arg = g_strdup_printf ("-dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
- argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "readcd");
+ argv = g_ptr_array_new ();
+ g_ptr_array_add (argv, "readcd");
@@ -1547,7 +1547,7 @@ nautilus_burn_iso_make_from_drive (Nauti
- g_ptr_array_add (argv, "--datafile");
- g_ptr_array_add (argv, (char *)filename);
- g_ptr_array_add (argv, "--device");
-- 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));
- g_ptr_array_add (argv, "-v");
- g_ptr_array_add (argv, "2");
- g_ptr_array_add (argv, (char *)toc_filename_arg);
+ g_ptr_array_add (argv, "--datafile");
+ g_ptr_array_add (argv, (char *)filename);
+ g_ptr_array_add (argv, "--device");
+- 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));
+ g_ptr_array_add (argv, "-v");
+ g_ptr_array_add (argv, "2");
+ g_ptr_array_add (argv, (char *)toc_filename_arg);
@@ -1559,7 +1559,7 @@ nautilus_burn_iso_make_from_drive (Nauti
- filename_arg = g_strdup_printf ("f=%s", filename);
+ filename_arg = g_strdup_printf ("f=%s", filename);
-- dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
-+ dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
+- dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
++ dev_arg = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
- argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "readcd");
+ argv = g_ptr_array_new ();
+ g_ptr_array_add (argv, "readcd");
Index: patch-src_nautilus-burn-drive.c
===================================================================
RCS file: /home/cvs/mports/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c -L sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c -u -r1.1 -r1.2
--- sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
+++ sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
@@ -1,5 +1,5 @@
---- src/nautilus-burn-drive.c.orig Fri Sep 29 12:55:36 2006
-+++ src/nautilus-burn-drive.c Sun Nov 19 13:27:31 2006
+--- src/nautilus-burn-drive.c.orig Fri Sep 29 12:55:36 2006
++++ src/nautilus-burn-drive.c Sun Nov 19 13:27:31 2006
@@ -266,6 +266,25 @@ nautilus_burn_drive_get_device (Nautilus
}
@@ -17,41 +17,28 @@
+const char *
+nautilus_burn_drive_get_cdrecord_device (NautilusBurnDrive *drive)
+{
-+ g_return_val_if_fail (drive != NULL, NULL);
++ g_return_val_if_fail (drive != NULL, NULL);
+
-+ return drive->priv->cdrecord_device;
++ return drive->priv->cdrecord_device;
+}
+
+/**
* nautilus_burn_drive_get_drive_type:
* @drive: #NautilusBurnDrive
*
-@@ -808,8 +827,12 @@ nautilus_burn_drive_eject (NautilusBurnD
- #ifdef USE_GNOME_MOUNT
- cmd = g_strdup_printf ("gnome-mount --eject --no-ui --device=%s", drive->priv->device);
- #else
-+#ifdef __FreeBSD_
-+ cmd = g_strdup_printf ("cdcontrol -f %s eject", drive->priv->device);
-+#else
- cmd = g_strdup_printf ("eject %s", drive->priv->device);
- #endif
-+#endif
-
- res = g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL);
- g_free (cmd);
@@ -1021,6 +1044,7 @@ nautilus_burn_drive_finalize (GObject *o
- g_free (drive->priv->write_speeds);
- g_free (drive->priv->display_name);
- g_free (drive->priv->device);
-+ g_free (drive->priv->cdrecord_device);
+ g_free (drive->priv->write_speeds);
+ g_free (drive->priv->display_name);
+ g_free (drive->priv->device);
++ g_free (drive->priv->cdrecord_device);
- if (G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize != NULL) {
- (* G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize) (object);
+ if (G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize != NULL) {
+ (* G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize) (object);
@@ -1038,6 +1062,7 @@ nautilus_burn_drive_init (NautilusBurnDr
- drive->priv->max_speed_read = 0;
- drive->priv->write_speeds = NULL;
- drive->priv->device = NULL;
-+ drive->priv->cdrecord_device = NULL;
+ drive->priv->max_speed_read = 0;
+ drive->priv->write_speeds = NULL;
+ drive->priv->device = NULL;
++ drive->priv->cdrecord_device = NULL;
}
/**
Index: patch-src_nautilus-burn-drive.h
===================================================================
RCS file: /home/cvs/mports/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h -L sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h -u -r1.1 -r1.2
--- sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h
+++ sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h
@@ -1,5 +1,5 @@
---- src/nautilus-burn-drive.h.orig Sun Nov 19 13:37:32 2006
-+++ src/nautilus-burn-drive.h Sun Nov 19 13:37:55 2006
+--- src/nautilus-burn-drive.h.orig Sun Nov 19 13:37:32 2006
++++ src/nautilus-burn-drive.h Sun Nov 19 13:37:55 2006
@@ -127,6 +127,7 @@ gboolean nautilus_burn_driv
int nautilus_burn_drive_get_drive_type (NautilusBurnDrive *drive);
char * nautilus_burn_drive_get_name_for_display (NautilusBurnDrive *drive);
Index: patch-src_nautilus-burn-drive-monitor.c
===================================================================
RCS file: /home/cvs/mports/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c -L sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c -u -r1.2 -r1.3
--- sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c
+++ sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c
@@ -1,48 +1,48 @@
---- src/nautilus-burn-drive-monitor.c.orig 2007-07-10 15:06:23.000000000 -0400
-+++ src/nautilus-burn-drive-monitor.c 2008-01-05 13:51:44.000000000 -0500
+--- src/nautilus-burn-drive-monitor.c.orig 2007-07-10 15:06:23.000000000 -0400
++++ src/nautilus-burn-drive-monitor.c 2008-01-05 13:51:44.000000000 -0500
@@ -618,7 +618,8 @@ nautilus_burn_drive_monitor_get_drive_fo
- */
- if (drive->priv->device != NULL &&
- (strcmp (drive->priv->device, target) == 0 ||
+ */
+ if (drive->priv->device != NULL &&
+ (strcmp (drive->priv->device, target) == 0 ||
- strcmp (drive->priv->device, device) == 0)) {
+ strcmp (drive->priv->device, device) == 0 ||
+ strcmp (drive->priv->cdrecord_device, device) == 0)) {
- ret = nautilus_burn_drive_ref (drive);
- break;
- }
+ ret = nautilus_burn_drive_ref (drive);
+ break;
+ }
@@ -683,6 +684,8 @@ hal_drive_from_udi (LibHalContext *ctx,
- NautilusBurnDrive *drive;
- char **write_speeds = NULL;
- char *raw_device = NULL;
-+ char *cam_path = NULL;
-+ char *cam_device = NULL;
+ NautilusBurnDrive *drive;
+ char **write_speeds = NULL;
+ char *raw_device = NULL;
++ char *cam_path = NULL;
++ char *cam_device = NULL;
- LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE);
+ LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE);
@@ -711,6 +714,8 @@ hal_drive_from_udi (LibHalContext *ctx,
- LIBHAL_PROP_EXTRACT_STRING ("block.device", drive->priv->device);
- LIBHAL_PROP_EXTRACT_STRING ("block.solaris.raw_device", raw_device);
-+ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.atapi_cam_device", cam_device);
-+ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.cam_path", cam_path);
- LIBHAL_PROP_EXTRACT_STRING ("storage.model", drive->priv->display_name);
+ LIBHAL_PROP_EXTRACT_STRING ("block.device", drive->priv->device);
+ LIBHAL_PROP_EXTRACT_STRING ("block.solaris.raw_device", raw_device);
++ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.atapi_cam_device", cam_device);
++ LIBHAL_PROP_EXTRACT_STRING ("block.freebsd.cam_path", cam_path);
+ LIBHAL_PROP_EXTRACT_STRING ("storage.model", drive->priv->display_name);
- LIBHAL_PROP_EXTRACT_INT ("storage.cdrom.read_speed", drive->priv->max_speed_read);
+ LIBHAL_PROP_EXTRACT_INT ("storage.cdrom.read_speed", drive->priv->max_speed_read);
@@ -736,6 +741,17 @@ hal_drive_from_udi (LibHalContext *ctx,
- drive->priv->device = raw_device;
- }
+ drive->priv->device = raw_device;
+ }
-+ if (cam_device != NULL) {
-+ g_free (drive->priv->device);
-+ drive->priv->device = cam_device;
-+ }
++ if (cam_device != NULL) {
++ g_free (drive->priv->device);
++ drive->priv->device = cam_device;
++ }
+
-+ if (cam_path != NULL) {
-+ drive->priv->cdrecord_device = cam_path;
-+ } else {
-+ drive->priv->cdrecord_device = g_strdup (drive->priv->device);
-+ }
++ if (cam_path != NULL) {
++ drive->priv->cdrecord_device = cam_path;
++ } else {
++ drive->priv->cdrecord_device = g_strdup (drive->priv->device);
++ }
+
- drive->priv->drive_udi = g_strdup (udi);
- drive->priv->write_speeds = hal_parse_write_speeds (write_speeds);
- /* we do not own write_speeds so do not free it. */
+ drive->priv->drive_udi = g_strdup (udi);
+ drive->priv->write_speeds = hal_parse_write_speeds (write_speeds);
+ /* we do not own write_speeds so do not free it. */
Index: patch-src_nautilus-burn-drive-private.h
===================================================================
RCS file: /home/cvs/mports/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h -L sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h -u -r1.1 -r1.2
--- sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h
+++ sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h
@@ -1,10 +1,10 @@
---- src/nautilus-burn-drive-private.h.orig Sun Nov 19 13:43:24 2006
-+++ src/nautilus-burn-drive-private.h Sun Nov 19 13:43:50 2006
+--- src/nautilus-burn-drive-private.h.orig Sun Nov 19 13:43:24 2006
++++ src/nautilus-burn-drive-private.h Sun Nov 19 13:43:50 2006
@@ -34,6 +34,7 @@ struct NautilusBurnDrivePrivate {
- int type;
- char *device;
-+ char *cdrecord_device;
- char *display_name;
- int max_speed_write;
- int max_speed_read;
+ int type;
+ char *device;
++ char *cdrecord_device;
+ char *display_name;
+ int max_speed_write;
+ int max_speed_read;
--- sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/nautilus-burn-drive-selection.c.orig Sun Nov 19 13:39:17 2006
-+++ src/nautilus-burn-drive-selection.c Sun Nov 19 13:39:30 2006
-@@ -151,7 +151,7 @@ nautilus_burn_drive_selection_set_drive_
- 0, drive);
- g_signal_emit (G_OBJECT (selection),
- nautilus_burn_drive_selection_table_signals [DEVICE_CHANGED],
-- 0, nautilus_burn_drive_get_device (drive));
-+ 0, nautilus_burn_drive_get_cdrecord_device (drive));
-
- g_object_notify (G_OBJECT (selection), "device");
- g_object_notify (G_OBJECT (selection), "drive");
-@@ -584,7 +584,7 @@ nautilus_burn_drive_selection_get_defaul
- if (drives == NULL) {
- device = "/dev/cdrom";
- } else {
-- device = nautilus_burn_drive_get_device (drives->data);
-+ device = nautilus_burn_drive_get_cdrecord_device (drives->data);
- g_list_foreach (drives, (GFunc)nautilus_burn_drive_unref, NULL);
- g_list_free (drives);
- }
-@@ -633,7 +633,7 @@ nautilus_burn_drive_selection_get_device
- g_return_val_if_fail (selection != NULL, NULL);
- g_return_val_if_fail (NAUTILUS_BURN_IS_DRIVE_SELECTION (selection), NULL);
-
-- return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_device (selection->priv->selected_drive) : NULL;
-+ return selection->priv->selected_drive != NULL ? nautilus_burn_drive_get_cdrecord_device (selection->priv->selected_drive) : NULL;
- }
-
- /**
Index: patch-src_nautilus-cd-burner.c
===================================================================
RCS file: /home/cvs/mports/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c -L sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c -u -r1.1 -r1.2
--- sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
+++ sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
@@ -1,5 +1,5 @@
---- src/nautilus-cd-burner.c.orig Fri Jul 14 10:20:19 2006
-+++ src/nautilus-cd-burner.c Sun Nov 19 13:41:34 2006
+--- src/nautilus-cd-burner.c.orig 2008-01-21 11:16:24.000000000 -0500
++++ src/nautilus-cd-burner.c 2008-04-02 16:48:23.000000000 -0400
@@ -27,6 +27,8 @@
#include "config.h"
@@ -9,12 +9,3 @@
#include <time.h>
#include <stdio.h>
#include <stdlib.h>
-@@ -246,7 +248,7 @@ selection_dialog_response (GtkWidget *di
- /* save selections */
- gconf_client = gconf_client_get_default ();
- gconf_client_set_int (gconf_client, "/apps/nautilus-cd-burner/default_speed", speed, NULL);
-- gconf_save_device (gconf_client, nautilus_burn_drive_get_device (drive));
-+ gconf_save_device (gconf_client, nautilus_burn_drive_get_cdrecord_device (drive));
- g_object_unref (gconf_client);
-
- operation = ncb_operation_new ();
Index: patch-src_list_cddrives.c
===================================================================
RCS file: /home/cvs/mports/sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c -L sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c -u -r1.1 -r1.2
--- sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c
+++ sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c
@@ -1,10 +1,10 @@
---- src/list_cddrives.c.orig Sun Nov 19 13:36:40 2006
-+++ src/list_cddrives.c Sun Nov 19 13:37:08 2006
+--- src/list_cddrives.c.orig 2008-01-21 11:14:45.000000000 -0500
++++ src/list_cddrives.c 2008-01-21 19:48:49.000000000 -0500
@@ -49,6 +49,7 @@ list_drive_info (NautilusBurnDrive *driv
- g_print ("Drive:\n");
- g_print (" name:\t\t\t%s\n", display_name);
- g_print (" device:\t\t%s\n", nautilus_burn_drive_get_device (drive));
-+ g_print (" cdrecord device:\t%s\n", nautilus_burn_drive_get_cdrecord_device (drive));
- g_print (" door:\t\t\t%s\n", door_is_open ? "open" : "closed");
- g_print (" type:\t\t\t%s\n", type_str);
- g_print (" is mounted:\t\t%s\n", is_mounted ? "TRUE" : "FALSE");
+ g_print ("Drive:\n");
+ g_print (" name:\t\t\t%s\n", display_name);
+ g_print (" device:\t\t%s\n", nautilus_burn_drive_get_device (drive));
++ g_print (" cdrecord device:\t%s\n", nautilus_burn_drive_get_cdrecord_device (drive));
+ g_print (" door:\t\t\t%s\n", door_is_open ? "open" : "closed");
+ g_print (" type:\t\t\t%s\n", type_str);
+ g_print (" is mounted:\t\t%s\n", is_mounted ? "TRUE" : "FALSE");
Index: patch-src_nautilus-burn-recorder.c
===================================================================
RCS file: /home/cvs/mports/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c -L sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c -u -r1.1 -r1.2
--- sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c
+++ sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c
@@ -1,29 +1,29 @@
---- 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
+--- 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");
- g_ptr_array_add (argv, "--device");
-- 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));
- g_ptr_array_add (argv, "--speed");
- speed_str = g_strdup_printf ("%d", speed);
- g_ptr_array_add (argv, speed_str);
+ g_ptr_array_add (argv, "cdrdao");
+ g_ptr_array_add (argv, "write");
+ g_ptr_array_add (argv, "--device");
+- 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));
+ g_ptr_array_add (argv, "--speed");
+ speed_str = g_strdup_printf ("%d", speed);
+ g_ptr_array_add (argv, speed_str);
@@ -1375,7 +1375,7 @@ nautilus_burn_recorder_write_cdrecord (N
- if (speed != 0) {
- g_ptr_array_add (argv, speed_str);
- }
-- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
-+ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
- g_ptr_array_add (argv, dev_str);
- if (flags & NAUTILUS_BURN_RECORDER_WRITE_DUMMY_WRITE) {
- g_ptr_array_add (argv, "-dummy");
+ if (speed != 0) {
+ g_ptr_array_add (argv, speed_str);
+ }
+- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
++ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
+ g_ptr_array_add (argv, dev_str);
+ if (flags & NAUTILUS_BURN_RECORDER_WRITE_DUMMY_WRITE) {
+ g_ptr_array_add (argv, "-dummy");
@@ -1486,7 +1486,7 @@ nautilus_burn_recorder_blank_disc_cdreco
- argv = g_ptr_array_new ();
- g_ptr_array_add (argv, "cdrecord");
+ argv = g_ptr_array_new ();
+ g_ptr_array_add (argv, "cdrecord");
-- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
-+ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
- g_ptr_array_add (argv, dev_str);
- g_ptr_array_add (argv, "-v");
+- dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_device (drive));
++ dev_str = g_strdup_printf ("dev=%s", nautilus_burn_drive_get_cdrecord_device (drive));
+ g_ptr_array_add (argv, dev_str);
+ g_ptr_array_add (argv, "-v");
More information about the Midnightbsd-cvs
mailing list