Version bump

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 214 insertions, 8 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 06f3b83397fe..a02d08db51cb 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.294 2010/06/14 00:46:16 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.295 2010/06/23 14:05:13 pacho Exp $
+
+*evolution-2.30.2 (23 Jun 2010)
+
+  23 Jun 2010; Pacho Ramos <pacho@gentoo.org> -evolution-2.30.1.2-r1.ebuild,
+  +evolution-2.30.2.ebuild, +files/evolution-2.30.2-call-function.patch,
+  +files/evolution-2.30.2-drag-message.patch,
+  +files/evolution-2.30.2-proper-faq.patch:
+  Version bump with updated translations and fixes, remove old. Drop pst
+  references in RDEPEND, thanks to Michael Sterrett for reporting.
 
   14 Jun 2010; <chainsaw@gentoo.org>
   files/evolution-2.30.1.2-configure.patch:
diff --git a/mail-client/evolution/evolution-2.30.1.2-r1.ebuild b/mail-client/evolution/evolution-2.30.2.ebuild
index e929650cc0e8..5db19ee67a81 100644
--- a/mail-client/evolution/evolution-2.30.1.2-r1.ebuild
+++ b/mail-client/evolution/evolution-2.30.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.1.2-r1.ebuild,v 1.1 2010/06/13 20:13:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.2.ebuild,v 1.1 2010/06/23 14:05:13 pacho Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -14,9 +14,6 @@ LICENSE="GPL-2 LGPL-2 OPENLDAP"
 SLOT="2.0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-patches.tar.bz2"
-
 IUSE="crypt kerberos ldap networkmanager pda profile python ssl
 gstreamer +sound"
 # pst
@@ -56,7 +53,6 @@ RDEPEND=">=dev-libs/glib-2.22
 	pda? (
 		>=app-pda/gnome-pilot-2.0.16
 		>=app-pda/gnome-pilot-conduits-2 )
-	pst? ( >=net-mail/libpst-0.6.41 )
 	python? ( >=dev-lang/python-2.4 )
 	sound? ( media-libs/libcanberra )
 	ssl? (
@@ -114,8 +110,14 @@ src_prepare() {
 	# Do not require unstable libunique
 	epatch "${FILESDIR}/${PN}-2.30.1.2-configure.patch"
 
-	# Apply upstream patches committed to gnome-2-30 branch
-	epatch "${WORKDIR}"/${P}-patches/*.patch
+	# bgo#619347: Contact List Editor calls wrong EDestination function
+	epatch "${FILESDIR}/${P}-call-function.patch"
+
+	# bgo#622329: Help menu points to the wrong FAQ page
+	epatch "${FILESDIR}/${P}-proper-faq.patch"
+
+	# bgo#621819: Can't drag message attachments to folders
+	epatch "${FILESDIR}/${P}-drag-message.patch"
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
diff --git a/mail-client/evolution/files/evolution-2.30.2-call-function.patch b/mail-client/evolution/files/evolution-2.30.2-call-function.patch
new file mode 100644
index 000000000000..5acc01f0e1d8
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.30.2-call-function.patch
@@ -0,0 +1,21 @@
+From 7f9a025cb6ca92ab74ea4493cdcdc232a5dfca76 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Mon, 21 Jun 2010 14:58:38 +0000
+Subject: Bug 619347 - Contact List Editor calls wrong EDestination function
+
+---
+diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+index 23da590..5d96047 100644
+--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
++++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+@@ -640,7 +640,7 @@ contact_list_editor_email_entry_updated_cb (GtkWidget *widget,
+ 	entry = E_NAME_SELECTOR_ENTRY (widget);
+ 	model = E_CONTACT_LIST_MODEL (editor->priv->model);
+ 
+-	email = g_strdup (e_destination_get_address (destination));
++	email = g_strdup (e_destination_get_textrep (destination, TRUE));
+ 	store = e_name_selector_entry_peek_destination_store (entry);
+ 	e_destination_store_remove_destination (store, destination);
+ 	gtk_entry_set_text (GTK_ENTRY (WIDGET (EMAIL_ENTRY)), "");
+--
+cgit v0.8.3.1
diff --git a/mail-client/evolution/files/evolution-2.30.2-drag-message.patch b/mail-client/evolution/files/evolution-2.30.2-drag-message.patch
new file mode 100644
index 000000000000..f6324048a355
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.30.2-drag-message.patch
@@ -0,0 +1,153 @@
+From f0ed91cee63663f132f34c7ce02039b03a3f6b95 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Tue, 22 Jun 2010 23:46:07 +0000
+Subject: Bug 621819 - Can't drag message attachments to folders
+
+---
+diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
+index bb948f4..bdb3605 100644
+--- a/mail/em-folder-tree.c
++++ b/mail/em-folder-tree.c
+@@ -1663,9 +1663,7 @@ folder_tree_drop_async__free (struct _DragDataReceivedAsync *m)
+ 	g_object_unref(m->context);
+ 	camel_object_unref(m->store);
+ 	g_free(m->full_name);
+-
+-	g_free(m->selection->data);
+-	g_free(m->selection);
++	gtk_selection_data_free (m->selection);
+ }
+ 
+ static MailMsgInfo folder_tree_drop_async_info = {
+@@ -1735,10 +1733,7 @@ tree_drag_data_received(GtkWidget *widget, GdkDragContext *context, gint x, gint
+ 	m->info = info;
+ 
+ 	/* need to copy, goes away once we exit */
+-	m->selection = g_malloc0(sizeof(*m->selection));
+-	m->selection->data = g_malloc(selection->length);
+-	memcpy(m->selection->data, selection->data, selection->length);
+-	m->selection->length = selection->length;
++	m->selection = gtk_selection_data_copy (selection);
+ 
+ 	tree_drag_data_action(m);
+ }
+diff --git a/mail/em-utils.c b/mail/em-utils.c
+index 340ec58..692e461 100644
+--- a/mail/em-utils.c
++++ b/mail/em-utils.c
+@@ -856,18 +856,18 @@ em_utils_selection_set_urilist(GtkSelectionData *data, CamelFolder *folder, GPtr
+  * automatically cleaned up when the application quits.
+  **/
+ void
+-em_utils_selection_get_urilist(GtkSelectionData *data, CamelFolder *folder)
++em_utils_selection_get_urilist (GtkSelectionData *selection_data,
++                                CamelFolder *folder)
+ {
+ 	CamelStream *stream;
+ 	CamelURL *url;
+ 	gint fd, i, res = 0;
+-	gchar *tmp, **uris;
++	gchar **uris;
+ 
+ 	d(printf(" * drop uri list\n"));
+ 
+-	tmp = g_strndup((gchar *)data->data, data->length);
+-	uris = g_strsplit(tmp, "\n", 0);
+-	g_free(tmp);
++	uris = gtk_selection_data_get_uris (selection_data);
++
+ 	for (i=0;res == 0 && uris[i];i++) {
+ 		g_strstrip(uris[i]);
+ 		if (uris[i][0] == '#')
+@@ -889,7 +889,7 @@ em_utils_selection_get_urilist(GtkSelectionData *data, CamelFolder *folder)
+ 		camel_url_free(url);
+ 	}
+ 
+-	g_strfreev(uris);
++	g_strfreev (uris);
+ }
+ 
+ static void
+diff --git a/widgets/misc/e-attachment-button.c b/widgets/misc/e-attachment-button.c
+index d1b02c0..f20ba2d 100644
+--- a/widgets/misc/e-attachment-button.c
++++ b/widgets/misc/e-attachment-button.c
+@@ -247,6 +247,18 @@ attachment_button_expand_clicked_cb (EAttachmentButton *button)
+ }
+ 
+ static void
++attachment_button_expand_drag_begin_cb (EAttachmentButton *button,
++                                        GdkDragContext *context)
++{
++	EAttachmentView *view;
++
++	view = e_attachment_button_get_view (button);
++
++	attachment_button_select_path (button);
++	e_attachment_view_drag_begin (view, context);
++}
++
++static void
+ attachment_button_expand_drag_data_get_cb (EAttachmentButton *button,
+                                            GdkDragContext *context,
+                                            GtkSelectionData *selection,
+@@ -263,6 +275,17 @@ attachment_button_expand_drag_data_get_cb (EAttachmentButton *button,
+ 		view, context, selection, info, time);
+ }
+ 
++static void
++attachment_button_expand_drag_end_cb (EAttachmentButton *button,
++                                      GdkDragContext *context)
++{
++	EAttachmentView *view;
++
++	view = e_attachment_button_get_view (button);
++
++	e_attachment_view_drag_end (view, context);
++}
++
+ static gboolean
+ attachment_button_toggle_button_press_event_cb (EAttachmentButton *button,
+                                                 GdkEventButton *event)
+@@ -579,20 +602,39 @@ attachment_button_init (EAttachmentButton *button)
+ 		G_CALLBACK (attachment_button_expand_clicked_cb), button);
+ 
+ 	g_signal_connect_swapped (
++		button->priv->expand_button, "drag-begin",
++		G_CALLBACK (attachment_button_expand_drag_begin_cb),
++		button);
++
++	g_signal_connect_swapped (
+ 		button->priv->expand_button, "drag-data-get",
+ 		G_CALLBACK (attachment_button_expand_drag_data_get_cb),
+ 		button);
+ 
+ 	g_signal_connect_swapped (
++		button->priv->expand_button, "drag-end",
++		G_CALLBACK (attachment_button_expand_drag_end_cb),
++		button);
++
++	g_signal_connect_swapped (
+ 		button->priv->toggle_button, "button-press-event",
+ 		G_CALLBACK (attachment_button_toggle_button_press_event_cb),
+ 		button);
+ 
+ 	g_signal_connect_swapped (
++		button->priv->toggle_button, "drag-begin",
++		G_CALLBACK (attachment_button_expand_drag_begin_cb),
++		button);
++
++	g_signal_connect_swapped (
+ 		button->priv->toggle_button, "drag-data-get",
+ 		G_CALLBACK (attachment_button_expand_drag_data_get_cb),
+ 		button);
+ 
++	g_signal_connect_swapped (
++		button->priv->toggle_button, "drag-end",
++		G_CALLBACK (attachment_button_expand_drag_end_cb),
++		button);
+ }
+ 
+ GType
+--
+cgit v0.8.3.1
diff --git a/mail-client/evolution/files/evolution-2.30.2-proper-faq.patch b/mail-client/evolution/files/evolution-2.30.2-proper-faq.patch
new file mode 100644
index 000000000000..9d02e5c32423
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.30.2-proper-faq.patch
@@ -0,0 +1,21 @@
+From 9f0e9e35ee33000c5f83a72d2c949c3d4f58885c Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Mon, 21 Jun 2010 23:23:14 +0000
+Subject: Bug 622329 - Help menu points to the wrong FAQ page
+
+---
+diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
+index e6c0b50..c653560 100644
+--- a/shell/e-shell-window-actions.c
++++ b/shell/e-shell-window-actions.c
+@@ -34,7 +34,7 @@
+ 	"Copyright \xC2\xA9 1999 - 2008 Novell, Inc. and Others"
+ 
+ #define EVOLUTION_FAQ \
+-	"http://www.go-evolution.org/FAQ"
++	"http://live.gnome.org/Evolution/FAQ"
+ 
+ #define EVOLUTION_WEBSITE \
+ 	"http://www.gnome.org/projects/evolution/"
+--
+cgit v0.8.3.1