diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-04-15 20:24:03 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-04-15 20:24:03 +0000 |
| commit | 3dadae040f9d50d2bb1e84145ad6da83ae8f8756 (patch) | |
| tree | b45029fa2cf874f24a8c5f7898017682acdbeda5 /mail-client/evolution | |
| parent | Use new makeopts_jobs helper from eutils.eclass. (diff) | |
| download | gentoo-2-3dadae040f9d50d2bb1e84145ad6da83ae8f8756.tar.gz gentoo-2-3dadae040f9d50d2bb1e84145ad6da83ae8f8756.tar.bz2 gentoo-2-3dadae040f9d50d2bb1e84145ad6da83ae8f8756.zip | |
Fix building with glib-2.32 (bug #412111, thanks to Peter Alfredsen).
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'mail-client/evolution')
5 files changed, 62 insertions, 3 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog index 45b6f1751e72..2def22596468 100644 --- a/mail-client/evolution/ChangeLog +++ b/mail-client/evolution/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-client/evolution # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.355 2012/02/10 03:29:22 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.356 2012/04/15 20:24:03 tetromino Exp $ + + 15 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + evolution-2.32.3-r1.ebuild, +files/evolution-2.32.3-gmodule-explicit.patch, + evolution-3.2.3.ebuild, +files/evolution-3.2.3-gmodule-explicit.patch: + Fix building with glib-2.32 (bug #412111, thanks to Peter Alfredsen). 10 Feb 2012; Patrick Lauer <patrick@gentoo.org> evolution-2.32.2-r3.ebuild, evolution-2.32.3-r1.ebuild, evolution-2.32.3.ebuild, evolution-3.2.2.ebuild, diff --git a/mail-client/evolution/evolution-2.32.3-r1.ebuild b/mail-client/evolution/evolution-2.32.3-r1.ebuild index cecb828664ea..2b7338f12d73 100644 --- a/mail-client/evolution/evolution-2.32.3-r1.ebuild +++ b/mail-client/evolution/evolution-2.32.3-r1.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/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.5 2012/02/10 03:29:22 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.6 2012/04/15 20:24:03 tetromino Exp $ EAPI="3" GCONF_DEBUG="no" @@ -146,6 +146,9 @@ src_prepare() { # Fix desktop file to work with latest glib epatch "${FILESDIR}/${PN}-2.32.2-mime-handler.patch" + # Fix build failure with glib-2.32, bug #412111 + epatch "${FILESDIR}/${P}-gmodule-explicit.patch" + # Apply multiple backports from master fixing important bugs epatch "${WORKDIR}/${P}-patches"/*.patch diff --git a/mail-client/evolution/evolution-3.2.3.ebuild b/mail-client/evolution/evolution-3.2.3.ebuild index cf48fb94fa1a..dff2f9716a98 100644 --- a/mail-client/evolution/evolution-3.2.3.ebuild +++ b/mail-client/evolution/evolution-3.2.3.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/mail-client/evolution/evolution-3.2.3.ebuild,v 1.2 2012/02/10 03:29:22 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.3.ebuild,v 1.3 2012/04/15 20:24:03 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -138,6 +138,8 @@ 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" + # Fix build failure with glib-2.32 + epatch "${FILESDIR}/${P}-gmodule-explicit.patch" eautoreconf gnome2_src_prepare diff --git a/mail-client/evolution/files/evolution-2.32.3-gmodule-explicit.patch b/mail-client/evolution/files/evolution-2.32.3-gmodule-explicit.patch new file mode 100644 index 000000000000..691cef031fc0 --- /dev/null +++ b/mail-client/evolution/files/evolution-2.32.3-gmodule-explicit.patch @@ -0,0 +1,25 @@ +From d4091974aec007fb7130e1ba21be76b2c9590a98 Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau <teuf@gnome.org> +Date: Tue, 13 Dec 2011 09:09:05 -0500 +Subject: [PATCH] Bug 665782 - configure.ac: Add gmodule-2.0 to GNOME_PLATFORM + +[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.32] +--- + configure.ac | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ab40e36..7878160 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -303,6 +303,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 >= $gtk_minimum_version + $GAIL >= $gail_minimum_version + gconf-2.0 >= gconf_minimum_version +-- +1.7.8.5 + diff --git a/mail-client/evolution/files/evolution-3.2.3-gmodule-explicit.patch b/mail-client/evolution/files/evolution-3.2.3-gmodule-explicit.patch new file mode 100644 index 000000000000..74cb319030f3 --- /dev/null +++ b/mail-client/evolution/files/evolution-3.2.3-gmodule-explicit.patch @@ -0,0 +1,24 @@ +From d459b0885f427588ff5d45c84065a1534034d966 Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau <teuf@gnome.org> +Date: Tue, 13 Dec 2011 09:09:05 -0500 +Subject: [PATCH] Bug 665782 - configure.ac: Add gmodule-2.0 to GNOME_PLATFORM + +--- + configure.ac | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 128bd1f..047ffee 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -242,6 +242,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 + cairo-gobject + gtk+-3.0 >= gtk_minimum_version + gail-3.0 >= gtk_minimum_version +-- +1.7.8.5 + |