diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-11-02 22:57:38 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-11-02 22:57:38 +0000 |
| commit | 35387aa87d3b7fd32fbc8492ed5231006e16d982 (patch) | |
| tree | 7aa866a939eb0922ed359a0f58f82e500f3c8fe0 /sysutils/nautilus-cd-burner | |
| parent | a327210be0b2c5d5772a6eea2a4f1cea2a4b4514 (diff) | |
| download | freebsd-ports-35387aa87d3b7fd32fbc8492ed5231006e16d982.zip | |
Add the small bit of code needed to make n-c-b work with HAL on FreeBSD.
Diffstat (limited to 'sysutils/nautilus-cd-burner')
| -rw-r--r-- | sysutils/nautilus-cd-burner/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive-monitor.c | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 13d3a8f6f993..fa040f0c453a 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -8,6 +8,7 @@ PORTNAME= nautilus-cd-burner PORTVERSION= 2.16.1 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -25,7 +26,6 @@ USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack INSTALLS_ICONS= yes USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-hal CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" 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 000000000000..9ae3889d67ca --- /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); |