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

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

6 files changed, 172 insertions, 16 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/Manifest b/mail-client/evolution/Manifest
index 385564dbe862..90f0b85827b3 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -5,8 +5,10 @@ AUX evolution-2.32.0-wrong-lafile-usage.patch 634 RMD160 e14b9b17faacc3590419f7f
 AUX evolution-2.32.1-libnotify-0.7.patch 2239 RMD160 b0d8f2e830e32d9bc227978074f7e9975ae1307a SHA1 64c1f4ed1311cead4071e7543704ee8eeca4e418 SHA256 73746e65a3ba190ace8bd1e5fc9d52f6a67556fac0ba8727d7705ffe74e3ce0d
 AUX evolution-2.32.2-mime-handler.patch 4169 RMD160 8ec9bd24fcaa9cff0b2e865a85a430a3ea0856ca SHA1 e974601ec51a8e79db14520d18282af893cf89c9 SHA256 ba6db000b4c38b53462c0281146e504b7212b84a6d7f5f482b375674042ff846
 AUX evolution-2.32.2-smime-fix.patch 2444 RMD160 e3f5c36d800bd7d0578f1696efe2582eb55db123 SHA1 e4ad555a982a5cd334df95d3420404dddb334d4d SHA256 3e5fae0d34cec92f01c1e66d5fdac858f39619bfcb00f8f74231c04571892362
+AUX evolution-2.32.3-g_thread_init.patch 2810 RMD160 d1bf14cc407a5515523f921bb534309d8f4e0498 SHA1 83acea3144c01172e5cfe247197b13ec46f2720c SHA256 2162851b365ceb0bf3f7963d21951156bd7dd58c875dbaf33b6714d1a3df1c68
 AUX evolution-2.32.3-gmodule-explicit.patch 808 RMD160 a1a7931e56a5d56b6b9f3b649345baa394235d96 SHA1 32ba1f7e366de333485d07ef5621926342c6788c SHA256 92e12766bcbe6e9dc46720c93ece116c4abd28a15798eb976ad0deb96da6e29c
 AUX evolution-3.2.1-reorder-mx-clutter-gtk.patch 1308 RMD160 9d6db86c94ea6f5ed9a4a1e15901f6d7c942e165 SHA1 5f26590d80512f754f7547b20e620345a3efaed0 SHA256 d05f8b29a58defb11d08fb576028b198116f069d2edae6c9545a667e35d57a40
+AUX evolution-3.2.3-g_thread_init.patch 1751 RMD160 ba8e7fada9d13d822e962889cb916b9e2528df28 SHA1 355bcd51fb6b40684321b6ddd55bcc6393cdf59e SHA256 9f6c33231d5f33b49a5857ada1ca1eb186f5023ec505e9b5c25b057746935d77
 AUX evolution-3.2.3-gmodule-explicit.patch 727 RMD160 80cc5b748f1d25aba0a1fca96fc4835cc9c1d6ae SHA1 37121a02f5164fd978190e3901f9e3b9634d28d7 SHA256 0fadbfec6a35ac569432007464ad165b51d65b16fcf95cd09c6a25a542880f54
 DIST evolution-2.32.2-patches-r1.tar.bz2 15387 RMD160 1b5279f83c5d6048294a4b320b3bbc03bcb91485 SHA1 d6a6c18eaf2cb94256971e8b4444fe7c7ba20851 SHA256 466783eadc50e06c7c34c6e5a93ddc87b3af15456f28b40e52c2e785fb324b8e
 DIST evolution-2.32.2.tar.bz2 31929154 RMD160 1d68825111309600093c8d4718e1cc001635e61d SHA1 48f25fffda1ac9c209fd02162ca298df5c03b05f SHA256 1831c7f5f00b4755869cf84ef3e3f79c4705a33e0659e72b6c1ffa4a59d4a4bb
@@ -15,20 +17,20 @@ DIST evolution-2.32.3.tar.bz2 31966138 RMD160 1b64d00a38cf8ad5c273cc4f4aee73124f
 DIST evolution-3.2.2.tar.xz 11489564 RMD160 494db8147be89f62a337dcd357c3ba0eabc1047b SHA1 cae31984cfbcd26a8848a7b94a0f4957502ae173 SHA256 03c68242bbf494dda3bf34f52ec843c282c9bb07f9415a69fe58237c7efbbe7d
 DIST evolution-3.2.3.tar.xz 12419112 RMD160 9e7f770e3fa778c0742a6d9f3d35169772355ebe SHA1 847f4657250008f1963b94718e2377687961bb3b SHA256 a25d523e775c022ec9e68d7b989316e7252b687d70b9db2f60b72bb833099e9d
 EBUILD evolution-2.32.2-r3.ebuild 5691 RMD160 2d6159c4990e2630e59c1562f664dd87918db5dd SHA1 5ad0dbe872123b0b2401b7a216ee042ac04b6014 SHA256 db9c5ead5e9417cc5dfaf756920219cd7d89636b9ddfe3acf066b247af11b109
-EBUILD evolution-2.32.3-r1.ebuild 5921 RMD160 c53241cf94bb96f0416835034f7dab5d5bb3e9ed SHA1 03af097681d44b8f621b2afa51df06d6bf3f4f76 SHA256 bd02d45e197940a39982a2fda036082ee2839b6ddefc486cfa651434e6ad4b52
+EBUILD evolution-2.32.3-r1.ebuild 5968 RMD160 a8eb37a28371d72ea13d1cdb73f5b36f00f7905f SHA1 9ba0440f72c948ffe6cbb4d6b91f923c8b692e0d SHA256 2a0b0866cb1e831e3c76e9384593c2b5a5e82ac0bbdc71079fbe2f5d05697b0a
 EBUILD evolution-2.32.3.ebuild 5544 RMD160 a5f90a45c4ec5840d414a6063fe18637943791a7 SHA1 e5c168ce2b73ada8519bf0db3230673232a1d905 SHA256 56ca1232a197a08744835fa11ae2c05935ad92660c0972852029ed3109ae05c9
 EBUILD evolution-3.2.2.ebuild 5366 RMD160 6da67f8b1023d6c1d7ff98c399a3361d494cab7f SHA1 3d366d21496324768633b2fce2042d4f22a24691 SHA256 0a1fa37472611730070aaa46da683eee91280f13ab6c5519a05bcf662b7d1f3d
-EBUILD evolution-3.2.3.ebuild 5324 RMD160 db6184cfd7396ea6276eb74ff3532d447b961c2e SHA1 2087a82ed2c0b937aa42533bb02ffc75ecce9140 SHA256 8066680426d08794c8edc788c05a27b995756ceb2ece024c40aff70c387ab33a
-MISC ChangeLog 81194 RMD160 23490ef8c33fcc3e15a60e2da7b495405665a4f4 SHA1 f75e812d4272d4157a2713ba9367b83496bdb981 SHA256 b43d852b5bb3ceb1150accd6e8dcf4359f9bafc6e8f9252da86bc2c815530f04
+EBUILD evolution-3.2.3.ebuild 5371 RMD160 6bdc133ec1e9150a591e3f7d82b115d7f3b28d1f SHA1 2a504c4ab0ade7368cf06642408d0832d7a94071 SHA256 eb04a059653daac6cdb6edf606b419b0c9f33983ad23ede8414916d6742dec82
+MISC ChangeLog 81472 RMD160 188f7f42c2b928d9eb639a997738e7580b273e51 SHA1 4c3822e729ff453eb08129b3c8e1d9ef257fc509 SHA256 fe6449cc58bf7026d0207341e488d1379a40b3a49617a01e1bde548b03b81cb2
 MISC metadata.xml 1097 RMD160 b1d9ba9ac1576e4e70d144b4db37c221ca6290dd SHA1 5f659a37f0021e82eb8fe9572d87d2af2ffe212c SHA256 fd96c4817ed5c032a35790835aa072abbee8188b443e43f591badb35f8b38147
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPiy5oAAoJEJ0WA1zPCt1hYdUIAKQa4dOlbdVdbwh2IYjuSwye
-yCa+vLeKYeqILcprVaciJAGUqXsaJYNUVAxB2fCTw+VjhamgFfIFlN96Zs60v3w8
-8J7jWEqfs32AaFipVjfa9ykDg2CnW7ciHAkhD9EJh2XbjUUlUJjQo01V+EqrTWsL
-++MsvRrtsPPM+BZa3qHHN846Fh060Njie0GgGKT5JodyIHk4PxRbAQ40Nd32SSMN
-H9C7hWS2K56805EmWzXrrucF6cHdLj2oPzlP9IVc6Gt+aq2rtzcxXf4i+bdWVips
-QSE6sFA6u8b9VjoYOjG4GwBDTEIwBBRJhWxxeP62R7DhRE232DuGJL9AjiVP0XE=
-=ltvR
+iQEcBAEBAgAGBQJPjGGhAAoJEJ0WA1zPCt1hmcoH/jEq6hPqHByBt9De7mCgTx5/
+Hrf8X14MN1G8VOEiAYBSTdHCykEdcAEflWvV76f7axgGGWIfqhpO0icnjqiSJk6n
+6RsZ+PWTkNkTiBtd55gl5XGsVEtZX8M0XKOiW+BqhyXLKW2G3B0VQbTrdLCLmE8L
+mo3gg1jXm8TUb5x7BaUKIAhiW/287T9u2pLyogFKB1WCZywajLPmDrg09Y+4T5Pg
+pqJLiDFcTUFXE4xnqp6PmkUZT5CS292COGPSqwR3Uh77Q3qr/FTAtklSwVaBCT8v
+1kGpjRCkhyx5qPMV7Tpmim7hbWxmQP8IgjlKHpSfv/UaYPGR/mI97p5mKJUI+QQ=
+=jI7u
 -----END PGP SIGNATURE-----
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
+