From d14c4d615e07bd0e1a45480852845cdfd29f040a Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 16 May 2006 01:19:16 +0000 Subject: Update to 2.15.2. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6270 df743ca5-7f9a-e211-a948-0013205c9059 --- sysutils/nautilus-cd-burner/Makefile | 6 ++-- sysutils/nautilus-cd-burner/distinfo | 6 ++-- .../files/patch-mapping-protocol.c | 11 -------- .../files/patch-nautilus-burn-drive.c | 30 -------------------- .../files/patch-nautilus-cd-burner.c | 33 ---------------------- .../files/patch-src_mapping-protocol.c | 11 ++++++++ .../files/patch-src_nautilus-burn-drive.c | 30 ++++++++++++++++++++ .../files/patch-src_nautilus-cd-burner.c | 11 ++++++++ sysutils/nautilus-cd-burner/pkg-plist | 5 +++- 9 files changed, 62 insertions(+), 81 deletions(-) delete mode 100644 sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c delete mode 100644 sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c delete mode 100644 sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c create mode 100644 sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c create mode 100644 sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c create mode 100644 sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c (limited to 'sysutils') diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 8590e7536..e331005e3 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.96 2006/04/13 07:52:38 bland Exp $ +# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.98 2006/04/30 06:13:43 ahze Exp $ # PORTNAME= nautilus-cd-burner -PORTVERSION= 2.15.1 +PORTVERSION= 2.15.2 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --disable-hal CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -GCONF_SCHEMAS= ncb.schemas +GCONF_SCHEMAS= nautilus-cd-burner.schemas OPTIONS= DVD "Enable DVD support" on \ CJK "Use cdrtools-cjk instead of cdrtools" off diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo index 42df58e72..daad91704 100644 --- a/sysutils/nautilus-cd-burner/distinfo +++ b/sysutils/nautilus-cd-burner/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/nautilus-cd-burner-2.15.1.tar.bz2) = 8b8dfcee82c5510b9510f535d6dba78b -SHA256 (gnome2/nautilus-cd-burner-2.15.1.tar.bz2) = 91f15fbad0a84dce8502b4b3ace06614a414e1bfe94c9444b47234532488af8f -SIZE (gnome2/nautilus-cd-burner-2.15.1.tar.bz2) = 679425 +MD5 (gnome2/nautilus-cd-burner-2.15.2.tar.bz2) = d7138dd1668b3d3a6fcbd2fc7ce9b4c7 +SHA256 (gnome2/nautilus-cd-burner-2.15.2.tar.bz2) = 5d38702a1256b5215ade6cf9a38ed645d53e9b65279ab396a16905981e0b3553 +SIZE (gnome2/nautilus-cd-burner-2.15.2.tar.bz2) = 666667 diff --git a/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c b/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c deleted file mode 100644 index aab64aa8a..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c +++ /dev/null @@ -1,11 +0,0 @@ ---- mapping-protocol.c.orig Tue May 17 17:14:35 2005 -+++ mapping-protocol.c Tue May 17 17:15:24 2005 -@@ -24,6 +24,8 @@ - * William Jon McCann - */ - -+#include -+#include - #include - #include - #include diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c deleted file mode 100644 index e836eb982..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c +++ /dev/null @@ -1,30 +0,0 @@ ---- 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) - struct cd_toc_entry entry; - int i; - #endif -- int type; - #ifndef CDROM_DATA_TRACK - #define CDROM_DATA_TRACK 4 - #endif -@@ -483,6 +482,10 @@ get_disc_type (const char *dev_path) - - if (ioctl (fd, CDIOREADTOCHEADER, &header) < 0) { - close (fd); -+ if (errno == EINVAL) -+ /* If you try to read the TOC header of a blank disc -+ * on FreeBSD, you get EINVAL. */ -+ return CDS_NO_INFO; - return -1; - } - -@@ -649,7 +652,7 @@ nautilus_burn_drive_get_media_type_from_ - *is_blank = mmc_profile & 0x10000; - - disc_type = get_disc_type (device); -- disc_type_get_info (disc_type, is_blank, has_data, has_audio); -+ disc_type_get_info (disc_type, NULL, has_data, has_audio); - - switch (mmc_profile & 0xFFFF) { - case -1: diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c deleted file mode 100644 index 9d286fda0..000000000 --- a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c +++ /dev/null @@ -1,33 +0,0 @@ ---- nautilus-cd-burner.c.orig Wed May 11 18:56:59 2005 -+++ nautilus-cd-burner.c Tue May 17 17:11:49 2005 -@@ -25,6 +25,8 @@ - * William Jon McCann - */ - -+#include -+#include - #include - #include - #include -@@ -1103,10 +1105,20 @@ burn_cd (const NautilusBurnDrive *drive, - } - - if (res == NAUTILUS_BURN_RECORDER_RESULT_RETRY) { -+ gchar *path1; -+ -+ path1 = g_strdup_printf ("%s/.ncb", g_get_home_dir()); -+ -+ if (!g_file_test (path1, G_FILE_TEST_EXISTS)) { -+ mkdir (path1, 0700); -+ } -+ - g_free (toc_filename); - g_free (filename); - -- filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL); -+ filename = g_build_filename (path1, "image.iso.XXXXXX", NULL); -+ g_free (path1); -+ - fd = g_mkstemp (filename); - close (fd); - diff --git a/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c b/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c new file mode 100644 index 000000000..508772987 --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c @@ -0,0 +1,11 @@ +--- src/mapping-protocol.c.orig Tue May 17 17:14:35 2005 ++++ src/mapping-protocol.c Tue May 17 17:15:24 2005 +@@ -24,6 +24,8 @@ + * William Jon McCann + */ + ++#include ++#include + #include + #include + #include diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c new file mode 100644 index 000000000..a2241b21a --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c @@ -0,0 +1,30 @@ +--- src/nautilus-burn-drive.c.orig Tue Aug 23 11:55:56 2005 ++++ src/nautilus-burn-drive.c Sat Sep 10 20:32:26 2005 +@@ -471,7 +471,6 @@ get_disc_type (const char *dev_path) + struct cd_toc_entry entry; + int i; + #endif +- int type; + #ifndef CDROM_DATA_TRACK + #define CDROM_DATA_TRACK 4 + #endif +@@ -483,6 +482,10 @@ get_disc_type (const char *dev_path) + + if (ioctl (fd, CDIOREADTOCHEADER, &header) < 0) { + close (fd); ++ if (errno == EINVAL) ++ /* If you try to read the TOC header of a blank disc ++ * on FreeBSD, you get EINVAL. */ ++ return CDS_NO_INFO; + return -1; + } + +@@ -649,7 +652,7 @@ nautilus_burn_drive_get_media_type_from_ + *is_blank = mmc_profile & 0x10000; + + disc_type = get_disc_type (device); +- disc_type_get_info (disc_type, is_blank, has_data, has_audio); ++ disc_type_get_info (disc_type, NULL, has_data, has_audio); + + switch (mmc_profile & 0xFFFF) { + case -1: diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c new file mode 100644 index 000000000..3d5585ee2 --- /dev/null +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c @@ -0,0 +1,11 @@ +--- src/nautilus-cd-burner.c.orig Tue May 9 13:31:13 2006 ++++ src/nautilus-cd-burner.c Mon May 15 21:11:00 2006 +@@ -27,6 +27,8 @@ + + #include "config.h" + ++#include ++#include + #include + #include + #include diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist index af6504338..13cd7b4f6 100644 --- a/sysutils/nautilus-cd-burner/pkg-plist +++ b/sysutils/nautilus-cd-burner/pkg-plist @@ -14,7 +14,6 @@ lib/nautilus/extensions-1.0/libnautilus-burn-extension.so libdata/pkgconfig/libnautilus-burn.pc libexec/mapping-daemon share/gnome/applications/nautilus-cd-burner.desktop -share/gnome/nautilus-cd-burner/cdburn.glade share/gnome/nautilus-cd-burner/cdspin1.png share/gnome/nautilus-cd-burner/cdspin2.png share/gnome/nautilus-cd-burner/cdspin3.png @@ -23,6 +22,7 @@ share/gnome/nautilus-cd-burner/cdspin5.png share/gnome/nautilus-cd-burner/cdspin6.png share/gnome/nautilus-cd-burner/cdspin7.png share/gnome/nautilus-cd-burner/cdspin8.png +share/gnome/nautilus-cd-burner/nautilus-cd-burner.glade share/locale/am/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ar/LC_MESSAGES/nautilus-cd-burner.mo share/locale/az/LC_MESSAGES/nautilus-cd-burner.mo @@ -59,6 +59,7 @@ share/locale/ka/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/mg/LC_MESSAGES/nautilus-cd-burner.mo share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo @@ -97,5 +98,7 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo @dirrmtry share/locale/ug @dirrmtry share/locale/te/LC_MESSAGES @dirrmtry share/locale/te +@dirrmtry share/locale/mg/LC_MESSAGES +@dirrmtry share/locale/mg @dirrm share/gnome/nautilus-cd-burner @dirrm include/libnautilus-burn -- cgit v1.2.3