diff options
author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-03-01 17:33:34 +0800 |
---|---|---|
committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-03-01 17:33:34 +0800 |
commit | 19092fc1e011b1748080b1a9d4126b55d532ad7a (patch) | |
tree | f911d64ba33e4265f9c433b4bb1d8dfe2832ad91 /sysutils | |
parent | 0e0eda51cbc326139c73a8edcae9c92f5c51aa23 (diff) | |
download | marcuscom-ports-19092fc1e011b1748080b1a9d4126b55d532ad7a.tar marcuscom-ports-19092fc1e011b1748080b1a9d4126b55d532ad7a.tar.gz marcuscom-ports-19092fc1e011b1748080b1a9d4126b55d532ad7a.tar.bz2 marcuscom-ports-19092fc1e011b1748080b1a9d4126b55d532ad7a.tar.lz marcuscom-ports-19092fc1e011b1748080b1a9d4126b55d532ad7a.tar.xz marcuscom-ports-19092fc1e011b1748080b1a9d4126b55d532ad7a.tar.zst marcuscom-ports-19092fc1e011b1748080b1a9d4126b55d532ad7a.zip |
- Update to 2.9.8
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3760 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/nautilus-cd-burner/Makefile | 3 | ||||
-rw-r--r-- | sysutils/nautilus-cd-burner/distinfo | 4 | ||||
-rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-dvd_plus_rw_utils.cpp | 13 | ||||
-rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-make-iso.c | 42 |
4 files changed, 3 insertions, 59 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 2be106faa..787a076dd 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -6,8 +6,7 @@ # PORTNAME= nautilus-cd-burner -PORTVERSION= 2.9.7 -PORTREVISION= 1 +PORTVERSION= 2.9.8 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 48b067dea..eff7265e8 100644 --- a/sysutils/nautilus-cd-burner/distinfo +++ b/sysutils/nautilus-cd-burner/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-cd-burner-2.9.7.tar.bz2) = 617f78f81fef04be868908bda1b29703 -SIZE (gnome2/nautilus-cd-burner-2.9.7.tar.bz2) = 607191 +MD5 (gnome2/nautilus-cd-burner-2.9.8.tar.bz2) = c4eb475944963358b7df282e279336f6 +SIZE (gnome2/nautilus-cd-burner-2.9.8.tar.bz2) = 607294 diff --git a/sysutils/nautilus-cd-burner/files/patch-dvd_plus_rw_utils.cpp b/sysutils/nautilus-cd-burner/files/patch-dvd_plus_rw_utils.cpp deleted file mode 100644 index dd202c6fc..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-dvd_plus_rw_utils.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- dvd_plus_rw_utils.cpp.orig Tue Mar 1 00:44:47 2005 -+++ dvd_plus_rw_utils.cpp Tue Mar 1 00:45:05 2005 -@@ -223,8 +223,8 @@ - wait_for_unit (cmd); - } while (once--); - -- if (profile==0 || (profile&0x30)==0) // no or non-DVD media... -- return profile; -+ //if (profile==0 || (profile&0x30)==0) // no or non-DVD media... -+ //return profile; - - cmd[0] = 0x51; // READ DISC INFORMATION - cmd[8] = sizeof(disc_info); diff --git a/sysutils/nautilus-cd-burner/files/patch-make-iso.c b/sysutils/nautilus-cd-burner/files/patch-make-iso.c deleted file mode 100644 index ea2dedd00..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-make-iso.c +++ /dev/null @@ -1,42 +0,0 @@ ---- make-iso.c.orig Wed Feb 16 19:34:31 2005 -+++ make-iso.c Tue Mar 1 00:41:35 2005 -@@ -501,6 +501,10 @@ - - if (status == G_IO_STATUS_NORMAL) { - g_free (line); -+ } else if (status == G_IO_STATUS_EOF) { -+ if (mkisofs_output->debug) -+ g_print ("make_iso stdout: EOF\n"); -+ return FALSE; - } - } else if (condition & G_IO_HUP) { - if (mkisofs_output->debug) -@@ -583,6 +587,12 @@ - } - - g_free (line); -+ } else if (status == G_IO_STATUS_EOF) { -+ if (mkisofs_output->debug) -+ g_print ("make_iso stderr: EOF\n"); -+ nautilus_burn_progress_set_fraction (1.0); -+ g_main_loop_quit (mkisofs_output->loop); -+ return FALSE; - } - } else if (condition & G_IO_HUP) { - /* only handle the HUP when we have read all available lines of output */ -@@ -719,6 +729,7 @@ - argv [i++] = "-r"; - if (use_joliet) { - argv [i++] = "-J"; -+ argv[i++] = "-joliet-long"; - } - if (has_utf8_support) { - argv [i++] = "-input-charset"; -@@ -806,6 +817,7 @@ - argv [i++] = "-r"; - if (use_joliet) { - argv [i++] = "-J"; -+ argv[i++] = "-joliet-long"; - } - if (has_utf8_support) { - argv [i++] = "-input-charset"; |