[gentoo-commits] proj/gnome:gnome-next commit in: mail-client/evolution/, mail-client/evolution/files/

[Alexandre Restovtsev]

commit:     5944071002deb8cce3f9551c531a725ab5e29708
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Sep  1 23:05:02 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Sep  1 23:05:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=59440710

mail-client/evolution: add upstream patches to fix build

No version bump since people who already installed evolution should not
need to recompile. Fixes linking with new versions of gtk+ and adapts to
API changes in glib-2.29.19.

---
 mail-client/evolution/evolution-3.1.90.ebuild      |    4 +++
 .../files/evolution-3.1.90-g_unix_signal.patch     |   28 ++++++++++++++++++++
 .../evolution/files/evolution-3.1.90-libm.patch    |   25 +++++++++++++++++
 3 files changed, 57 insertions(+), 0 deletions(-)

diff --git a/mail-client/evolution/evolution-3.1.90.ebuild b/mail-client/evolution/evolution-3.1.90.ebuild
index 49c720f..3a88b51 100644
--- a/mail-client/evolution/evolution-3.1.90.ebuild
+++ b/mail-client/evolution/evolution-3.1.90.ebuild
@@ -157,6 +157,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Important build fixes from upstream, will be in next release
+	epatch "${FILESDIR}/${P}-libm.patch"
+	epatch "${FILESDIR}/${P}-g_unix_signal.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/files/evolution-3.1.90-g_unix_signal.patch b/mail-client/evolution/files/evolution-3.1.90-g_unix_signal.patch
new file mode 100644
index 0000000..eb69f5a
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.1.90-g_unix_signal.patch
@@ -0,0 +1,28 @@
+From 3e3860e0ecc9f330c7c0df143641a01073ad976c Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@××××××.com>
+Date: Wed, 31 Aug 2011 16:30:56 +0000
+Subject: Bug 657836 - Work around g_unix_signal API changes.
+
+Work around GLib API churn with regard to registering UNIX signal
+callbacks on the main loop.  GLib >= 2.29.5 calls the function one
+thing, GLib >= 2.29.19 calls it another.
+---
+diff --git a/shell/main.c b/shell/main.c
+index 95dc1b9..8e1d533 100644
+--- a/shell/main.c
++++ b/shell/main.c
+@@ -613,7 +613,11 @@ main (gint argc, gchar **argv)
+ 	}
+ 
+ #ifdef G_OS_UNIX
+-#if GLIB_CHECK_VERSION(2,29,5)
++#if GLIB_CHECK_VERSION(2,29,19)
++	g_unix_signal_add_full (
++		G_PRIORITY_DEFAULT, SIGTERM,
++		handle_term_signal, NULL, NULL);
++#elif GLIB_CHECK_VERSION(2,29,5)
+ 	g_unix_signal_add_watch_full (
+ 		SIGTERM, G_PRIORITY_DEFAULT,
+ 		handle_term_signal, NULL, NULL);
+--
+cgit v0.9.0.2

diff --git a/mail-client/evolution/files/evolution-3.1.90-libm.patch b/mail-client/evolution/files/evolution-3.1.90-libm.patch
new file mode 100644
index 0000000..97b78c0
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.1.90-libm.patch
@@ -0,0 +1,25 @@
+From bd719c5fd879e96450d81339ff85f525a1ad8a13 Mon Sep 17 00:00:00 2001
+From: Frederic Peters <fpeters@××.be>
+Date: Wed, 31 Aug 2011 01:24:21 +0000
+Subject: Bug 657765 - Explicitly link libgnomecanvas against libm
+
+We used to implicitly link to libm through gtk+, but that got dropped.
+
+http://mail.gnome.org/archives/desktop-devel-list/2011-August/msg00236.html
+---
+diff --git a/libgnomecanvas/Makefile.am b/libgnomecanvas/Makefile.am
+index 4032c85..bb6366b 100644
+--- a/libgnomecanvas/Makefile.am
++++ b/libgnomecanvas/Makefile.am
+@@ -59,7 +59,8 @@ MARSHAL_GENERATED =				\
+ 	gnome-canvas-marshal.h
+ 
+ libgnomecanvas_la_LIBADD = \
+-	$(GNOME_PLATFORM_LIBS)
++	$(GNOME_PLATFORM_LIBS) \
++	$(MATH_LIB)
+ 
+ libgnomecanvas_la_LDFLAGS = $(NO_UNDEFINED)
+ 
+--
+cgit v0.9.0.2