* [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/, mail-client/evolution/, ...
@ 2011-03-06 22:19 Nirbheek Chauhan
0 siblings, 0 replies; 3+ messages in thread
From: Nirbheek Chauhan @ 2011-03-06 22:19 UTC (permalink / raw
To: gentoo-commits
commit: c1298b627854d16e9809836c4a02055238f5d69f
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 6 20:54:13 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun Mar 6 20:54:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c1298b62
evolution-{data-server,exchange}: 2.91.90 → 2.91.91
---
...ebuild => evolution-data-server-2.91.91.ebuild} | 0
...90.ebuild => evolution-exchange-2.91.91.ebuild} | 0
...ion-2.91.90.ebuild => evolution-2.91.91.ebuild} | 16 +++++++---------
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.91.90.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.91.91.ebuild
similarity index 100%
rename from gnome-extra/evolution-data-server/evolution-data-server-2.91.90.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-2.91.91.ebuild
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.91.90.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.91.91.ebuild
similarity index 100%
rename from gnome-extra/evolution-exchange/evolution-exchange-2.91.90.ebuild
rename to gnome-extra/evolution-exchange/evolution-exchange-2.91.91.ebuild
diff --git a/mail-client/evolution/evolution-2.91.90.ebuild b/mail-client/evolution/evolution-2.91.91.ebuild
similarity index 91%
rename from mail-client/evolution/evolution-2.91.90.ebuild
rename to mail-client/evolution/evolution-2.91.91.ebuild
index 44c7e9d..f3a01f9 100644
--- a/mail-client/evolution/evolution-2.91.90.ebuild
+++ b/mail-client/evolution/evolution-2.91.91.ebuild
@@ -137,9 +137,6 @@ pkg_setup() {
}
src_prepare() {
- # Fix invalid use of la file in contact-editor, upstream bug #635002
- epatch "${FILESDIR}/${PN}-2.32.0-wrong-lafile-usage.patch"
-
# Use NSS/NSPR only if 'ssl' is enabled.
if use ssl ; then
sed -e 's|mozilla-nss|nss|' \
@@ -162,12 +159,13 @@ src_prepare() {
pkg_postinst() {
gnome2_pkg_postinst
- elog "To change the default browser if you are not using GNOME, do:"
- elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'firefox %s'"
- elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'firefox %s'"
- elog ""
- elog "Replace 'firefox %s' with which ever browser you use."
- elog ""
+ # FIXME: This has changed with GNOME 3, revisit
+ #elog "To change the default browser if you are not using GNOME, do:"
+ #elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'firefox %s'"
+ #elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'firefox %s'"
+ #elog ""
+ #elog "Replace 'firefox %s' with which ever browser you use."
+ #elog ""
elog "Junk filters are now a run-time choice. You will get a choice of"
elog "bogofilter or spamassassin based on which you have installed"
elog ""
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/, mail-client/evolution/, ...
@ 2012-03-15 15:44 Nirbheek Chauhan
0 siblings, 0 replies; 3+ messages in thread
From: Nirbheek Chauhan @ 2012-03-15 15:44 UTC (permalink / raw
To: gentoo-commits
commit: ab16174d51d5f3a60ef443abb3eae3bf4db9d979
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 9 23:50:30 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 15:40:23 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ab16174d
evolution, e-d-s: bump to 3.3.91
---
....ebuild => evolution-data-server-3.3.91.ebuild} | 22 ++++++------
.../evolution-data-server-9999.ebuild | 22 ++++++------
...olution-9999.ebuild => evolution-3.3.91.ebuild} | 18 ++++------
mail-client/evolution/evolution-9999.ebuild | 18 ++++------
.../evolution-3.2.1-reorder-mx-clutter-gtk.patch | 34 --------------------
5 files changed, 36 insertions(+), 78 deletions(-)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.3.91.ebuild
similarity index 93%
copy from gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
copy to gnome-extra/evolution-data-server/evolution-data-server-3.3.91.ebuild
index 40bea92..a7ec0be 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.3.91.ebuild
@@ -21,31 +21,32 @@ if [[ ${PV} = 9999 ]]; then
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
fi
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl vala +weather"
+IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
# GNOME3: How do we slot libedataserverui-3.0.so?
# Also, libedata-cal-1.2.so and libecal-1.2.so use gtk-3, but aren't slotted
-RDEPEND=">=dev-libs/glib-2.28:2
- >=x11-libs/gtk+-3.0:3
+RDEPEND=">=dev-libs/glib-2.30:2
+ >=x11-libs/gtk+-3.2:3
>=gnome-base/gconf-2
>=dev-db/sqlite-3.5
- >=dev-libs/libgdata-0.9.1
+ >=dev-libs/libgdata-0.10
>=gnome-base/gnome-keyring-2.20.1
>=dev-libs/libical-0.43
>=net-libs/libsoup-2.31.2:2.4
>=dev-libs/libxml2-2
>=sys-libs/db-4
+ >=dev-libs/nspr-4.4
+ >=dev-libs/nss-3.9
+
sys-libs/zlib
virtual/libiconv
+
gnome-online-accounts? (
>=net-libs/gnome-online-accounts-3.1.1
>=net-libs/liboauth-0.9.4 )
introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
kerberos? ( virtual/krb5 )
ldap? ( >=net-nds/openldap-2 )
- ssl? (
- >=dev-libs/nspr-4.4
- >=dev-libs/nss-3.9 )
weather? ( >=dev-libs/libgweather-2.90.0:2 )
"
DEPEND="${RDEPEND}
@@ -57,7 +58,7 @@ DEPEND="${RDEPEND}
>=gnome-base/gnome-common-2
>=dev-util/gtk-doc-am-1.9
>=sys-devel/gettext-0.17
- doc? ( >=dev-util/gtk-doc-1.9 )
+ doc? ( >=dev-util/gtk-doc-1.14 )
vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
# eautoreconf needs:
# >=gnome-base/gnome-common-2
@@ -72,6 +73,7 @@ pkg_setup() {
DOCS="ChangeLog MAINTAINERS NEWS TODO"
# Uh, what to do about dbus-call-timeout ?
G2CONF="${G2CONF}
+ --disable-schemas-compile
VALAC=$(type -P valac-0.14)
VAPIGEN=$(type -P vapigen-0.14)
$(use_enable gnome-online-accounts goa)
@@ -79,13 +81,11 @@ pkg_setup() {
$(use_enable ipv6)
$(use_with kerberos krb5 ${EPREFIX}/usr)
$(use_with ldap openldap)
- $(use_enable ssl ssl)
- $(use_enable ssl smime)
$(use_enable vala vala-bindings)
$(use_enable weather)
- --enable-calendar
--enable-nntp
--enable-largefile
+ --enable-smime
--with-libdb=${EPREFIX}/usr"
}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
index 40bea92..a7ec0be 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -21,31 +21,32 @@ if [[ ${PV} = 9999 ]]; then
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
fi
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl vala +weather"
+IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
# GNOME3: How do we slot libedataserverui-3.0.so?
# Also, libedata-cal-1.2.so and libecal-1.2.so use gtk-3, but aren't slotted
-RDEPEND=">=dev-libs/glib-2.28:2
- >=x11-libs/gtk+-3.0:3
+RDEPEND=">=dev-libs/glib-2.30:2
+ >=x11-libs/gtk+-3.2:3
>=gnome-base/gconf-2
>=dev-db/sqlite-3.5
- >=dev-libs/libgdata-0.9.1
+ >=dev-libs/libgdata-0.10
>=gnome-base/gnome-keyring-2.20.1
>=dev-libs/libical-0.43
>=net-libs/libsoup-2.31.2:2.4
>=dev-libs/libxml2-2
>=sys-libs/db-4
+ >=dev-libs/nspr-4.4
+ >=dev-libs/nss-3.9
+
sys-libs/zlib
virtual/libiconv
+
gnome-online-accounts? (
>=net-libs/gnome-online-accounts-3.1.1
>=net-libs/liboauth-0.9.4 )
introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
kerberos? ( virtual/krb5 )
ldap? ( >=net-nds/openldap-2 )
- ssl? (
- >=dev-libs/nspr-4.4
- >=dev-libs/nss-3.9 )
weather? ( >=dev-libs/libgweather-2.90.0:2 )
"
DEPEND="${RDEPEND}
@@ -57,7 +58,7 @@ DEPEND="${RDEPEND}
>=gnome-base/gnome-common-2
>=dev-util/gtk-doc-am-1.9
>=sys-devel/gettext-0.17
- doc? ( >=dev-util/gtk-doc-1.9 )
+ doc? ( >=dev-util/gtk-doc-1.14 )
vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
# eautoreconf needs:
# >=gnome-base/gnome-common-2
@@ -72,6 +73,7 @@ pkg_setup() {
DOCS="ChangeLog MAINTAINERS NEWS TODO"
# Uh, what to do about dbus-call-timeout ?
G2CONF="${G2CONF}
+ --disable-schemas-compile
VALAC=$(type -P valac-0.14)
VAPIGEN=$(type -P vapigen-0.14)
$(use_enable gnome-online-accounts goa)
@@ -79,13 +81,11 @@ pkg_setup() {
$(use_enable ipv6)
$(use_with kerberos krb5 ${EPREFIX}/usr)
$(use_with ldap openldap)
- $(use_enable ssl ssl)
- $(use_enable ssl smime)
$(use_enable vala vala-bindings)
$(use_enable weather)
- --enable-calendar
--enable-nntp
--enable-largefile
+ --enable-smime
--with-libdb=${EPREFIX}/usr"
}
diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-3.3.91.ebuild
similarity index 92%
copy from mail-client/evolution/evolution-9999.ebuild
copy to mail-client/evolution/evolution-3.3.91.ebuild
index c780f83..95c29ce 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-3.3.91.ebuild
@@ -28,13 +28,12 @@ IUSE="clutter connman crypt doc +gnome-online-accounts gstreamer kerberos ldap m
# password from inside evolution, bug 160302
PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
-# contacts-map plugin requires libchaimplain and geoclue
# glade-3 support is for maintainers only per configure.ac
# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
# pst is not mature enough and changes API/ABI frequently
-COMMON_DEPEND=">=dev-libs/glib-2.28:2
+COMMON_DEPEND=">=dev-libs/glib-2.30:2
>=x11-libs/cairo-1.9.15[glib]
- >=x11-libs/gtk+-3.0.2:3
+ >=x11-libs/gtk+-3.2.0:3
>=gnome-base/gnome-desktop-2.91.3:3
>=gnome-base/gsettings-desktop-schemas-2.91.92
>=dev-libs/libgweather-2.90.0:2
@@ -48,7 +47,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28: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.9.1
+ >=dev-libs/libgdata-0.10
x11-libs/libSM
x11-libs/libICE
@@ -68,8 +67,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
kerberos? ( virtual/krb5 )
ldap? ( >=net-nds/openldap-2 )
map? (
- >=app-misc/geoclue-0.11.1
- media-libs/libchamplain:0.10 )
+ >=app-misc/geoclue-0.12.0
+ >=media-libs/libchamplain-0.12:0.12 )
networkmanager? ( >=net-misc/networkmanager-0.7 )
ssl? (
>=dev-libs/nspr-4.6.1
@@ -84,7 +83,7 @@ DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
>=gnome-base/gnome-common-2.12
>=dev-util/gtk-doc-am-1.9
- doc? ( >=dev-util/gtk-doc-1.9 )"
+ doc? ( >=dev-util/gtk-doc-1.14 )"
# eautoreconf needs:
# >=gnome-base/gnome-common-2.12
# >=dev-util/gtk-doc-am-1.9
@@ -102,6 +101,7 @@ pkg_setup() {
DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
G2CONF="${G2CONF}
+ --disable-schemas-compile
--without-glade-catalog
--without-kde-applnk-path
--enable-plugins=experimental
@@ -143,10 +143,6 @@ pkg_setup() {
}
src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf
- epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch"
- [[ ${PV} != 9999 ]] && eautoreconf
-
gnome2_src_prepare
# Fix compilation flags crazyness
diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index c780f83..95c29ce 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -28,13 +28,12 @@ IUSE="clutter connman crypt doc +gnome-online-accounts gstreamer kerberos ldap m
# password from inside evolution, bug 160302
PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
-# contacts-map plugin requires libchaimplain and geoclue
# glade-3 support is for maintainers only per configure.ac
# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
# pst is not mature enough and changes API/ABI frequently
-COMMON_DEPEND=">=dev-libs/glib-2.28:2
+COMMON_DEPEND=">=dev-libs/glib-2.30:2
>=x11-libs/cairo-1.9.15[glib]
- >=x11-libs/gtk+-3.0.2:3
+ >=x11-libs/gtk+-3.2.0:3
>=gnome-base/gnome-desktop-2.91.3:3
>=gnome-base/gsettings-desktop-schemas-2.91.92
>=dev-libs/libgweather-2.90.0:2
@@ -48,7 +47,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.28: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.9.1
+ >=dev-libs/libgdata-0.10
x11-libs/libSM
x11-libs/libICE
@@ -68,8 +67,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.28:2
kerberos? ( virtual/krb5 )
ldap? ( >=net-nds/openldap-2 )
map? (
- >=app-misc/geoclue-0.11.1
- media-libs/libchamplain:0.10 )
+ >=app-misc/geoclue-0.12.0
+ >=media-libs/libchamplain-0.12:0.12 )
networkmanager? ( >=net-misc/networkmanager-0.7 )
ssl? (
>=dev-libs/nspr-4.6.1
@@ -84,7 +83,7 @@ DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
>=gnome-base/gnome-common-2.12
>=dev-util/gtk-doc-am-1.9
- doc? ( >=dev-util/gtk-doc-1.9 )"
+ doc? ( >=dev-util/gtk-doc-1.14 )"
# eautoreconf needs:
# >=gnome-base/gnome-common-2.12
# >=dev-util/gtk-doc-am-1.9
@@ -102,6 +101,7 @@ pkg_setup() {
DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
G2CONF="${G2CONF}
+ --disable-schemas-compile
--without-glade-catalog
--without-kde-applnk-path
--enable-plugins=experimental
@@ -143,10 +143,6 @@ pkg_setup() {
}
src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf
- epatch "${FILESDIR}/${PN}-3.2.1-reorder-mx-clutter-gtk.patch"
- [[ ${PV} != 9999 ]] && eautoreconf
-
gnome2_src_prepare
# Fix compilation flags crazyness
diff --git a/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch b/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch
deleted file mode 100644
index 6df8f2b..0000000
--- a/mail-client/evolution/files/evolution-3.2.1-reorder-mx-clutter-gtk.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1c036f9a0a922f68fbbf09540a14173465e51a1e Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 31 Oct 2011 02:15:54 -0400
-Subject: [PATCH] reorder mx-1.0 and clutter-gtk-1.0 in PKG_CHECK_MODULES:q
-
-clutter-gtk-1.0 installs headers in /usr/include/clutter-gtk-1.0/clutter-gtk;
-clutter-gtk-0.10 installs headers in /usr/include/clutter-1.0/clutter-gtk
-
-To ensure that clutter-gtk-1.0's headers (and not 0.10's) are used,
--I/usr/include/clutter-gtk-1.0 must come before -I/usr/include/clutter-1.0
-in CLUTTER_CFLAGS. And that means clutter-gtk-1.0 must come before mx-1.0
-in PKG_CHECK_MODULES.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=663077
----
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5c2c5ed..b5c74ee 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -596,7 +596,7 @@ AC_ARG_WITH([clutter],
- AC_MSG_RESULT($with_clutter)
-
- if test "x$with_clutter" = "xyes"; then
-- PKG_CHECK_MODULES(CLUTTER, [mx-1.0 clutter-gtk-1.0 >= clutter_gtk_minimum_version clutter-1.0 >= 1.0.0])
-+ PKG_CHECK_MODULES(CLUTTER, [clutter-gtk-1.0 >= clutter_gtk_minimum_version mx-1.0 clutter-1.0 >= 1.0.0])
-
- AC_DEFINE(HAVE_CLUTTER, 1, [Clutter available])
- AM_CONDITIONAL(ENABLE_CLUTTER, true)
---
-1.7.7.1
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/, mail-client/evolution/, ...
@ 2012-03-21 22:20 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2012-03-21 22:20 UTC (permalink / raw
To: gentoo-commits
commit: e0c5bd6d4a06760e2390668bdb0543ab508ef4c7
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 21 22:11:13 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Mar 21 22:11:13 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e0c5bd6d
mail-client/evolution et al.: 3.3.91 → 3.3.92
The map patch was applied upstream.
---
....ebuild => evolution-data-server-3.3.92.ebuild} | 1 +
.../evolution-data-server-9999.ebuild | 1 +
....91.ebuild => evolution-exchange-3.3.92.ebuild} | 0
...91.ebuild => evolution-groupwise-3.3.92.ebuild} | 0
...on-3.3.91-r1.ebuild => evolution-3.3.92.ebuild} | 4 +-
mail-client/evolution/evolution-9999.ebuild | 1 +
.../evolution/files/evolution-3.3.91-map.patch | 59 --------------------
7 files changed, 4 insertions(+), 62 deletions(-)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.3.91.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.3.92.ebuild
similarity index 99%
rename from gnome-extra/evolution-data-server/evolution-data-server-3.3.91.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-3.3.92.ebuild
index a7ec0be..4cbd682 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.3.91.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.3.92.ebuild
@@ -31,6 +31,7 @@ RDEPEND=">=dev-libs/glib-2.30:2
>=dev-db/sqlite-3.5
>=dev-libs/libgdata-0.10
>=gnome-base/gnome-keyring-2.20.1
+ >=dev-libs/dbus-glib-0.6
>=dev-libs/libical-0.43
>=net-libs/libsoup-2.31.2:2.4
>=dev-libs/libxml2-2
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
index a7ec0be..4cbd682 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -31,6 +31,7 @@ RDEPEND=">=dev-libs/glib-2.30:2
>=dev-db/sqlite-3.5
>=dev-libs/libgdata-0.10
>=gnome-base/gnome-keyring-2.20.1
+ >=dev-libs/dbus-glib-0.6
>=dev-libs/libical-0.43
>=net-libs/libsoup-2.31.2:2.4
>=dev-libs/libxml2-2
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-3.3.91.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-3.3.92.ebuild
similarity index 100%
rename from gnome-extra/evolution-exchange/evolution-exchange-3.3.91.ebuild
rename to gnome-extra/evolution-exchange/evolution-exchange-3.3.92.ebuild
diff --git a/gnome-extra/evolution-groupwise/evolution-groupwise-3.3.91.ebuild b/gnome-extra/evolution-groupwise/evolution-groupwise-3.3.92.ebuild
similarity index 100%
rename from gnome-extra/evolution-groupwise/evolution-groupwise-3.3.91.ebuild
rename to gnome-extra/evolution-groupwise/evolution-groupwise-3.3.92.ebuild
diff --git a/mail-client/evolution/evolution-3.3.91-r1.ebuild b/mail-client/evolution/evolution-3.3.92.ebuild
similarity index 98%
rename from mail-client/evolution/evolution-3.3.91-r1.ebuild
rename to mail-client/evolution/evolution-3.3.92.ebuild
index f6ea5b4..07c6b57 100644
--- a/mail-client/evolution/evolution-3.3.91-r1.ebuild
+++ b/mail-client/evolution/evolution-3.3.92.ebuild
@@ -43,6 +43,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
>=gnome-extra/gtkhtml-4.1.2:4.0
>=gnome-base/gconf-2:2
dev-libs/atk
+ >=dev-libs/dbus-glib-0.6
>=dev-libs/libxml2-2.7.3:2
>=net-libs/libsoup-gnome-2.31.2:2.4
>=x11-misc/shared-mime-info-0.22
@@ -143,9 +144,6 @@ pkg_setup() {
}
src_prepare() {
- # Fix build with USE=map; in next version
- epatch "${FILESDIR}/${P}-map.patch"
-
# Fix paths for Gentoo spamassassin executables
epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
sed -e "s:@EPREFIX@:${EPREFIX}:g" \
diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index 4c7dac5..07c6b57 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -43,6 +43,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
>=gnome-extra/gtkhtml-4.1.2:4.0
>=gnome-base/gconf-2:2
dev-libs/atk
+ >=dev-libs/dbus-glib-0.6
>=dev-libs/libxml2-2.7.3:2
>=net-libs/libsoup-gnome-2.31.2:2.4
>=x11-misc/shared-mime-info-0.22
diff --git a/mail-client/evolution/files/evolution-3.3.91-map.patch b/mail-client/evolution/files/evolution-3.3.91-map.patch
deleted file mode 100644
index 371d92b..0000000
--- a/mail-client/evolution/files/evolution-3.3.91-map.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From f30355445fd20b6d443d012eb1f1758dbe8d096a Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@redhat.com>
-Date: Fri, 9 Mar 2012 13:38:57 -0500
-Subject: [PATCH] Bug 671716 - Fails to build with --enable-contact-maps
-
----
- widgets/misc/e-contact-map-window.c | 4 ++++
- widgets/misc/e-contact-map.c | 4 ++++
- widgets/misc/e-contact-marker.c | 4 ++++
- 3 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/widgets/misc/e-contact-map-window.c b/widgets/misc/e-contact-map-window.c
-index 87ce665..d80aa17 100644
---- a/widgets/misc/e-contact-map-window.c
-+++ b/widgets/misc/e-contact-map-window.c
-@@ -39,6 +39,10 @@
- #include <glib/gi18n.h>
- #include <glib-object.h>
-
-+#define E_CONTACT_MAP_WINDOW_GET_PRIVATE(obj) \
-+ (G_TYPE_INSTANCE_GET_PRIVATE \
-+ ((obj), E_TYPE_CONTACT_MAP, EContactMapWindowPrivate))
-+
- G_DEFINE_TYPE (EContactMapWindow, e_contact_map_window, GTK_TYPE_WINDOW)
-
- struct _EContactMapWindowPrivate {
-diff --git a/widgets/misc/e-contact-map.c b/widgets/misc/e-contact-map.c
-index 7158aae..b9c2a99 100644
---- a/widgets/misc/e-contact-map.c
-+++ b/widgets/misc/e-contact-map.c
-@@ -42,6 +42,10 @@
- #include <glib/gi18n.h>
- #include <math.h>
-
-+#define E_CONTACT_MAP_GET_PRIVATE(obj) \
-+ (G_TYPE_INSTANCE_GET_PRIVATE \
-+ ((obj), E_TYPE_CONTACT_MAP, EContactMapPrivate))
-+
- G_DEFINE_TYPE (EContactMap, e_contact_map, GTK_CHAMPLAIN_TYPE_EMBED)
-
- struct _EContactMapPrivate {
-diff --git a/widgets/misc/e-contact-marker.c b/widgets/misc/e-contact-marker.c
-index 2f7c2cb..d7e5ad6 100644
---- a/widgets/misc/e-contact-marker.c
-+++ b/widgets/misc/e-contact-marker.c
-@@ -38,6 +38,10 @@
- #include <math.h>
- #include <string.h>
-
-+#define E_CONTACT_MARKER_GET_PRIVATE(obj) \
-+ (G_TYPE_INSTANCE_GET_PRIVATE \
-+ ((obj), E_TYPE_CONTACT_MARKER, EContactMarkerPrivate))
-+
- G_DEFINE_TYPE (EContactMarker, e_contact_marker, CHAMPLAIN_TYPE_LABEL);
-
- struct _EContactMarkerPrivate
---
-1.7.8.5
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-21 22:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-15 15:44 [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/, mail-client/evolution/, Nirbheek Chauhan
-- strict thread matches above, loose matches on Subject: below --
2012-03-21 22:20 Alexandre Restovtsev
2011-03-06 22:19 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox