diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-02-11 06:11:45 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-02-11 06:11:45 +0800 |
| commit | d79ffc6151d67ae9bda4e068a45187e09038c6e8 (patch) | |
| tree | 41e90e1d47a7b162ab21f7e2ea44fc40b14f923a | |
| parent | 9562d549a716b7b89bec752bb956e61358e92a2f (diff) | |
| download | marcuscom-ports-d79ffc6151d67ae9bda4e068a45187e09038c6e8.tar marcuscom-ports-d79ffc6151d67ae9bda4e068a45187e09038c6e8.tar.gz marcuscom-ports-d79ffc6151d67ae9bda4e068a45187e09038c6e8.tar.bz2 marcuscom-ports-d79ffc6151d67ae9bda4e068a45187e09038c6e8.tar.lz marcuscom-ports-d79ffc6151d67ae9bda4e068a45187e09038c6e8.tar.xz marcuscom-ports-d79ffc6151d67ae9bda4e068a45187e09038c6e8.tar.zst marcuscom-ports-d79ffc6151d67ae9bda4e068a45187e09038c6e8.zip | |
Update to 2.9.6.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3623 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | sysutils/nautilus-cd-burner/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/nautilus-cd-burner/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c | 28 |
3 files changed, 19 insertions, 15 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index bec3d4464..e67d31db2 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nautilus-cd-burner -PORTVERSION= 2.9.5 +PORTVERSION= 2.9.6 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.9 diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo index 4f95d226c..eacb3888a 100644 --- a/sysutils/nautilus-cd-burner/distinfo +++ b/sysutils/nautilus-cd-burner/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-cd-burner-2.9.5.tar.bz2) = 9693d58b735232c4a493965eefc7c4f4 -SIZE (gnome2/nautilus-cd-burner-2.9.5.tar.bz2) = 574363 +MD5 (gnome2/nautilus-cd-burner-2.9.6.tar.bz2) = 1e593b58cc37bd9ba7ed9f98919bfff6 +SIZE (gnome2/nautilus-cd-burner-2.9.6.tar.bz2) = 592340 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 35445a042..c7b5a2651 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 Sat Jan 8 16:59:57 2005 -+++ nautilus-burn-drive.c Wed Jan 12 03:25:59 2005 -@@ -61,6 +61,13 @@ +--- nautilus-burn-drive.c.orig Wed Jan 26 17:42:58 2005 ++++ nautilus-burn-drive.c Thu Feb 10 16:59:01 2005 +@@ -62,6 +62,13 @@ #define CD_ROM_SPEED 176 @@ -14,7 +14,7 @@ static struct { const char *name; gboolean can_write_cdr; -@@ -148,7 +155,7 @@ +@@ -149,7 +156,7 @@ int *max_wr_speed, NautilusBurnDriveType *type) { @@ -23,7 +23,7 @@ *max_rd_speed = -1; *max_wr_speed = -1; -@@ -274,9 +281,21 @@ +@@ -278,6 +285,9 @@ { int fd; int mmc_profile; @@ -33,6 +33,10 @@ g_return_val_if_fail (device != NULL, NAUTILUS_BURN_MEDIA_TYPE_ERROR); +@@ -286,6 +296,15 @@ + if (has_data) *has_data = FALSE; + if (has_audio) *has_audio = FALSE; + +#ifdef __FreeBSD__ + cam = cam_open_device (device, O_RDWR); + if (cam == NULL) { @@ -45,7 +49,7 @@ fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); if (fd < 0) { if (errno == EBUSY) { -@@ -284,6 +303,7 @@ +@@ -293,6 +312,7 @@ } return NAUTILUS_BURN_MEDIA_TYPE_ERROR; } @@ -53,7 +57,7 @@ mmc_profile = get_mmc_profile (fd); -@@ -311,7 +331,11 @@ +@@ -333,7 +353,11 @@ } } @@ -65,7 +69,7 @@ switch (mmc_profile) { case -1: -@@ -481,10 +505,21 @@ +@@ -563,10 +587,21 @@ int secs; int mmc_profile; gint64 size; @@ -87,7 +91,7 @@ fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); if (fd < 0) { -@@ -493,6 +528,7 @@ +@@ -575,6 +610,7 @@ } return NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN; } @@ -95,7 +99,7 @@ mmc_profile = get_mmc_profile (fd); -@@ -515,7 +551,11 @@ +@@ -597,7 +633,11 @@ size = NAUTILUS_BURN_MEDIA_SIZE_NA; } @@ -107,7 +111,7 @@ return size; } -@@ -639,9 +679,81 @@ +@@ -890,9 +930,81 @@ #endif /* USE_HAL */ #if defined(__linux__) || defined(__FreeBSD__) @@ -189,7 +193,7 @@ #endif /* __linux__ || __FreeBSD__ */ #if defined (__linux__) -@@ -853,49 +965,7 @@ +@@ -1104,49 +1216,7 @@ return NULL; } |