Version bump with most of fixes already included in 2.28.4-r1 and updated translations. This also fixes important segfaults suffered by me with gnome-bluetooth and empathy plugins (upstream bug #626362).

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 204 insertions, 2 deletions

diff --git a/gnome-extra/nautilus-sendto/ChangeLog b/gnome-extra/nautilus-sendto/ChangeLog
index d33bb4ec2cce..e0277399af1c 100644
--- a/gnome-extra/nautilus-sendto/ChangeLog
+++ b/gnome-extra/nautilus-sendto/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/nautilus-sendto
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.40 2010/08/07 17:30:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.41 2010/09/01 15:43:28 pacho Exp $
+
+*nautilus-sendto-2.28.5 (01 Sep 2010)
+
+  01 Sep 2010; Pacho Ramos <pacho@gentoo.org>
+  +nautilus-sendto-2.28.5.ebuild,
+  +files/nautilus-sendto-2.28.5-commandline-help.patch,
+  +files/nautilus-sendto-2.28.5-fix-memleaks.patch:
+  Version bump with most of fixes already included in 2.28.4-r1 and updated
+  translations. This also fixes important segfaults suffered by me with
+  gnome-bluetooth and empathy plugins (upstream bug #626362).
 
   07 Aug 2010; Raúl Porcel <armin76@gentoo.org>
   nautilus-sendto-2.28.4-r1.ebuild:
diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest
index 6a8a9a5064a9..ade676c8d40f 100644
--- a/gnome-extra/nautilus-sendto/Manifest
+++ b/gnome-extra/nautilus-sendto/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nautilus-sendto-2.28.4-gseal-enable.patch 1345 RMD160 04f7a02c986e381e3a4e9a34115826d9af24446d SHA1 bb675b34587fd00971f60f09317418a539786e94 SHA256 2e42e5ecf35cfdf348dfa2d77b94400e92dc8c0eb8150788c657f1fc1dc68126
 AUX nautilus-sendto-2.28.4-item-focus.patch 1009 RMD160 b8a159a58354fc5aea6257e05b4a171f5dabd1a3 SHA1 5fcf60028f772ad5c5c451266c92a3218c86f4b4 SHA256 e145e6a2992090ee1cbedd850121b7a921c8025eadca697a80db0504831adb18
 AUX nautilus-sendto-2.28.4-remove-empathy.patch 10102 RMD160 733e37b99248884b1968fa3935526a11b4371b0b SHA1 e41a087e0fc2a079e5a1a67f82e7e168172446ea SHA256 74b3680e93bea6a2f5bdd1acc3ee625f88b15efcd00b9c8f3464f005c90a999d
@@ -7,7 +10,18 @@ AUX nautilus-sendto-2.28.4-thunderbird-command.patch 1329 RMD160 66184d87d33d66e
 AUX nautilus-sendto-2.28.4-unload-dbus.patch 669 RMD160 e67139e6a125fa3fab5e953b289f6b1449f2bf7d SHA1 44e918776d20ee355a40247d741719dce2155408 SHA256 1ec5d84b3b2659dae4c7b118b0f059b69bbf27d3e58abcab7893e59bdc912c14
 AUX nautilus-sendto-2.28.4-unload-init.patch 753 RMD160 20e9d6451a869810451f589603285ca6c9215589 SHA1 baf2d47c09324eff1095afd0e392a1562f4f20e2 SHA256 bac15fa5ff7838a2b679525f5d1da502d4b22081c7737f1f9e558e0d89f9a35c
 AUX nautilus-sendto-2.28.4-unload.patch 4212 RMD160 46b2c14e176d0f5bf5327f499dd73caae2e942df SHA1 58e485985b0913c9e55aded3aa0bb46fce96ef9e SHA256 630944971f0f2fb3680eb3e336b1639b4e1f767a0ef38d90138dda6b582254d2
+AUX nautilus-sendto-2.28.5-commandline-help.patch 1123 RMD160 618ae37faf19b5ad5bfae0f28b21462d76969fe5 SHA1 1d3ec1fc8a4d545d47cc0030ae2b2e2ac1fc38fd SHA256 f5a928cf771d55f5514b73ff5aa509df73ed1dae4d14b418ddebb256c4940e8d
+AUX nautilus-sendto-2.28.5-fix-memleaks.patch 1596 RMD160 f3b335465c7cde3ec177d121a5631acf020c4891 SHA1 6f3439c22aade6dcb88efb7521fecf85e5d9c9a4 SHA256 dd78e9382bd5e55f262c8609a50b9daf5bfb4c45c8d9d27e732ca74b8a338388
 DIST nautilus-sendto-2.28.4.tar.bz2 436967 RMD160 af316da07d133cc6c7b9e41a225ee68a13d4ac15 SHA1 da97f886a1e400c9e55ac57d01bddfae0362cb4f SHA256 ff6b1a73f7e662fb49c3a1aee59a5c17fc96c23fcf63c3b10b6142eaef344f06
+DIST nautilus-sendto-2.28.5.tar.bz2 445612 RMD160 09447497b4292e1d11719ac4a37fd7b4d85d057a SHA1 16f6e42e7b322332cfce91ef700d2b4afc3a5c8f SHA256 9265b89ecf8cb4e7ff7fd4ae140661b24b800c4b14fccda367a6a3f7151e3455
 EBUILD nautilus-sendto-2.28.4-r1.ebuild 2807 RMD160 838452975d0018b8eb04cda46ccbd2a45ee335f0 SHA1 f6071d567dea5d4938e02d8c969ec4ab54258d7a SHA256 0dcfacc96afd7b17fdeda8208871b1d88a4e06024cdc4043eab45ec0e74b7386
-MISC ChangeLog 9038 RMD160 e2584d5aced91727a2e9777b702923f23f8ebcbc SHA1 f505ebeebae8c9a56ef44e16bf6365bad749c48c SHA256 d2efa57cc698f1505577e802c5c00246f95cc40499ae11aadcdbbb2e26ef7823
+EBUILD nautilus-sendto-2.28.5.ebuild 2258 RMD160 792abcca40e13de582d530569cf97e38749e8d6d SHA1 78ea7121492c0a1b69fd80d717f4b8b27d6f9cbe SHA256 de9fd80448ae9423b8223948adb22c53f8da686ba4ad8b06bfffe743a712adc9
+MISC ChangeLog 9474 RMD160 7f426450847df3e957289465e150a22a76c3f064 SHA1 18317dc171b5719a01a3a89ddf1ca357ae65bc37 SHA256 d92b912a244fbf608592415932d051bf85f280fa7163b27f037f6659aa6a4389
 MISC metadata.xml 538 RMD160 13100e1d7c26bd5d8d51e867b56e1b01a5f72a2a SHA1 623349194297e9695b1da78e7ab0b9c49a39c209 SHA256 350928205d9ba8058c629b614fbf047bc1f21e72170f850182d52215bc17a3a5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkx+dKkACgkQCaWpQKGI+9Rh3wCdEOU/73Nw9T6ywgmjcYgohDch
+fNEAmwRTPW/VBOHOOZoSlC9/I2wSOqZU
+=y4RH
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-commandline-help.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-commandline-help.patch
new file mode 100644
index 000000000000..0f086522649b
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-commandline-help.patch
@@ -0,0 +1,34 @@
+From aff367791fdd6535021fd0c95ecf2067363073c2 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Tue, 31 Aug 2010 15:49:00 +0000
+Subject: Fix command-line help glitch
+
+nautilus-sendo --help says
+
+Usage:
+nautilus-sendto [OPTION...] [FILES...] nautilus-sendto
+
+The second 'nautilus-sendto' here is redundant and confusing. With the
+patch below, it says just
+
+Usage:
+nautilus-sendto [OPTION...] [FILES...]
+which is the intended output
+
+https://bugzilla.gnome.org/show_bug.cgi?id=627849
+---
+diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c
+index 4dcbb1a..722386c 100644
+--- a/src/nautilus-sendto-command.c
++++ b/src/nautilus-sendto-command.c
+@@ -804,7 +804,7 @@ int main (int argc, char **argv)
+ 	textdomain (GETTEXT_PACKAGE);
+ 
+ 	g_thread_init (NULL);
+-	context = g_option_context_new ("nautilus-sendto");
++	context = g_option_context_new ("");
+ 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+ 	g_option_context_add_group (context, gtk_get_option_group (TRUE));
+ 	if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) {
+--
+cgit v0.8.3.1
diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-fix-memleaks.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-fix-memleaks.patch
new file mode 100644
index 000000000000..937c7d7ef2e9
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-fix-memleaks.patch
@@ -0,0 +1,55 @@
+From 52a1a4433dd5087baed79f948aec96aab409e3d2 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 16 Aug 2010 15:21:05 +0000
+Subject: Fix a few memory leaks
+
+On startup, and when sending packed files
+
+https://bugzilla.gnome.org/show_bug.cgi?id=626754
+---
+diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c
+index 92b96bb..4dcbb1a 100644
+--- a/src/nautilus-sendto-command.c
++++ b/src/nautilus-sendto-command.c
+@@ -265,7 +265,7 @@ status_label_clear (gpointer data)
+ static void
+ send_button_cb (GtkWidget *widget, NS_ui *ui)
+ {
+-	char *f, *error;
++	char *error;
+ 	NstPlugin *p;
+ 	GtkWidget *w;
+ 
+@@ -305,11 +305,14 @@ send_button_cb (GtkWidget *widget, NS_ui *ui)
+ 				NAUTILUS_SENDTO_LAST_MEDIUM, p->info->id, NULL);
+ 
+ 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ui->pack_checkbutton))){
++		char *f;
++
+ 		f = pack_files (ui);
+ 		if (f != NULL) {
+ 			GList *packed_file = NULL;		
+ 			packed_file = g_list_append (packed_file, f);
+ 			if (!p->info->send_files (p, w, packed_file)) {
++				g_free (f);
+ 				g_list_free (packed_file);
+ 				return;
+ 			}
+@@ -318,6 +321,7 @@ send_button_cb (GtkWidget *widget, NS_ui *ui)
+ 			gtk_widget_set_sensitive (ui->dialog, TRUE);
+ 			return;
+ 		}
++		g_free (f);
+ 	} else {
+ 		if (!p->info->send_files (p, w, file_list)) {
+ 			g_list_foreach (file_list, (GFunc) g_free, NULL);
+@@ -763,6 +767,7 @@ nautilus_sendto_init (void)
+ 
+ 		file = g_file_new_for_commandline_arg (filenames[i]);
+ 		filename = g_file_get_path (file);
++		g_object_unref (file);
+ 		if (filename == NULL)
+ 			continue;
+ 
+--
+cgit v0.8.3.1
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.5.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.5.ebuild
new file mode 100644
index 000000000000..652c9f2e0239
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-2.28.5.ebuild,v 1.1 2010/09/01 15:43:28 pacho Exp $
+
+EAPI="2"
+
+inherit gnome2 multilib eutils autotools
+
+DESCRIPTION="A nautilus extension for sending files to locations"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="bluetooth doc gajim cdr pidgin upnp +mail"
+
+RDEPEND=">=x11-libs/gtk+-2.18
+	>=dev-libs/glib-2.6
+	>=gnome-base/nautilus-2.14
+	>=gnome-base/gconf-2.13.0
+	bluetooth? (
+		|| ( >=net-wireless/gnome-bluetooth-2.27
+			 >=net-wireless/bluez-gnome-1.8 )
+		>=dev-libs/dbus-glib-0.60 )
+	cdr? ( >=app-cdr/brasero-2.26.0[nautilus] )
+	gajim? (
+		net-im/gajim
+		>=dev-libs/dbus-glib-0.60 )
+	mail? ( >=gnome-extra/evolution-data-server-1.5.3 )
+	pidgin? (
+		>=net-im/pidgin-2.0.0
+		>=dev-libs/dbus-glib-0.60 )
+	upnp? ( >=net-libs/gupnp-0.13.0 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.19
+	>=dev-util/intltool-0.35
+	doc? ( >=dev-util/gtk-doc-1.9 )
+	>=gnome-base/gnome-common-0.12
+	dev-util/gtk-doc-am"
+# Needed for eautoreconf
+#	>=gnome-base/gnome-common-0.12
+#	dev-util/gtk-doc-am
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+_use_plugin() {
+	if use ${1}; then
+		G2CONF="${G2CONF}${2:-"${1}"},"
+	fi
+}
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--with-plugins=removable-devices,"
+	_use_plugin bluetooth
+	_use_plugin cdr nautilus-burn
+	_use_plugin mail evolution
+	_use_plugin pidgin
+	_use_plugin gajim
+	_use_plugin upnp
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix a few memory leaks
+	epatch "${FILESDIR}/${P}-fix-memleaks.patch"
+
+	# Fix command-line help glitch
+	epatch "${FILESDIR}/${P}-commandline-help.patch"
+
+	# Remove plugin to use sendto from Evolution
+	epatch "${FILESDIR}/${PN}-2.28.4-remove-old-evo.patch"
+
+	# Remove Empathy plugin since it now lives in Empathy itself.
+	epatch "${FILESDIR}/${PN}-2.28.4-remove-empathy.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Nautilus does not use *.la files
+	find "${D}/usr/$(get_libdir)/nautilus" -name "*.la" -delete \
+		|| die "failed to delete *.la files"
+}