diff options
| author | mezz <mezz@FreeBSD.org> | 2006-07-14 11:52:35 +0800 |
|---|---|---|
| committer | mezz <mezz@FreeBSD.org> | 2006-07-14 11:52:35 +0800 |
| commit | 2f4dba344ae9e644400cf9b1a6c8ffb2938f05e1 (patch) | |
| tree | 9434e92ff7eac929b4c86d1003cd9f960d31cc53 /sysutils | |
| parent | a559e7defbb64ac306829faf54b7e5bd7c5afe93 (diff) | |
| download | freebsd-ports-gnome-2f4dba344ae9e644400cf9b1a6c8ffb2938f05e1.tar.gz freebsd-ports-gnome-2f4dba344ae9e644400cf9b1a6c8ffb2938f05e1.tar.zst freebsd-ports-gnome-2f4dba344ae9e644400cf9b1a6c8ffb2938f05e1.zip | |
Sync w/ MC port:
marcus 2006-07-14 02:52:17 UTC
MarcusCom CVS repository
[...]
Log:
Try and make the Eject button work even if gnome-mount is not installed.
Reported by: mezz
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/nautilus-cd-burner/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c | 22 |
2 files changed, 18 insertions, 5 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 5795de75c611..ec524a14a3f5 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -8,6 +8,7 @@ PORTNAME= nautilus-cd-burner PORTVERSION= 2.14.2 +PORTREVISION= 1 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-nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c index e836eb9823f8..3a68ad074232 100644 --- a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c +++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c @@ -1,6 +1,6 @@ ---- nautilus-burn-drive.c.orig Tue Aug 23 11:55:56 2005 -+++ nautilus-burn-drive.c Sat Sep 10 20:32:26 2005 -@@ -471,7 +471,6 @@ get_disc_type (const char *dev_path) +--- nautilus-burn-drive.c.orig Wed Mar 22 11:08:38 2006 ++++ nautilus-burn-drive.c Thu Jul 13 22:15:30 2006 +@@ -687,7 +687,6 @@ struct cd_toc_entry entry; int i; #endif @@ -8,7 +8,7 @@ #ifndef CDROM_DATA_TRACK #define CDROM_DATA_TRACK 4 #endif -@@ -483,6 +482,10 @@ get_disc_type (const char *dev_path) +@@ -699,6 +698,10 @@ if (ioctl (fd, CDIOREADTOCHEADER, &header) < 0) { close (fd); @@ -19,7 +19,7 @@ return -1; } -@@ -649,7 +652,7 @@ nautilus_burn_drive_get_media_type_from_ +@@ -862,7 +865,7 @@ *is_blank = mmc_profile & 0x10000; disc_type = get_disc_type (device); @@ -28,3 +28,15 @@ switch (mmc_profile & 0xFFFF) { case -1: +@@ -1767,7 +1770,11 @@ + #ifdef USE_GNOME_MOUNT + cmd = g_strdup_printf ("gnome-mount --eject --no-ui --device=%s", drive->device); + #else ++#ifdef __FreeBSD__ ++ cmd = g_strdup_printf ("cdcontrol -f %s eject", drive->device); ++#else + cmd = g_strdup_printf ("eject %s", drive->device); ++#endif + #endif + + res = g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL); |