Fix building with glib-2.32 (bug #412109, thanks to Peter Alfredsen).

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

3 files changed, 62 insertions, 2 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index f97ed67d95d7..2a2e529f7c67 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.326 2012/02/24 23:22:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.327 2012/04/15 19:58:05 tetromino Exp $
+
+  15 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-data-server-2.32.3-r2.ebuild,
+  +files/evolution-data-server-2.32.3-gmodule-explicit.patch:
+  Fix building with glib-2.32 (bug #412109, thanks to Peter Alfredsen).
 
 *evolution-data-server-3.2.3-r1 (24 Feb 2012)
 
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
index 5ce31b8fb045..00788bdf08f6 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild,v 1.1 2012/02/12 17:25:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild,v 1.2 2012/04/15 19:58:05 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -92,6 +92,9 @@ src_prepare() {
 	# Upstream bug #655167 - Messages moved from IMAP Inbox reappear
 	epatch "${FILESDIR}/${P}-imap-move.patch"
 
+	# Fix building with glib-2.32, bug #412109
+	epatch "${FILESDIR}/${P}-gmodule-explicit.patch"
+
 	# /usr/include/db.h is always db-1 on FreeBSD
 	# so include the right dir in CPPFLAGS
 	append-cppflags "-I$(db_includedir)"
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-gmodule-explicit.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-gmodule-explicit.patch
new file mode 100644
index 000000000000..3e1f4ed3f936
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-gmodule-explicit.patch
@@ -0,0 +1,52 @@
+From be8a4f87a7187e0da249cd66444125d25e76afb1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20L=C3=B3pez=20Le=C3=B3n?= <dieguitoll@gmail.com>
+Date: Tue, 29 Nov 2011 19:34:12 -0600
+Subject: [PATCH] Bug 664819 - gmodule-2.0 dependency must be explicit
+
+[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.32.3]
+---
+ configure.ac |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0879fcf..9ff3dab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -319,6 +319,7 @@ dnl Check for base dependencies early.
+ dnl ***********************************
+ PKG_CHECK_MODULES(GNOME_PLATFORM,
+ 	[gio-2.0 >= glib_minimum_version
++	gmodule-2.0 >= glib_minimum_version
+ 	$GTK_MODULE
+ 	gconf-2.0 >= gconf_minimum_version
+ 	libxml-2.0 >= libxml_minimum_version
+@@ -1198,7 +1199,7 @@ AC_DEFUN([EVO_SET_COMPILE_FLAGS], [
+ dnl ******************************
+ dnl libedataserver flags
+ dnl ******************************
+-E_DATA_SERVER_DEPS="gio-2.0 libxml-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr"
++E_DATA_SERVER_DEPS="gio-2.0 gmodule-2.0 libxml-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr"
+ 
+ EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $MANUAL_NSPR_CFLAGS, $MANUAL_NSPR_LIBS)
+ AC_SUBST(E_DATA_SERVER_CFLAGS)
+@@ -1213,7 +1214,7 @@ EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, , )
+ AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
+ AC_SUBST(E_DATA_SERVER_UI_LIBS)
+ 
+-E_BACKEND_DEPS="gio-2.0 libxml-2.0 gconf-2.0"
++E_BACKEND_DEPS="gio-2.0 gmodule-2.0 libxml-2.0 gconf-2.0"
+ 
+ dnl ******************************
+ dnl libebackend flags
+@@ -1356,7 +1357,7 @@ fi
+ 
+ AM_CONDITIONAL(ENABLE_LARGEFILE, [test "x$enable_largefile" = "xyes"])
+ 
+-EVO_SET_COMPILE_FLAGS(CAMEL, gio-2.0 $mozilla_nss sqlite3 >= sqlite_minimum_version, $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $LARGEFILE_CFLAGS, -lz $KRB5_LIBS $MANUAL_NSS_LIBS)
++EVO_SET_COMPILE_FLAGS(CAMEL, gio-2.0 gmodule-2.0 $mozilla_nss sqlite3 >= sqlite_minimum_version, $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $LARGEFILE_CFLAGS, -lz $KRB5_LIBS $MANUAL_NSS_LIBS)
+ AC_SUBST(CAMEL_CFLAGS)
+ AC_SUBST(CAMEL_LIBS)
+ AC_SUBST(CAMEL_GROUPWISE_CFLAGS)
+-- 
+1.7.8.5
+