From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:gnome-next commit in: mail-client/evolution/, mail-client/evolution/files/
Date: Fri, 8 Jul 2011 04:34:50 +0000 (UTC) [thread overview]
Message-ID: <ebed090ec6a6edb5dc04050985dfef15397b6575.tetromino@gentoo> (raw)
commit: ebed090ec6a6edb5dc04050985dfef15397b6575
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Jul 8 04:02:08 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Jul 8 04:25:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ebed090e
mail-client/evolution: 3.0.2 → 3.1.3
Bump to gnome-3.1.x version, drop patches that were applied upstream.
Update dependencies. Enable contact-maps plugin only if USE="map clutter".
Add a USE flag for gnome-online-accounts (on by default, since
gnome-online-accounts is pulled in by gnome-control-center anyway, and
since most people would want to use their gmail contacts in evolution).
---
...olution-3.0.2.ebuild => evolution-3.1.3.ebuild} | 35 ++++++++++-------
mail-client/evolution/evolution-9999.ebuild | 28 ++++++++++----
...Always-update-signature-in-composer-on-ac.patch | 25 ------------
...refresh_folders_exec-reports-progress-inc.patch | 41 --------------------
...Crash-using-saved-search-with-an-empty-ex.patch | 37 ------------------
5 files changed, 41 insertions(+), 125 deletions(-)
diff --git a/mail-client/evolution/evolution-3.0.2.ebuild b/mail-client/evolution/evolution-3.1.3.ebuild
similarity index 86%
rename from mail-client/evolution/evolution-3.0.2.ebuild
rename to mail-client/evolution/evolution-3.1.3.ebuild
index 7fa7af0..2fcb805 100644
--- a/mail-client/evolution/evolution-3.0.2.ebuild
+++ b/mail-client/evolution/evolution-3.1.3.ebuild
@@ -3,11 +3,12 @@
# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.1-r1.ebuild,v 1.3 2011/01/15 19:56:39 nirbheek Exp $
EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="python? 2:2.4"
-inherit autotools eutils flag-o-matic gnome2 python
+inherit autotools flag-o-matic gnome2 python
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -22,7 +23,7 @@ if [[ ${PV} = 9999 ]]; then
else
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
-IUSE="clutter connman crypt doc gstreamer kerberos ldap map networkmanager python ssl"
+IUSE="clutter connman crypt doc +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl"
# We need a graphical pinentry frontend to be able to ask for the GPG
# password from inside evolution, bug 160302
@@ -35,20 +36,20 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
COMMON_DEPEND=">=dev-libs/glib-2.28:2
>=x11-libs/cairo-1.9.15[glib]
>=x11-libs/gtk+-3.0.2:3
- >=dev-libs/libunique-2.91.4:3
>=gnome-base/gnome-desktop-2.91.3:3
+ >=gnome-base/gsettings-desktop-schemas-2.91.92
>=dev-libs/libgweather-2.90.0:2
>=media-libs/libcanberra-0.25[gtk3]
>=x11-libs/libnotify-0.7
- >=gnome-extra/evolution-data-server-${PV}[weather]
- >=gnome-extra/gtkhtml-3.31.3:4.0
+ >=gnome-extra/evolution-data-server-${PV}[gnome-online-accounts?,weather]
+ >=gnome-extra/gtkhtml-4.1.2:4.0
>=gnome-base/gconf-2:2
dev-libs/atk
>=dev-libs/libxml2-2.7.3:2
>=net-libs/libsoup-gnome-2.31.2:2.4
>=x11-misc/shared-mime-info-0.22
>=x11-themes/gnome-icon-theme-2.30.2.1
- >=dev-libs/libgdata-0.4
+ >=dev-libs/libgdata-0.9.1
x11-libs/libSM
x11-libs/libICE
@@ -61,6 +62,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
crypt? ( || (
( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
=app-crypt/gnupg-1.4* ) )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 )
gstreamer? (
>=media-libs/gstreamer-0.10:0.10
>=media-libs/gst-plugins-base-0.10:0.10 )
@@ -68,7 +70,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
ldap? ( >=net-nds/openldap-2 )
map? (
>=app-misc/geoclue-0.11.1
- media-libs/libchamplain:0.8 )
+ media-libs/libchamplain:0.10 )
networkmanager? ( >=net-misc/networkmanager-0.7 )
ssl? (
>=dev-libs/nspr-4.6.1
@@ -103,7 +105,6 @@ pkg_setup() {
--enable-plugins=experimental
--disable-image-inline
--disable-mono
- --disable-profiling
--disable-pst-import
--enable-canberra
--enable-weather
@@ -111,13 +112,24 @@ pkg_setup() {
$(use_enable ssl smime)
$(use_enable networkmanager nm)
$(use_enable connman)
+ $(use_enable gnome-online-accounts goa)
$(use_enable gstreamer audio-inline)
- $(use_enable map contacts-map)
$(use_enable python)
$(use_with clutter)
$(use_with ldap openldap)
$(use_with kerberos krb5 /usr)"
+ # workaround for lack of EAPI 4 support in python.eclass
+ local myconf="--disable-contact-maps"
+ if use map; then
+ if use clutter; then
+ myconf="--enable-contact-maps"
+ else
+ ewarn "map plugin auto-disabled due to USE=-clutter"
+ fi
+ fi
+ G2CONF="${G2CONF} ${myconf}"
+
# dang - I've changed this to do --enable-plugins=experimental. This will
# autodetect new-mail-notify and exchange, but that cannot be helped for the
# moment. They should be changed to depend on a --enable-<foo> like mono
@@ -144,11 +156,6 @@ pkg_setup() {
}
src_prepare() {
- # XXX: useful upstream fixes, will be included in next release
- epatch "${FILESDIR}/0001-Bug-651039-Always-update-signature-in-composer-on-ac.patch"
- epatch "${FILESDIR}/0002-Bug-651062-refresh_folders_exec-reports-progress-inc.patch"
- epatch "${FILESDIR}/0003-Bug-651135-Crash-using-saved-search-with-an-empty-ex.patch"
-
# Use NSS/NSPR only if 'ssl' is enabled.
if use ssl ; then
sed -e 's|mozilla-nss|nss|' \
diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index 04f6f5e..2fcb805 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -3,6 +3,7 @@
# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.1-r1.ebuild,v 1.3 2011/01/15 19:56:39 nirbheek Exp $
EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
PYTHON_DEPEND="python? 2:2.4"
@@ -22,7 +23,7 @@ if [[ ${PV} = 9999 ]]; then
else
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
-IUSE="clutter connman crypt doc gstreamer kerberos ldap map networkmanager python ssl"
+IUSE="clutter connman crypt doc +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl"
# We need a graphical pinentry frontend to be able to ask for the GPG
# password from inside evolution, bug 160302
@@ -35,20 +36,20 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
COMMON_DEPEND=">=dev-libs/glib-2.28:2
>=x11-libs/cairo-1.9.15[glib]
>=x11-libs/gtk+-3.0.2:3
- >=dev-libs/libunique-2.91.4:3
>=gnome-base/gnome-desktop-2.91.3:3
+ >=gnome-base/gsettings-desktop-schemas-2.91.92
>=dev-libs/libgweather-2.90.0:2
>=media-libs/libcanberra-0.25[gtk3]
>=x11-libs/libnotify-0.7
- >=gnome-extra/evolution-data-server-${PV}[weather]
- >=gnome-extra/gtkhtml-3.31.3:4.0
+ >=gnome-extra/evolution-data-server-${PV}[gnome-online-accounts?,weather]
+ >=gnome-extra/gtkhtml-4.1.2:4.0
>=gnome-base/gconf-2:2
dev-libs/atk
>=dev-libs/libxml2-2.7.3:2
>=net-libs/libsoup-gnome-2.31.2:2.4
>=x11-misc/shared-mime-info-0.22
>=x11-themes/gnome-icon-theme-2.30.2.1
- >=dev-libs/libgdata-0.4
+ >=dev-libs/libgdata-0.9.1
x11-libs/libSM
x11-libs/libICE
@@ -61,6 +62,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
crypt? ( || (
( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
=app-crypt/gnupg-1.4* ) )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 )
gstreamer? (
>=media-libs/gstreamer-0.10:0.10
>=media-libs/gst-plugins-base-0.10:0.10 )
@@ -68,7 +70,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
ldap? ( >=net-nds/openldap-2 )
map? (
>=app-misc/geoclue-0.11.1
- media-libs/libchamplain:0.8 )
+ media-libs/libchamplain:0.10 )
networkmanager? ( >=net-misc/networkmanager-0.7 )
ssl? (
>=dev-libs/nspr-4.6.1
@@ -103,7 +105,6 @@ pkg_setup() {
--enable-plugins=experimental
--disable-image-inline
--disable-mono
- --disable-profiling
--disable-pst-import
--enable-canberra
--enable-weather
@@ -111,13 +112,24 @@ pkg_setup() {
$(use_enable ssl smime)
$(use_enable networkmanager nm)
$(use_enable connman)
+ $(use_enable gnome-online-accounts goa)
$(use_enable gstreamer audio-inline)
- $(use_enable map contacts-map)
$(use_enable python)
$(use_with clutter)
$(use_with ldap openldap)
$(use_with kerberos krb5 /usr)"
+ # workaround for lack of EAPI 4 support in python.eclass
+ local myconf="--disable-contact-maps"
+ if use map; then
+ if use clutter; then
+ myconf="--enable-contact-maps"
+ else
+ ewarn "map plugin auto-disabled due to USE=-clutter"
+ fi
+ fi
+ G2CONF="${G2CONF} ${myconf}"
+
# dang - I've changed this to do --enable-plugins=experimental. This will
# autodetect new-mail-notify and exchange, but that cannot be helped for the
# moment. They should be changed to depend on a --enable-<foo> like mono
diff --git a/mail-client/evolution/files/0001-Bug-651039-Always-update-signature-in-composer-on-ac.patch b/mail-client/evolution/files/0001-Bug-651039-Always-update-signature-in-composer-on-ac.patch
deleted file mode 100644
index 7f80812..0000000
--- a/mail-client/evolution/files/0001-Bug-651039-Always-update-signature-in-composer-on-ac.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 843e35c48ada910eb1fefb202bcb849d1047c359 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Wed, 25 May 2011 11:20:26 +0200
-Subject: [PATCH 1/3] Bug #651039 - Always update signature in composer on
- account change
-
----
- composer/e-msg-composer.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
-index 0bc9ca9..c8f1993 100644
---- a/composer/e-msg-composer.c
-+++ b/composer/e-msg-composer.c
-@@ -1714,6 +1714,7 @@ msg_composer_account_changed_cb (EMsgComposer *composer)
- uid = account->id->sig_uid;
- signature = uid ? e_get_signature_by_uid (uid) : NULL;
- e_composer_header_table_set_signature (table, signature);
-+ e_msg_composer_show_sig_file (composer);
- }
-
- static void
---
-1.7.5.rc3
-
diff --git a/mail-client/evolution/files/0002-Bug-651062-refresh_folders_exec-reports-progress-inc.patch b/mail-client/evolution/files/0002-Bug-651062-refresh_folders_exec-reports-progress-inc.patch
deleted file mode 100644
index 4579cda..0000000
--- a/mail-client/evolution/files/0002-Bug-651062-refresh_folders_exec-reports-progress-inc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From fbd3aca29cc12c8a58d15237e3e44f83fe1b8229 Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@redhat.com>
-Date: Thu, 26 May 2011 07:03:15 -0400
-Subject: [PATCH 2/3] Bug 651062 - refresh_folders_exec() reports progress
- incorrectly.
-
-(cherry picked from commit 6ddc2340d03b6fe3745e97ca10336408833c7294)
----
- mail/mail-send-recv.c | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
-index a4e2e2e..79018f3 100644
---- a/mail/mail-send-recv.c
-+++ b/mail/mail-send-recv.c
-@@ -924,6 +924,8 @@ refresh_folders_exec (struct _refresh_folders_msg *m,
-
- get_folders (m->store, m->folders, m->finfo);
-
-+ camel_operation_push_message (cancellable, _("Updating..."));
-+
- for (i=0;i<m->folders->len;i++) {
- folder = e_mail_session_uri_to_folder_sync (
- m->info->session,
-@@ -944,9 +946,12 @@ refresh_folders_exec (struct _refresh_folders_msg *m,
- break;
-
- if (m->info->state != SEND_CANCELLED)
-- g_signal_emit_by_name (m->info->cancellable, "status", _("Updating..."), 100 * i / m->folders->len);
-+ camel_operation_progress (
-+ cancellable, 100 * i / m->folders->len);
- }
-
-+ camel_operation_pop_message (cancellable);
-+
- if (cancellable)
- g_signal_handler_disconnect (m->info->cancellable, handler_id);
- }
---
-1.7.5.rc3
-
diff --git a/mail-client/evolution/files/0003-Bug-651135-Crash-using-saved-search-with-an-empty-ex.patch b/mail-client/evolution/files/0003-Bug-651135-Crash-using-saved-search-with-an-empty-ex.patch
deleted file mode 100644
index bcec4dd..0000000
--- a/mail-client/evolution/files/0003-Bug-651135-Crash-using-saved-search-with-an-empty-ex.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From af08ff1bebc895b4de15d1822d96c64d092f2bb5 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 26 May 2011 13:48:22 +0200
-Subject: [PATCH 3/3] Bug #651135 - Crash using saved search with an empty
- expression
-
----
- addressbook/gui/widgets/e-addressbook-model.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
-index 8e62e40..17eb2d3 100644
---- a/addressbook/gui/widgets/e-addressbook-model.c
-+++ b/addressbook/gui/widgets/e-addressbook-model.c
-@@ -904,6 +904,9 @@ e_addressbook_model_get_query (EAddressbookModel *model)
- {
- g_return_val_if_fail (E_IS_ADDRESSBOOK_MODEL (model), NULL);
-
-+ if (!model->priv->query)
-+ return NULL;
-+
- return e_book_query_to_string (model->priv->query);
- }
-
-@@ -920,6 +923,9 @@ e_addressbook_model_set_query (EAddressbookModel *model,
- else
- book_query = e_book_query_from_string (query);
-
-+ if (!book_query)
-+ return;
-+
- if (model->priv->query != NULL) {
- gchar *old_query, *new_query;
-
---
-1.7.5.rc3
-
next reply other threads:[~2011-07-08 4:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-08 4:34 Alexandre Restovtsev [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-15 1:07 [gentoo-commits] proj/gnome:gnome-next commit in: mail-client/evolution/, mail-client/evolution/files/ Alexandre Restovtsev
2011-09-01 23:16 Alexandre Restovtsev
2011-09-27 5:58 Alexandre Restovtsev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ebed090ec6a6edb5dc04050985dfef15397b6575.tetromino@gentoo \
--to=tetromino@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox