Add another glib-2.32 fix, thanks to Yaw_e and Dmitry K (bug #412239).

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

5 files changed, 160 insertions, 6 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 2def22596468..bf7439bcb64f 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.356 2012/04/15 20:24:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.357 2012/04/16 18:14:52 tetromino Exp $
+
+  16 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-2.32.3-r1.ebuild, +files/evolution-2.32.3-g_thread_init.patch,
+  evolution-3.2.3.ebuild, +files/evolution-3.2.3-g_thread_init.patch:
+  Add another glib-2.32 fix, thanks to Yaw_e and Dmitry K (bug #412239).
 
   15 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   evolution-2.32.3-r1.ebuild, +files/evolution-2.32.3-gmodule-explicit.patch,
diff --git a/mail-client/evolution/evolution-2.32.3-r1.ebuild b/mail-client/evolution/evolution-2.32.3-r1.ebuild
index 2b7338f12d73..425de6efcd21 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.6 2012/04/15 20:24:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.7 2012/04/16 18:14:52 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -146,12 +146,13 @@ 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
 
+	# Fix build failure with glib-2.32, bug #412111
+	epatch "${FILESDIR}/${P}-gmodule-explicit.patch"
+	epatch "${FILESDIR}/${P}-g_thread_init.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/evolution-3.2.3.ebuild b/mail-client/evolution/evolution-3.2.3.ebuild
index dff2f9716a98..c68fb35f9772 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.3 2012/04/15 20:24:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.3.ebuild,v 1.4 2012/04/16 18:14:52 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -140,6 +140,7 @@ src_prepare() {
 	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"
 	eautoreconf
 
 	gnome2_src_prepare
diff --git a/mail-client/evolution/files/evolution-2.32.3-g_thread_init.patch b/mail-client/evolution/files/evolution-2.32.3-g_thread_init.patch
new file mode 100644
index 000000000000..28741f226376
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.32.3-g_thread_init.patch
@@ -0,0 +1,89 @@
+From 363aef1952cc3fffaa6c7d49d3c793c77a7dc70c 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 2.32]
+---
+ calendar/gui/alarm-notify/notify-main.c |    2 ++
+ capplet/anjal-settings-main.c           |    2 ++
+ capplet/settings/mail-guess-servers.c   |    2 ++
+ plugins/backup-restore/backup.c         |    2 ++
+ shell/main.c                            |    2 ++
+ 5 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
+index 6104610..3ee8e9c 100644
+--- a/calendar/gui/alarm-notify/notify-main.c
++++ b/calendar/gui/alarm-notify/notify-main.c
+@@ -87,7 +87,9 @@ main (gint argc, gchar **argv)
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 	textdomain (GETTEXT_PACKAGE);
+ 
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++	#endif
+ 
+ #ifdef G_OS_WIN32
+ 	path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL);
+diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
+index 7b6e252..f338863 100644
+--- a/capplet/anjal-settings-main.c
++++ b/capplet/anjal-settings-main.c
+@@ -247,8 +247,10 @@ main (gint argc, gchar *argv[])
+ 		g_error_free(error);
+ 	}
+ 
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	if (!g_thread_get_initialized ())
+ 		g_thread_init (NULL);
++	#endif
+ 
+ 	client = gconf_client_get_default();
+ 
+diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c
+index 69e0d8d..bb2fb9d 100644
+--- a/capplet/settings/mail-guess-servers.c
++++ b/capplet/settings/mail-guess-servers.c
+@@ -325,7 +325,9 @@ gint
+ main (gint argc, gchar **argv)
+ {
+ 	EmailProvider *provider;
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++	#endif
+ 	g_type_init ();
+ 
+ 	provider = g_new0(EmailProvider, 1);
+diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
+index e90c73d..f23c562 100644
+--- a/plugins/backup-restore/backup.c
++++ b/plugins/backup-restore/backup.c
+@@ -663,7 +663,9 @@ main (gint argc, gchar **argv)
+ 	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 3ab9d7e..788c91b 100644
+--- a/shell/main.c
++++ b/shell/main.c
+@@ -520,8 +520,10 @@ main (gint argc, gchar **argv)
+ 	}
+ 
+ 	g_type_init ();
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	if (!g_thread_get_initialized ())
+ 		g_thread_init (NULL);
++	#endif
+ 
+ 	#ifdef HAVE_ICAL_UNKNOWN_TOKEN_HANDLING
+ 	ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN);
+-- 
+1.7.8.5
+
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
new file mode 100644
index 000000000000..d34d859994ce
--- /dev/null
+++ b/mail-client/evolution/files/evolution-3.2.3-g_thread_init.patch
@@ -0,0 +1,58 @@
+From 8c67e84f9bf1803108f7a004513e37c6ef22d41f 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
+
+---
+ capplet/anjal-settings-main.c         |    2 ++
+ capplet/settings/mail-guess-servers.c |    2 ++
+ shell/main.c                          |    2 ++
+ 3 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
+index 99e0b4a..91e3690 100644
+--- a/capplet/anjal-settings-main.c
++++ b/capplet/anjal-settings-main.c
+@@ -167,8 +167,10 @@ main (gint argc,
+ 	if (!gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error))
+ 		g_error ("%s", error->message);
+ 
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	if (!g_thread_get_initialized ())
+ 		g_thread_init (NULL);
++	#endif
+ 
+ 	e_passwords_init ();
+ 	categories_icon_theme_hack ();
+diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c
+index 0b14494..0b15271 100644
+--- a/capplet/settings/mail-guess-servers.c
++++ b/capplet/settings/mail-guess-servers.c
+@@ -343,7 +343,9 @@ main (gint argc,
+       gchar **argv)
+ {
+ 	EmailProvider *provider;
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++	#endif
+ 	g_type_init ();
+ 
+ 	provider = g_new0 (EmailProvider, 1);
+diff --git a/shell/main.c b/shell/main.c
+index bb056e3..5b76a2e 100644
+--- a/shell/main.c
++++ b/shell/main.c
+@@ -492,8 +492,10 @@ main (gint argc,
+ 	textdomain (GETTEXT_PACKAGE);
+ 
+ 	g_type_init ();
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	if (!g_thread_get_initialized ())
+ 		g_thread_init (NULL);
++	#endif
+ 
+ 	/* do not require Gtk+ for --force-shutdown */
+ 	if (argc == 2 && argv[1] && g_str_equal (argv[1], "--force-shutdown")) {
+-- 
+1.7.8.5
+