diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-11-04 04:20:09 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-11-04 04:20:09 +0800 |
| commit | 332d04d5a03bf29c5c16f92e1f80e212d319965a (patch) | |
| tree | 23c05580c0a66da2d339beea0657ce1a88e2d831 | |
| parent | aa3797c36554bf0b36398a7c95fa43b650453cba (diff) | |
| download | marcuscom-ports-332d04d5a03bf29c5c16f92e1f80e212d319965a.tar marcuscom-ports-332d04d5a03bf29c5c16f92e1f80e212d319965a.tar.gz marcuscom-ports-332d04d5a03bf29c5c16f92e1f80e212d319965a.tar.bz2 marcuscom-ports-332d04d5a03bf29c5c16f92e1f80e212d319965a.tar.lz marcuscom-ports-332d04d5a03bf29c5c16f92e1f80e212d319965a.tar.xz marcuscom-ports-332d04d5a03bf29c5c16f92e1f80e212d319965a.tar.zst marcuscom-ports-332d04d5a03bf29c5c16f92e1f80e212d319965a.zip | |
Fix n-c-b with HAL on FreeBSD.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7853 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | sysutils/nautilus-cd-burner/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c | 30 |
2 files changed, 32 insertions, 1 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 0c99079cb..c5981d73c 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.114 2006/10/03 13:26:18 ahze Exp $ +# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.116 2006/10/19 01:09:41 marcus Exp $ # PORTNAME= nautilus-cd-burner PORTVERSION= 2.17.1 +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-src_nautilus-burn-drive-monitor.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c new file mode 100644 index 000000000..9ae3889d6 --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c @@ -0,0 +1,30 @@ +--- src/nautilus-burn-drive-monitor.c.orig Thu Nov 2 12:56:50 2006 ++++ src/nautilus-burn-drive-monitor.c Thu Nov 2 12:56:21 2006 +@@ -683,6 +683,7 @@ hal_drive_from_udi (LibHalContext *ctx, + NautilusBurnDrive *drive; + char **write_speeds = NULL; + char *raw_device = NULL; ++ char *cam_path = NULL; + + LIBHAL_CHECK_LIBHALCONTEXT (ctx, FALSE); + +@@ -711,6 +712,7 @@ 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.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 +736,11 @@ hal_drive_from_udi (LibHalContext *ctx, + if (raw_device != NULL) { + g_free (drive->priv->device); + drive->priv->device = raw_device; ++ } ++ ++ if (cam_path != NULL) { ++ g_free (drive->priv->device); ++ drive->priv->device = cam_path; + } + + drive->priv->drive_udi = g_strdup (udi); |