# 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.295 2010/06/23 14:05:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.296 2010/07/05 21:38:09 pacho Exp $
+
+*evolution-2.30.2-r1 (05 Jul 2010)
+
+ 05 Jul 2010; Pacho Ramos <pacho@gentoo.org> -evolution-2.30.2.ebuild,
+ +evolution-2.30.2-r1.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:
+ Revision bump to include more upstream fixes, this will also fix itip
+ segfaults (bug #324895 by Iain) and fix e-d-s dependencies (bug #325453 by
+ Priit Laes). Remove old testing.
*evolution-2.30.2 (23 Jun 2010)
AUX evolution-2.28.3.1-attachment-bar-RTL.patch 1360 RMD160 e2f512542837dd47c820f2a23b936f5a065665b7 SHA1 f2df4a491ccea878232dd55747526b4f80a40ff8 SHA256 1afb9010a997be10e168dcd050d4d8cb3bb85544f5f9f37c9bd17eb698579f49
AUX evolution-2.28.3.1-unknown-attachment-size.patch 1182 RMD160 4df9108c74c3b1b1d6d828502d26feab93db7dca SHA1 d248e9d07f6279539b1fa03a59e4005fa6a3aebe SHA256 ae8314004b7e0cfd4f285459a9bfabd864fbb3d3954417e0f5eed8b7e1944a4b
AUX evolution-2.30.1.2-configure.patch 1243 RMD160 f7cefb76592fff6e2fba441993b546b8c9a30ca6 SHA1 6ca2073ce735bf40c4ca403d695a16976a6c3360 SHA256 c757dd941f9b4798ed6c0b5c6d23517700c9c232c60aca3b6f09f2c4278885a2
-AUX evolution-2.30.2-call-function.patch 1045 RMD160 9c5e88bd2d1aba2c1250c0e3b2185972591e3385 SHA1 4d5629ad5c822346b096e0a5ef3a3a02bb7a8fc7 SHA256 51da15ac9e120210588910e1a1857c2f7f4a918095725ad8e4e7acb0432f2953
-AUX evolution-2.30.2-drag-message.patch 4840 RMD160 dd810044c7c3d1143af1fcbcbde3c37ee986a1e7 SHA1 c64e77ba58db7ee6e522005467effe852cb0e8c6 SHA256 1454896c1dd1a10b6a4176e8b9d150821c7a5f292dc4a711085df431cd4a31d2
-AUX evolution-2.30.2-proper-faq.patch 671 RMD160 9dccbea8db2c0433bb42bda60ad5caf88911ee51 SHA1 e3f97c3d72791fd7341291fc802e2c2b092a80aa SHA256 f0eb5bfb39bb2c0e04d0f8ff6ccb4fe884a82cd2084f66d0417734080233fad6
DIST evolution-2.26.3.tar.bz2 36427464 RMD160 f2b3aa2275095feb2af406022c0a6bc8a381e8d5 SHA1 d0e247ccb903a57a5e6fe23cfb04535ea141e9fb SHA256 e37f8d21a8aa201e9a3d91a110ec9d4dc3feae978be45b0c16cf93adacd5605b
DIST evolution-2.28.3.1.tar.bz2 29765375 RMD160 442c7b472caf94ba0aa1abbe253b810d15911a4f SHA1 412c8be73e483444ad69a4ad8c15b0db9520fe0a SHA256 9fda41b0994b1bb8d119f594597f77bb4af1a883588a39f7a81ec7a2eb18f5fd
+DIST evolution-2.30.2-patches.tar.bz2 12728 RMD160 d8058da75675a1990aad84348a40cd3f7be21aa3 SHA1 4bbb89f10ba893ef992af5fc32aad84b2ad46d2f SHA256 f3d6dcfba9ee7c21b415d04a545902cb5a28d1bcc00e579c6cc78aeac7650a45
DIST evolution-2.30.2.tar.bz2 32570501 RMD160 c1b5703bc241a2dee20f94e60e7c9995c8cce841 SHA1 14ddccbf33eb86c976899eccea6ae1fb565ea9ca SHA256 470d12c0de9cae2dc0275152a356150c7a57339e6feca77f43508bd7d1f04d83
EBUILD evolution-2.26.3.ebuild 4543 RMD160 be4487a89d3a2195a78f0ba2376227c01f556b2b SHA1 fc3e87a9f6f21d245855d928275d90869a11a1ba SHA256 91dff725e7f78199f94250dc5d3d3078d373c73ecc9c2874589d9799e52f1c88
EBUILD evolution-2.28.3.1-r1.ebuild 5343 RMD160 b41f223e648639fc0505b0f1e0372a3c9ada180e SHA1 2f017ae516204faf0fcfef390698b0a78773f61c SHA256 657d8568fc3d54dd7886ab4c3eefb6b3ad82a5c871a5407c20c7f68e1eb2fcbc
EBUILD evolution-2.28.3.1.ebuild 4851 RMD160 587cae4ba2745b2623156c61e1db0dc686c2fc55 SHA1 7f3c8b53af55cbbdba0b592253dd16ce87c3c1dd SHA256 85045aa14899dcbdaf8861a5d0868ebbe6f33dc1c298f52f90072856e5e6dcfc
-EBUILD evolution-2.30.2.ebuild 4641 RMD160 68c50da42a303a46bc2564577fc44f796bbe8101 SHA1 28821997b45f5ecd33067b5ce2672969ed17bd49 SHA256 1e2a301804a7d3733ef71ed9f064c961c3daf8fad2d08d805979dc03636c16e8
-MISC ChangeLog 69374 RMD160 1ed0274ba3f2175b52d287c1d67bf0aefeef5638 SHA1 f0aa5c78ef076e650d8507a97112cfaae88b9676 SHA256 4f2114193c8d761a2631d459437a5b1447932a2b77bf713e421f2eb90e712b03
+EBUILD evolution-2.30.2-r1.ebuild 4524 RMD160 b38530b6cf39fb63eff2252338774b4d6899e2f3 SHA1 2d981777540efbff1a330d422926da4acce25cce SHA256 a451f0cff6cab695b498b15543d1814afdc237fbf4553c5377c2f2901c3269fb
+MISC ChangeLog 69833 RMD160 27b54c57c99c891ea98ffde51772eb5db3d333fd SHA1 f210b08344b8db0ecc16697135998d67c13fe657 SHA256 9790c0c15c535c665d60c7437de9b634fcc80bae14d455965c0febb687bd86bd
MISC metadata.xml 1532 RMD160 44749261021a81bb77167cd8ea800eb18a99dfee SHA1 3a52cba14a151672c86eceb118e7757a12ec91a3 SHA256 d642c82216a4ce3c5f45ea007f4d5055beab1261baea130becc2d37d1bfb3797
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iEYEARECAAYFAkwiFJ8ACgkQCaWpQKGI+9Qu4wCfYt6m8LewPBpU0xPJtncW+1v7
-J58Anix5sCC+sv4QQUpt52venLSTFwmX
-=l8Op
+iEYEARECAAYFAkwyUMkACgkQCaWpQKGI+9SqcQCeMmjyjgvFXMr01VRMSdk32mf/
+5rEAmgJsa2tpHnF99oz2B5Ym9o39WgaU
+=Z6uW
-----END PGP SIGNATURE-----
# 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.2.ebuild,v 1.1 2010/06/23 14:05:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.30.2-r1.ebuild,v 1.1 2010/07/05 21:38:09 pacho Exp $
EAPI="2"
GCONF_DEBUG="no"
-inherit autotools gnome2 flag-o-matic python
+inherit autotools gnome2 flag-o-matic python versionator
DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
HOMEPAGE="http://www.gnome.org/projects/evolution/"
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
# password from inside evolution, bug 160302
RDEPEND=">=dev-libs/glib-2.22
>=x11-libs/gtk+-2.18
- >=gnome-extra/evolution-data-server-2.30.1
+ >=gnome-extra/evolution-data-server-$(get_version_component_range 1-2)
>=gnome-base/gnome-desktop-2.26.0
>=gnome-extra/gtkhtml-3.29.6
>=gnome-base/gconf-2
# Do not require unstable libunique
epatch "${FILESDIR}/${PN}-2.30.1.2-configure.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"
+ # Apply upstream patches committed to gnome-2.30 branch
+ epatch "${WORKDIR}"/${P}-patches/*.patch
intltoolize --force --copy --automake || die "intltoolize failed"
eautoreconf
+++ /dev/null
-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
+++ /dev/null
-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
+++ /dev/null
-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
projects / gentoo.git / commitdiff