[Midnightbsd-cvs] mports: mports/sysutils: add nautilus-cd-burner
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 27 12:41:31 EDT 2007
Log Message:
-----------
add nautilus-cd-burner
Modified Files:
--------------
mports/sysutils:
Makefile (r1.55 -> r1.56)
Added Files:
-----------
mports/sysutils/nautilus-cd-burner:
Makefile (r1.1)
distinfo (r1.1)
pkg-descr (r1.1)
pkg-message (r1.1)
pkg-plist (r1.1)
mports/sysutils/nautilus-cd-burner/files:
patch-configure (r1.1)
patch-src_list_cddrives.c (r1.1)
patch-src_make-iso.c (r1.1)
patch-src_nautilus-burn-drive-monitor.c (r1.1)
patch-src_nautilus-burn-drive-private.h (r1.1)
patch-src_nautilus-burn-drive-selection.c (r1.1)
patch-src_nautilus-burn-drive.c (r1.1)
patch-src_nautilus-burn-drive.h (r1.1)
patch-src_nautilus-burn-recorder.c (r1.1)
patch-src_nautilus-cd-burner.c (r1.1)
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/sysutils/Makefile,v
retrieving revision 1.55
retrieving revision 1.56
diff -Lsysutils/Makefile -Lsysutils/Makefile -u -r1.55 -r1.56
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -39,6 +39,7 @@
SUBDIR += memtest
SUBDIR += memtest86
SUBDIR += mixer
+ SUBDIR += nautilus-cd-burner
SUBDIR += nodebrain
SUBDIR += nvclock
SUBDIR += obliterate
--- /dev/null
+++ sysutils/nautilus-cd-burner/pkg-message
@@ -0,0 +1,19 @@
+In order to use nautilus-cd-burner, you must make sure your CD devices
+have the correct permissions. You must also make sure you have:
+
+device atapicam
+
+Configured in your kernel if you are using an ATAPI CD/DVD writer.
+To figure out which CD/DVD drive you will be using, run the following
+command as root:
+
+camcontrol devlist
+
+Your output will look similar to the following:
+
+<CREATIVE CD5233E-N 0.20> at scbus1 target 0 lun 0 (cd0,pass0)
+
+The devices in parenthesis at the end are important. You must make sure
+the /dev entries for those devices are writable by the users that will
+be using nautilus-cd-burner. In addition to those devices, /dev/xpt*
+must also be writable to your nautilus-cd-burner users.
--- /dev/null
+++ sysutils/nautilus-cd-burner/pkg-descr
@@ -0,0 +1,2 @@
+Nautilus-cd-burner allows CDs to be created and burned directly from
+within Nautilus (using the burn:/// URI).
--- /dev/null
+++ sysutils/nautilus-cd-burner/pkg-plist
@@ -0,0 +1,137 @@
+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
+include/libnautilus-burn/nautilus-burn-features.h
+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
+libdata/pkgconfig/libnautilus-burn.pc
+libexec/mapping-daemon
+share/gnome/applications/nautilus-cd-burner-open-iso.desktop
+share/gnome/applications/nautilus-cd-burner.desktop
+share/gnome/nautilus-cd-burner/cdspin1.png
+share/gnome/nautilus-cd-burner/cdspin2.png
+share/gnome/nautilus-cd-burner/cdspin3.png
+share/gnome/nautilus-cd-burner/cdspin4.png
+share/gnome/nautilus-cd-burner/cdspin5.png
+share/gnome/nautilus-cd-burner/cdspin6.png
+share/gnome/nautilus-cd-burner/cdspin7.png
+share/gnome/nautilus-cd-burner/cdspin8.png
+share/gnome/nautilus-cd-burner/nautilus-cd-burner.glade
+share/icons/hicolor/16x16/apps/nautilus-cd-burner.png
+share/icons/hicolor/22x22/apps/nautilus-cd-burner.png
+share/icons/hicolor/24x24/apps/nautilus-cd-burner.png
+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/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
+share/locale/bg/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/bn/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/bn_IN/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/bs/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ca/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/cs/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/cy/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/da/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/de/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/dz/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/el/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/en_CA/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/en_GB/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/es/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/et/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/eu/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/fa/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/fi/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/fr/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ga/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/gl/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/gu/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/he/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/hi/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/hr/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/hu/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/hy/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/id/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/is/LC_MESSAGES/nautilus-cd-burner.mo
+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/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
+share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/mg/LC_MESSAGES/nautilus-cd-burner.mo
+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/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
+share/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/nn/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/or/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/pl/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/pt/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/pt_BR/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ro/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ru/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/rw/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/sk/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/sl/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/sq/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/sr/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/sr at Latn/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/sv/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ta/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/te/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/th/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/tr/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ug/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/uk/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/xh/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/zh_HK/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
+ at dirrm share/gnome/nautilus-cd-burner
+ at dirrm include/libnautilus-burn
+ at exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+ at unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+ at dirrmtry share/locale/zh_HK/LC_MESSAGES
+ at dirrmtry share/locale/zh_HK
+ at dirrmtry share/locale/xh/LC_MESSAGES
+ at dirrmtry share/locale/xh
+ at dirrmtry share/locale/ug/LC_MESSAGES
+ at dirrmtry share/locale/ug
+ at dirrmtry share/locale/te/LC_MESSAGES
+ at dirrmtry share/locale/te
+ at dirrmtry share/locale/rw/LC_MESSAGES
+ at dirrmtry share/locale/rw
+ at dirrmtry share/locale/mg/LC_MESSAGES
+ at dirrmtry share/locale/mg
+ at dirrmtry share/locale/ku/LC_MESSAGES
+ at dirrmtry share/locale/ku
+ at dirrmtry share/locale/hy/LC_MESSAGES
+ at dirrmtry share/locale/hy
+ at dirrmtry share/locale/dz/LC_MESSAGES
+ at dirrmtry share/locale/dz
+ at dirrmtry share/locale/bn_IN/LC_MESSAGES
+ at dirrmtry share/locale/bn_IN
+ at dirrmtry share/locale/be at latin/LC_MESSAGES
+ at dirrmtry share/locale/be at latin
--- /dev/null
+++ sysutils/nautilus-cd-burner/Makefile
@@ -0,0 +1,62 @@
+# New ports collection makefile for: nautilus-cd-burner
+# Date created: 13 April 2003
+# Whom: Joe Marcus Clarke <marcus at FreeBSD.org>
+#
+# $MidnighhtSD$
+# $FreeBSD: ports/sysutils/nautilus-cd-burner/Makefile,v 1.42 2007/05/29 04:07:21 mezz Exp $
+#
+
+PORTNAME= nautilus-cd-burner
+PORTVERSION= 2.18.2
+CATEGORIES= sysutils gnome
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR= gnome2
+
+MAINTAINER= ports at MidnightBSD.org
+COMMENT= CD burner view for Nautilus
+
+RUN_DEPENDS= cdrdao:${PORTSDIR}/sysutils/cdrdao
+
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_XLIB= yes
+USE_GMAKE= yes
+GNOME_DESKTOP_VERSION=2
+USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack \
+ desktopfileutils
+USE_CDRTOOLS= yes
+INSTALLS_ICONS= yes
+USE_AUTOTOOLS= libtool:15
+USE_LDCONFIG= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+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
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_CJK)
+WITHOUT_DVD= yes
+.endif
+
+.if !defined(WITHOUT_DVD)
+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
+
+.include <bsd.port.post.mk>
--- /dev/null
+++ sysutils/nautilus-cd-burner/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/nautilus-cd-burner-2.18.2.tar.bz2) = fee9ec2f398a6b1eacfd59e239d06837
+SHA256 (gnome2/nautilus-cd-burner-2.18.2.tar.bz2) = 551924c49c883c52f1a3de639c068cf15a25b7922088d0b4427d2d64f4a1b1cb
+SIZE (gnome2/nautilus-cd-burner-2.18.2.tar.bz2) = 740992
--- /dev/null
+++ sysutils/nautilus-cd-burner/files/patch-src_make-iso.c
@@ -0,0 +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
+@@ -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));
+
+ 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);
+
+ } 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");
+@@ -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);
+@@ -1559,7 +1559,7 @@ nautilus_burn_iso_make_from_drive (Nauti
+
+ 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));
+
+ argv = g_ptr_array_new ();
+ g_ptr_array_add (argv, "readcd");
--- /dev/null
+++ sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
@@ -0,0 +1,57 @@
+--- 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
+ }
+
+ /**
++ * nautilus_burn_drive_get_cdrecord_device:
++ * @drive: #NautilusBurnDrive
++ *
++ * Get the name of the device associated with the drive suitable for
++ * user with cdrcord.
++ *
++ * Returns: device name. Must be not be freed.
++ *
++ * Since: 2.16
++ **/
++const char *
++nautilus_burn_drive_get_cdrecord_device (NautilusBurnDrive *drive)
++{
++ g_return_val_if_fail (drive != NULL, NULL);
++
++ 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);
+
+ 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;
+ }
+
+ /**
--- /dev/null
+++ sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.h
@@ -0,0 +1,10 @@
+--- 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);
+ const char * nautilus_burn_drive_get_device (NautilusBurnDrive *drive);
++const char * nautilus_burn_drive_get_cdrecord_device (NautilusBurnDrive *drive);
+
+ /* Capabilities */
+ gboolean nautilus_burn_drive_can_write (NautilusBurnDrive *drive);
--- /dev/null
+++ sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c
@@ -0,0 +1,38 @@
+--- src/nautilus-burn-drive-monitor.c.orig Fri Sep 29 14:18:23 2006
++++ src/nautilus-burn-drive-monitor.c Sun Nov 19 13:28:16 2006
+@@ -683,6 +683,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;
+
+ LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE);
+
+@@ -711,6 +713,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_INT ("storage.cdrom.read_speed", drive->priv->max_speed_read);
+@@ -734,6 +738,17 @@ hal_drive_from_udi (LibHalContext *ctx,
+ if (raw_device != NULL) {
+ g_free (drive->priv->device);
+ drive->priv->device = raw_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);
+ }
+
+ drive->priv->drive_udi = g_strdup (udi);
--- /dev/null
+++ sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-private.h
@@ -0,0 +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
+@@ -34,6 +34,7 @@ struct NautilusBurnDrivePrivate {
+
+ int type;
+ char *device;
++ char *cdrecord_device;
+ char *display_name;
+ int max_speed_write;
+ int max_speed_read;
--- /dev/null
+++ sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-selection.c
@@ -0,0 +1,29 @@
+--- 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;
+ }
+
+ /**
--- /dev/null
+++ sysutils/nautilus-cd-burner/files/patch-configure
@@ -0,0 +1,27 @@
+--- configure.orig Thu Jul 22 10:27:35 2004
++++ configure Thu Jul 22 10:29:32 2004
+@@ -21015,6 +21015,8 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++ ac_check_lib_save_LIBS=$LIBS
++ LIBS="-lintl $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -21097,6 +21099,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
++ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+@@ -21104,6 +21107,7 @@
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++LIBS="-lintl $LIBS"
+
+ fi
+ done
--- /dev/null
+++ sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
@@ -0,0 +1,20 @@
+--- 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
+@@ -27,6 +27,8 @@
+
+ #include "config.h"
+
++#include <sys/types.h>
++#include <sys/stat.h>
+ #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 ();
--- /dev/null
+++ sysutils/nautilus-cd-burner/files/patch-src_list_cddrives.c
@@ -0,0 +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
+@@ -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");
--- /dev/null
+++ sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-recorder.c
@@ -0,0 +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
+@@ -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);
+@@ -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");
+@@ -1486,7 +1486,7 @@ nautilus_burn_recorder_blank_disc_cdreco
+ 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");
+
More information about the Midnightbsd-cvs
mailing list