Improve glib-2.32 fix (bug #412239, thanks to Dmitry K). Fix crash and build failure with gtkhtml-4.4. Drop old.

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

4 files changed, 66 insertions, 12 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 9ec1b3b2ea26..a74cb1dddda6 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,15 @@
 # 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.359 2012/04/19 20:38:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.360 2012/04/20 05:51:19 tetromino Exp $
+
+*evolution-3.2.3-r1 (20 Apr 2012)
+
+  20 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -evolution-3.2.2.ebuild, +evolution-3.2.3-r1.ebuild,
+  files/evolution-3.2.3-g_thread_init.patch,
+  +files/evolution-3.2.3-gtkhtml-4.4.patch:
+  Improve glib-2.32 fix (bug #412239, thanks to Dmitry K). Fix crash and build
+  failure with gtkhtml-4.4. Drop old.
 
   19 Apr 2012; Brent Baude <ranger@gentoo.org> evolution-2.32.3-r1.ebuild:
   Marking evolution-2.32.3-r1 ppc64 stable for bug 410611
diff --git a/mail-client/evolution/evolution-3.2.2.ebuild b/mail-client/evolution/evolution-3.2.3-r1.ebuild
index 8d525d72307a..d26c9325ebe2 100644
--- a/mail-client/evolution/evolution-3.2.2.ebuild
+++ b/mail-client/evolution/evolution-3.2.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-3.2.2.ebuild,v 1.2 2012/02/10 03:29:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.3-r1.ebuild,v 1.1 2012/04/20 05:51:19 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -138,13 +138,14 @@ 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"
+	epatch "${FILESDIR}/${P}-g_thread_init.patch"
+	# Fix crashes and linking failure with gtkhtml-4.4
+	epatch "${FILESDIR}/${P}-gtkhtml-4.4.patch"
 	eautoreconf
 
 	gnome2_src_prepare
-
-	# Fix compilation flags crazyness
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "CPPFLAGS sed failed"
 }
 
 pkg_postinst() {
diff --git a/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch b/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch
index d34d859994ce..915de364caf6 100644
--- a/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch
+++ b/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch
@@ -1,19 +1,21 @@
-From 8c67e84f9bf1803108f7a004513e37c6ef22d41f Mon Sep 17 00:00:00 2001
+From ed7f672fa38aa1528e9eca5419176e0f8a9583f6 Mon Sep 17 00:00:00 2001
 From: Milan Crha <mcrha@redhat.com>
 Date: Mon, 24 Oct 2011 09:42:48 +0200
 Subject: [PATCH] Call g_thread_init() conditionally
 
+[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 3.2.3]
 ---
  capplet/anjal-settings-main.c         |    2 ++
  capplet/settings/mail-guess-servers.c |    2 ++
+ plugins/backup-restore/backup.c       |    2 ++
  shell/main.c                          |    2 ++
- 3 files changed, 6 insertions(+), 0 deletions(-)
+ 4 files changed, 8 insertions(+), 0 deletions(-)
 
 diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
-index 99e0b4a..91e3690 100644
+index 2bc3268..c810db3 100644
 --- a/capplet/anjal-settings-main.c
 +++ b/capplet/anjal-settings-main.c
-@@ -167,8 +167,10 @@ main (gint argc,
+@@ -168,8 +168,10 @@ main (gint argc,
  	if (!gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error))
  		g_error ("%s", error->message);
  
@@ -38,11 +40,25 @@ index 0b14494..0b15271 100644
  	g_type_init ();
  
  	provider = g_new0 (EmailProvider, 1);
+diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
+index 370608a..1e0ecb5 100644
+--- a/plugins/backup-restore/backup.c
++++ b/plugins/backup-restore/backup.c
+@@ -691,7 +691,9 @@ main (gint argc,
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 	textdomain (GETTEXT_PACKAGE);
+ 
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++	#endif
+ 
+ 	gtk_init_with_args (
+ 		&argc, &argv, NULL, options, (gchar *) GETTEXT_PACKAGE, &error);
 diff --git a/shell/main.c b/shell/main.c
-index bb056e3..5b76a2e 100644
+index 36e67d1..f0afc5a 100644
 --- a/shell/main.c
 +++ b/shell/main.c
-@@ -492,8 +492,10 @@ main (gint argc,
+@@ -509,8 +509,10 @@ main (gint argc,
  	textdomain (GETTEXT_PACKAGE);
  
  	g_type_init ();
diff --git a/mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch b/mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch
new file mode 100644
index 000000000000..24b6cf98ba88
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.2.3-gtkhtml-4.4.patch
@@ -0,0 +1,28 @@
+From 739cec4c2bfb1a89fd512315f573ef2313040c31 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 20 Apr 2012 01:39:35 -0400
+Subject: [PATCH] gtkhtml_editor_file_chooser_dialog_run() was removed in
+ gtkhtml-4.4
+
+It is no longer needed with gtk+-3.2.
+---
+ composer/e-composer-actions.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
+index 163270f..cd50f7a 100644
+--- a/composer/e-composer-actions.c
++++ b/composer/e-composer-actions.c
+@@ -218,8 +218,7 @@ action_save_as_cb (GtkAction *action,
+ 	gtk_window_set_icon_name (
+ 		GTK_WINDOW (dialog), "mail-message-new");
+ 
+-	response = gtkhtml_editor_file_chooser_dialog_run (
+-		GTKHTML_EDITOR (composer), dialog);
++	response = gtk_dialog_run (GTK_DIALOG (dialog));
+ 
+ 	if (response != GTK_RESPONSE_OK)
+ 		goto exit;
+-- 
+1.7.8.5
+