new release + patch

6 files changed, 79 insertions, 9 deletions

diff --git a/gnome-extra/nautilus-cd-burner/ChangeLog b/gnome-extra/nautilus-cd-burner/ChangeLog
index 080fc03f82d4..11e32372c3d3 100644
--- a/gnome-extra/nautilus-cd-burner/ChangeLog
+++ b/gnome-extra/nautilus-cd-burner/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/nautilus-cd-burner
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.42 2004/09/18 01:05:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.43 2004/09/21 12:28:06 foser Exp $
+
+*nautilus-cd-burner-2.8.2 (21 Sep 2004)
+
+  21 Sep 2004; foser <foser@gentoo.org> nautilus-cd-burner-2.8.2.ebuild ;
+  New release
+  Add patch to fix crash (http://bugzilla.gnome.org/show_bug.cgi?id=153268)
 
 *nautilus-cd-burner-2.8.1 (17 Sep 2004)
 
diff --git a/gnome-extra/nautilus-cd-burner/Manifest b/gnome-extra/nautilus-cd-burner/Manifest
index b0418535b353..99aac5caa5dd 100644
--- a/gnome-extra/nautilus-cd-burner/Manifest
+++ b/gnome-extra/nautilus-cd-burner/Manifest
@@ -1,13 +1,15 @@
-MD5 15dbb367ef8ba1c15f3a4309931955f3 ChangeLog 5479
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 f5b8645e42900225f9baffecd43fe19f nautilus-cd-burner-2.6.0.ebuild 908
+MD5 e85aa3675171eade487b40686a10dfce nautilus-cd-burner-2.8.1.ebuild 888
 MD5 b2bf4fdc6c7681ab2d1730306ab69891 nautilus-cd-burner-0.5.3.ebuild 722
 MD5 aefb66cc5ef7a93f3d18d9971bdf3843 nautilus-cd-burner-0.6.1.ebuild 1090
-MD5 f5b8645e42900225f9baffecd43fe19f nautilus-cd-burner-2.6.0.ebuild 908
 MD5 47a5f15e57a7c64aec483ac270ba88a5 nautilus-cd-burner-2.6.1.ebuild 909
-MD5 e85aa3675171eade487b40686a10dfce nautilus-cd-burner-2.8.1.ebuild 888
+MD5 e85aa3675171eade487b40686a10dfce nautilus-cd-burner-2.8.2.ebuild 888
+MD5 15dbb367ef8ba1c15f3a4309931955f3 ChangeLog 5479
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 60a07dd45831b81036471b5b20dcb4a8 files/digest-nautilus-cd-burner-0.5.3 77
 MD5 5c5b2951cc6f2fe0138c0f5ac4bc97d4 files/digest-nautilus-cd-burner-0.6.1 77
-MD5 0cc10acbcdaa96ade28aa3b589287e72 files/nautilus-cd-burner-0.6.1-gcc2_fix.patch 3099
 MD5 702d573787368750b57e5684afc42a5e files/digest-nautilus-cd-burner-2.6.0 77
 MD5 1fc86a0e02dd11f81a22586a0abccbb9 files/digest-nautilus-cd-burner-2.6.1 77
 MD5 06a85a530108e64e4435d15c7cd5890b files/digest-nautilus-cd-burner-2.8.1 77
+MD5 06ac71ea5d2c3f7bf0af8dec2c53fdc8 files/digest-nautilus-cd-burner-2.8.2 77
+MD5 0cc10acbcdaa96ade28aa3b589287e72 files/nautilus-cd-burner-0.6.1-gcc2_fix.patch 3099
diff --git a/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.8.1 b/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.8.1
deleted file mode 100644
index 7342bbc4dffc..000000000000
--- a/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3768dd01281343a9322ced3167102f05 nautilus-cd-burner-2.8.1.tar.bz2 520295
diff --git a/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.8.2 b/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.8.2
new file mode 100644
index 000000000000..c81fe37a9a43
--- /dev/null
+++ b/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.8.2
@@ -0,0 +1 @@
+MD5 341e51ab13447c87c61e807f3a47c12c nautilus-cd-burner-2.8.2.tar.bz2 522398
diff --git a/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-2.8.2-bacon_nodrive.patch b/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-2.8.2-bacon_nodrive.patch
new file mode 100644
index 000000000000..d42a3cb6d865
--- /dev/null
+++ b/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-2.8.2-bacon_nodrive.patch
@@ -0,0 +1,52 @@
+===================================================================
+RCS file: /cvs/gnome/nautilus-cd-burner/bacon-cd-selection.c,v
+retrieving revision 1.11
+retrieving revision 1.12
+diff -u -r1.11 -r1.12
+--- bacon-cd-selection.c	2004/09/16 21:43:48	1.11
++++ bacon-cd-selection.c	2004/09/21 12:00:22	1.12
+@@ -165,6 +165,13 @@
+ 	int i;
+ 
+ 	i = gtk_combo_box_get_active (combo);
++	/* No selection */
++	if (i < 0) {
++		g_signal_emit (G_OBJECT (bcs),
++				bcs_table_signals[DEVICE_CHANGED],
++				0, NULL);
++		return;
++	}
+ 	drive = get_drive (bcs, i);
+ 
+ 	g_signal_emit (G_OBJECT (bcs),
+@@ -255,11 +262,21 @@
+ 		cd_drive_free (cdrom);
+ 		bcs->priv->cdroms = g_list_delete_link
+ 			(bcs->priv->cdroms, item);
++		gtk_widget_set_sensitive (GTK_WIDGET (bcs), (bcs->priv->cdroms != NULL));
+ 	} else {
++		gboolean activate = FALSE;
++
+ 		cdrom = cd_drive_get_file_image ();
+ 		gtk_combo_box_append_text (GTK_COMBO_BOX (bcs),
+ 				cdrom->display_name);
++		if (bcs->priv->cdroms == NULL) {
++			activate = TRUE;
++		}
+ 		bcs->priv->cdroms = g_list_append (bcs->priv->cdroms, cdrom);
++		gtk_widget_set_sensitive (GTK_WIDGET (bcs), TRUE);
++		if (activate != FALSE) {
++			gtk_combo_box_set_active (GTK_COMBO_BOX (bcs), 0);
++		}
+ 	}
+ 
+ 	bcs->priv->have_file_image = have_file_image;
+@@ -319,6 +336,8 @@
+ 		GList *l;
+ 		int i = g_list_length (bcs->priv->cdroms);
+ 
++		gtk_widget_set_sensitive (GTK_WIDGET (bcs), (drives != NULL));
++
+ 		if (bcs->priv->have_file_image)
+ 			i--;
+ 
diff --git a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.1.ebuild b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.2.ebuild
index a3aa5eeacd95..774c3c7c986d 100644
--- a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.1.ebuild
+++ b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.1.ebuild,v 1.2 2004/09/18 01:05:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.2.ebuild,v 1.1 2004/09/21 12:28:06 foser Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="CD and DVD writer plugin for Nautilus"
 HOMEPAGE="http://www.gnome.org/"
@@ -29,3 +29,13 @@ DEPEND=">=dev-util/intltool-0.29
 
 G2CONF="${G2CONF} $(use_enable hal)"
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# fix crash when no cddrive is attached
+	epatch ${FILESDIR}/${P}-bacon_nodrive.patch
+
+}