Add another glib-2.32 fix.

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

4 files changed, 167 insertions, 11 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 2a2e529f7c67..3dbaf8463be9 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.327 2012/04/15 19:58:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.328 2012/04/16 18:29:09 tetromino Exp $
+
+  16 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-data-server-2.32.3-r2.ebuild,
+  +files/evolution-data-server-2.32.3-g_thread_init.patch:
+  Add another glib-2.32 fix.
 
   15 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   evolution-data-server-2.32.3-r2.ebuild,
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index cda5c8c06dde..1861cc973a39 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX calentry.schema 3661 RMD160 68dfc3a8bbf08a1cf2713727c6617b2de613cb7c SHA1 06ddcc64c3b2b3230fbbef21a7e2a682bd95788c SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431
 AUX e-d-s-camel-skip-failing-test.patch 660 RMD160 0907bb916a124d689f1880016eb8013971944016 SHA1 7ef6fd67bddbba16b3c6dd24a9b50ea9f8f5aa86 SHA256 f89f7635e9a5ddc2aa2f713a6d7eb9322f3416f8f9ad1cba1a113f65a1eaacb5
 AUX evolution-data-server-2.31-gentoo_etc_services.patch 1350 RMD160 a2fe65e31e3dad58fd5aef1e9bf7cdd02b540f8c SHA1 aef1a5fc05262c1049306c50a5c91ad9111f9b22 SHA256 1dae07ed5cb124c2da6e0d28f4e64555b6fb2bc012ceee3506f0af6e3e41102a
+AUX evolution-data-server-2.32.3-g_thread_init.patch 5091 RMD160 bce945ef850cfc5cd05b114505d943d0316882a3 SHA1 a9fdd5583cc827445caa9597441c4ee3b1761028 SHA256 23d3bd95ab952dd572547b64e1c430443586094cd8049b5034c12811fb7be162
 AUX evolution-data-server-2.32.3-gmodule-explicit.patch 2137 RMD160 f1b8068f3e0477768a9ea58ba304207c560361fe SHA1 018d57658e8ea4f011abc4356d680267ab0dbc2b SHA256 cb936b70909a9a6588de0c8ba8b1c2fe2f9a5b288620c40d992774a9302f05df
 AUX evolution-data-server-2.32.3-imap-move.patch 2647 RMD160 4d337e7ffad413ed8c3357e45fca18009cd0a60a SHA1 6cd6f0499ae9f8eb002ce7e68799a0b801ea87d2 SHA256 8effa465fc2913f22f030d66f9726a6e9dcf327f7abbf1774b1bfb9f4cc1c40f
 AUX evolution-data-server-3.2.2-g_thread_init.patch 5340 RMD160 e817ddd6680eff219efa08e9960461c9a213ac7b SHA1 fdeb1f6ab96e9e94ae4301666353eeddaf644a01 SHA256 9587183cc7ca99a50ffd26236dee333e82954c07047fc1738f0f895963476328
@@ -14,19 +15,19 @@ DIST evolution-data-server-2.32.3-patches.tar.xz 24072 RMD160 2508b5b101f59bb383
 DIST evolution-data-server-2.32.3.tar.bz2 4322281 RMD160 adc8b07aef41a89d16fc426541c12190a3688b8f SHA1 cbf32c3438c4f1650b35b87007a337ebc1c56cec SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c
 DIST evolution-data-server-3.2.3.tar.xz 3729592 RMD160 9c352af61ff65592dd40928bbdb9ce0cf262046c SHA1 b96936bbeae52eb35113003f7d4e96f09a4fef25 SHA256 8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c
 EBUILD evolution-data-server-2.32.3-r1.ebuild 4679 RMD160 98d6e8724787c5ce4a4bcc5a5f460d8207fc7659 SHA1 d220e447812971ef2250432bb28c4289232f4caa SHA256 26ae4496ffac82ce37101706a9cfc588500d812cc7fa9f03914f4b8b40c7ba11
-EBUILD evolution-data-server-2.32.3-r2.ebuild 4892 RMD160 d76562d1dd57d86cbd6651244c5b7f0b3b0eb9f5 SHA1 3a76b3f4123c4fc871e703026eb99fb972fe80e4 SHA256 1a05f4ce7fc460b91f1e7f05895006e846810a7f0f4277db2e0bf6a52b12ef0d
+EBUILD evolution-data-server-2.32.3-r2.ebuild 4939 RMD160 1f0de00d15b77cd25e7f1f8f0506d2204a78df4a SHA1 51a40ec1d8e99705a4d3fd9b0e2736c633933080 SHA256 6db2289910bf11130744b3f72e6cb17960c72a4a3f9af6361ae3534b708ebec9
 EBUILD evolution-data-server-3.2.3-r1.ebuild 4341 RMD160 c3d6ec11a4c9f2272619001226674185aaa72451 SHA1 7f9677820910c1f87698a850ba2b5903b68a8238 SHA256 d15e33e6249edd8631a1303b83342f18dfcae5c5434082cec0cc0f140243bb49
 EBUILD evolution-data-server-3.2.3.ebuild 4222 RMD160 e0a496168623b3b72bc1efa74e813630e4d53835 SHA1 7820829731971e1d7205731c00cf3762de4fd2db SHA256 3a8f14dc83fe445965d39e7266976b3a57cb94b01e287d445a5b7ff8f78cc285
-MISC ChangeLog 64334 RMD160 da0688e2e01a0d44f14aa8501c75353a8c9c4085 SHA1 f7fbaf9e64de2d3fe015fae0e88bc13fcd8eb406 SHA256 52ddaa318b5efb01f58b80036868dd360464f4c6ab385ba922db065fc665414d
+MISC ChangeLog 64524 RMD160 a53b332fd859372c3e652df5a557a7ff0f6188f4 SHA1 93a602f38aa0efdf6a9ad85c43839f668d9ef519 SHA256 94d78bf13e1682488671313edd87e42b60e2a9667ac71b618fc549c85ef6e3de
 MISC metadata.xml 535 RMD160 206f4b4067eab119530224247177d5f8ca6c97e2 SHA1 21a9ce92639d7c5aed6b189eca4f40b00b97778b SHA256 f458f1517ae769596f0dab7860b2789867e773eb32ad7cc00279dc7e2e82d64c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPiyhSAAoJEJ0WA1zPCt1hjswH/AvA9CiXwQvM5BfFBH5asdgB
-+1UwlGQMLw2cYb+JOhkEAUshdZiZSGoSUhnJ/PixQVy4elrTlz1143oIsQhpchfT
-MLCJNKq+np+B+0oxv2Nt4t7Y3lwzFsgiPgEna2nLCbR9BnUqndHM0zAivskkVZu7
-hH0Xyrn3GSZEQS14KtEdCe6EsCwMDdQvGiE/L5nkDkqMwuClhYOxkzdwGMV6mB/L
-Q8QpD83ADVwvVDyXKdcKP3wjwhNeLrTn8p+yq9pMDNzWsB6kf9U7BYpVJKdbc9ho
-iTGkdlRtbrNHXlp5q78HS3h11RFmG765Qp2phF9HmBJvDBABdL3zDaLd3oPIxpU=
-=BeyY
+iQEcBAEBAgAGBQJPjGT7AAoJEJ0WA1zPCt1hToQH/jFR8wEOGobqOBNPh7Ju+kDf
+EwDQHeI8LWGVma7bbCpbDpXdTg5ifxC2LrY/fPa07QAvRDbymn0+MQvogt7AUlHx
+UxWa1mr3fOuUO23EQ7cLyfHK/Aoe4wH3ZbfmBnZGjtZmjLeA1zal5xSRZQai7fyb
+lkUXa7YhBG4B5XqFVW4XIbdqr0YT07Zf4Sz/ql4Xi+pnQwPXSX9OFY5kzCnwXFpA
+tm6WJvVwdK2qp7wc3WK+oy9509JBHO/kLhWg6xntof1KYX1/jNKub+XoTXwtnQiP
+m6y5euH6qu0udHQJqmhw4sk2fVCArDMoghtBCN0f3HvgqpkIWHTl696+I6vOrAI=
+=esTG
 -----END PGP SIGNATURE-----
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 00788bdf08f6..5d7b543e2a0c 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.2 2012/04/15 19:58:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r2.ebuild,v 1.3 2012/04/16 18:29:09 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -94,6 +94,7 @@ src_prepare() {
 
 	# Fix building with glib-2.32, bug #412109
 	epatch "${FILESDIR}/${P}-gmodule-explicit.patch"
+	epatch "${FILESDIR}/${P}-g_thread_init.patch"
 
 	# /usr/include/db.h is always db-1 on FreeBSD
 	# so include the right dir in CPPFLAGS
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-g_thread_init.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-g_thread_init.patch
new file mode 100644
index 000000000000..d85910a79245
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-g_thread_init.patch
@@ -0,0 +1,149 @@
+From ffdfc6c7005e967a96f9ad0ea32ce782f0126a56 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 24 Oct 2011 09:42:17 +0200
+Subject: [PATCH] Call g_thread_init() conditionally
+
+[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.32]
+---
+ addressbook/libedata-book/e-data-book-factory.c |    2 ++
+ calendar/backends/file/e-cal-backend-file.c     |    2 ++
+ calendar/libedata-cal/e-data-cal-factory.c      |    2 ++
+ camel/camel-index-control.c                     |    4 +++-
+ camel/camel-text-index.c                        |    2 ++
+ camel/providers/imapx/test-imapx.c              |    2 ++
+ camel/tests/lib/camel-test.c                    |    2 ++
+ libedataserverui/test-name-selector.c           |    2 ++
+ servers/groupwise/soap-test.c                   |    2 ++
+ 9 files changed, 19 insertions(+), 1 deletions(-)
+
+diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
+index 310ee2b..7c25f9c 100644
+--- a/addressbook/libedata-book/e-data-book-factory.c
++++ b/addressbook/libedata-book/e-data-book-factory.c
+@@ -602,7 +602,9 @@ main (gint argc, gchar **argv)
+ 
+ 	g_type_init ();
+ 	g_set_prgname (E_PRGNAME);
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	if (!g_thread_supported ()) g_thread_init (NULL);
++        #endif
+ 
+ 	factory = g_object_new (E_TYPE_DATA_BOOK_FACTORY, NULL);
+ 
+diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
+index 9bacb88..3721240 100644
+--- a/calendar/backends/file/e-cal-backend-file.c
++++ b/calendar/backends/file/e-cal-backend-file.c
+@@ -3786,7 +3786,9 @@ main(gint argc, gchar **argv)
+ 	FILE* fin = NULL;
+ 
+ 	g_type_init ();
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++	#endif
+ 
+ 	context = g_option_context_new ("- test utility for e-d-s file backend");
+ 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
+index db9cc1c..aa35082 100644
+--- a/calendar/libedata-cal/e-data-cal-factory.c
++++ b/calendar/libedata-cal/e-data-cal-factory.c
+@@ -911,7 +911,9 @@ main (gint argc, gchar **argv)
+ 
+ 	g_type_init ();
+ 	g_set_prgname (E_PRGNAME);
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	if (!g_thread_supported ()) g_thread_init (NULL);
++        #endif
+ 
+ 	#ifdef HAVE_ICAL_UNKNOWN_TOKEN_HANDLING
+ 	ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN);
+diff --git a/camel/camel-index-control.c b/camel/camel-index-control.c
+index 771cba2..9c15971 100644
+--- a/camel/camel-index-control.c
++++ b/camel/camel-index-control.c
+@@ -124,7 +124,9 @@ gint main(gint argc, gchar **argv)
+ 	if (argc<2)
+ 		do_usage(argv[0]);
+ 
+-	g_thread_init(NULL);
++	#if !GLIB_CHECK_VERSION(2,31,0)
++	g_thread_init (NULL);
++	#endif
+ 	camel_init(NULL, 0);
+ 
+ 	if (!strcmp(argv[1], "compress"))
+diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c
+index e242669..8240608 100644
+--- a/camel/camel-text-index.c
++++ b/camel/camel-text-index.c
+@@ -1851,7 +1851,9 @@ gint main (gint argc, gchar **argv)
+ 
+ 	printf ("Camel text index tester!\n");
+ 
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++	#endif
+ 	camel_init (NULL, 0);
+ 
+ 	idx = (CamelIndex *)camel_text_index_new ("textindex", O_CREAT|O_RDWR|O_TRUNC);
+diff --git a/camel/providers/imapx/test-imapx.c b/camel/providers/imapx/test-imapx.c
+index ede8d65..6db0ab7 100644
+--- a/camel/providers/imapx/test-imapx.c
++++ b/camel/providers/imapx/test-imapx.c
+@@ -36,7 +36,9 @@ main (gint argc, gchar *argv[])
+ 	}
+ 
+ 	uri = argv[1];
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++	#endif
+ 	system ("rm -rf /tmp/test-camel-imapx");
+ 	camel_init ("/tmp/test-camel-imapx", TRUE);
+ 	camel_provider_init ();
+diff --git a/camel/tests/lib/camel-test.c b/camel/tests/lib/camel-test.c
+index 44a20ae..42703e8 100644
+--- a/camel/tests/lib/camel-test.c
++++ b/camel/tests/lib/camel-test.c
+@@ -99,8 +99,10 @@ camel_test_init(gint argc, gchar **argv)
+ 	setup = 1;
+ 
+ 	g_type_init ();
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	/* yeah, we do need ot thread init, even though camel isn't compiled with enable threads */
+ 	g_thread_init (NULL);
++	#endif
+ 
+ 	path = g_strdup_printf ("/tmp/camel-test");
+ 	if (mkdir (path, 0700) == -1 && errno != EEXIST)
+diff --git a/libedataserverui/test-name-selector.c b/libedataserverui/test-name-selector.c
+index 71552b1..8f92e2d 100644
+--- a/libedataserverui/test-name-selector.c
++++ b/libedataserverui/test-name-selector.c
+@@ -83,7 +83,9 @@ gint
+ main (gint argc, gchar **argv)
+ {
+ 	gtk_init (&argc, &argv);
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++	#endif
+ 
+ 	camel_init (NULL, 0);
+ 
+diff --git a/servers/groupwise/soap-test.c b/servers/groupwise/soap-test.c
+index 221a8b7..0ab93f0 100644
+--- a/servers/groupwise/soap-test.c
++++ b/servers/groupwise/soap-test.c
+@@ -49,7 +49,9 @@ gint
+ main (gint argc, gchar *argv[])
+ {
+ 	g_type_init ();
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++	#endif
+ 
+ 	/* Hostname Eg: http(s)://domain_name:/port_number/soap */
+ 	if (argc != 3 && argc != 4) {
+-- 
+1.7.8.5
+