Fix another glib-2.31 linking problem (bug #395777 comment 5, thanks to Alphat-PC for reporting).

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

4 files changed, 179 insertions, 9 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 1aec21703450..77429d50ca3a 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/evolution-data-server
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.321 2011/12/31 04:53:23 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.322 2012/01/06 06:43:02 tetromino Exp $
+
+  06 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-data-server-3.2.2-r1.ebuild,
+  +files/evolution-data-server-3.2.2-g_thread_init.patch:
+  Fix another glib-2.31 linking problem (bug #395777 comment 5, thanks to
+  Alphat-PC for reporting).
 
 *evolution-data-server-3.2.2-r1 (31 Dec 2011)
 
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 12eac905dabb..9712023fe529 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -5,6 +5,7 @@ AUX calentry.schema 3661 RMD160 68dfc3a8bbf08a1cf2713727c6617b2de613cb7c SHA1 06
 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.1-libgdata07.patch 7683 RMD160 d025f3a8a819f0d7fae5b679c598e90e04a0e3ba SHA1 7c9c1d3ba78afad5e5da59bf8d22657d8cfabaf2 SHA256 8d76763e249c3a0cfd250cc24f2fb773f74480a0f353a118f9bd87485d7fac5f
+AUX evolution-data-server-3.2.2-g_thread_init.patch 5340 RMD160 e817ddd6680eff219efa08e9960461c9a213ac7b SHA1 fdeb1f6ab96e9e94ae4301666353eeddaf644a01 SHA256 9587183cc7ca99a50ffd26236dee333e82954c07047fc1738f0f895963476328
 AUX evolution-data-server-3.2.2-gmodule-explicit.patch 2035 RMD160 22b11fd2e4888d791aee754f7af358bb63433c05 SHA1 bed3401a4cd6084d235bdd37cde6624da117763f SHA256 2930f89bb6b0863150844fa827fbaff9d189d33d48f618f13cc7d92d10e0690e
 AUX evolution-data-server-3.2.2-libical-timezones.patch 2212 RMD160 1a3cf08a417c308b691656737fa8c92e1c5e2f0c SHA1 773b53b251948a9aa815855781fa4b8f04988aee SHA256 ef659e03920156a627ad6052764f67833e72da9b3af14705adbd66f1c986b494
 AUX evolution-data-server-3.2.2-new-folder-imap.patch 953 RMD160 71177c0b6a9d04155c72efe20f234e07d7f5af2c SHA1 7cb7ed13a6dafc522ef071fdd0c6f02caacba442 SHA256 d815c62faabe3b195477d4188e0c309a4d889008a1a1dff9ac5470b7e6b0776c
@@ -20,14 +21,14 @@ EBUILD evolution-data-server-2.32.2-r1.ebuild 4183 RMD160 7066ac38cb483b128d30c4
 EBUILD evolution-data-server-2.32.2.ebuild 3960 RMD160 38edf685841fb2232d8359903fa87f53997fa529 SHA1 9b24e22f3f906c5588ae50a26e921bbcc286d83a SHA256 8f779e1329a9e6b4516d3de887dbb9d6f08dbb05232623919ed099f22637fa34
 EBUILD evolution-data-server-2.32.3-r1.ebuild 4679 RMD160 98d6e8724787c5ce4a4bcc5a5f460d8207fc7659 SHA1 d220e447812971ef2250432bb28c4289232f4caa SHA256 26ae4496ffac82ce37101706a9cfc588500d812cc7fa9f03914f4b8b40c7ba11
 EBUILD evolution-data-server-3.2.1.ebuild 4212 RMD160 fa1bcbe4389685a183ee5febdb8120debb5f9b20 SHA1 b90b92e5d49065ce6ea665edc9b5da38d9d8fc3b SHA256 3b7d702270a05019f1e9fc14ad7c9eef4423b1e3492c30d66a5890853612ed19
-EBUILD evolution-data-server-3.2.2-r1.ebuild 4547 RMD160 e60227484f78dab667c7276e3b709f2b6bf9aff6 SHA1 40d99c0df7ad4b9764f9a3a374016fb0dcc434e9 SHA256 9fdbde1ec972dcfe72225cb2b2b853d2bc45bfd04fd69ae58096163c418fbe45
+EBUILD evolution-data-server-3.2.2-r1.ebuild 4601 RMD160 bedbfb9a9fb98bab8bd37172e2cc5f8056c935eb SHA1 5c7f96f3792d8b82654f953d05d8d5a4b07743b4 SHA256 92b93f167129cf074480e4d6fd940740340be78a4adba206b16da7bb7b451a43
 EBUILD evolution-data-server-3.2.2.ebuild 4212 RMD160 e12e568a4240a10171620545d44a07e42d96c708 SHA1 1fa0de4e6b3bcc7c6c3a1c1a47caedc9277400dc SHA256 bb3c5e0f44e3199b817e5c4e96040f083763b36eddfd2c3c4d6b3f2d3a1b7630
-MISC ChangeLog 62475 RMD160 73ed39cc7bb00b868ed4b9d12af1332a796829ef SHA1 075e9bde0543919d242270512b75408757fd87c3 SHA256 010d626b3dbe888f836cdc0b10887e4adb317c83785ad6563fd33641817587c8
+MISC ChangeLog 62736 RMD160 c2b503a7a183c6593dbd5d6c49bca9a754461732 SHA1 73cbaa335a1a0ccb751faa59618c1343025dfe96 SHA256 c6f1e192997978cabc0525bdd2362b164290428bf70f42730ab55c3463c61549
 MISC metadata.xml 535 RMD160 206f4b4067eab119530224247177d5f8ca6c97e2 SHA1 21a9ce92639d7c5aed6b189eca4f40b00b97778b SHA256 f458f1517ae769596f0dab7860b2789867e773eb32ad7cc00279dc7e2e82d64c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7+lUkACgkQdjK8w9WeBnBADQEAi2Cy3HZePqnCHjmkjR/+zqbc
-VE9QFXONK6R8EgRZ2RgBAJs52egVJT+EEk/YN3i3O/hg8+LNyLf36clCIrUhNp7L
-=YdDl
+iF4EAREIAAYFAk8Gl/wACgkQdjK8w9WeBnByLgD/TzDCcC4r5ied54t61KqoFSvR
+yHHVy0/Pyr/0PfR1BsQA/j4cvOrexpC5VrVPpiwr8gKM2mLRzyn0Dvc0db1hM/V1
+=0cSo
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.2.2-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.2-r1.ebuild
index ca887fa1d7a1..82301a8757fe 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.2.2-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.2.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-3.2.2-r1.ebuild,v 1.1 2011/12/31 04:53:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.2-r1.ebuild,v 1.2 2012/01/06 06:43:02 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -90,6 +90,7 @@ src_prepare() {
 
 	# fix linking with glib-2.31, bug #395777
 	epatch "${FILESDIR}/${PN}-3.2.2-gmodule-explicit.patch"
+	epatch "${FILESDIR}/${PN}-3.2.2-g_thread_init.patch"
 
 	eautoreconf
 
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.2.2-g_thread_init.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.2.2-g_thread_init.patch
new file mode 100644
index 000000000000..3c38715de93b
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-3.2.2-g_thread_init.patch
@@ -0,0 +1,162 @@
+From d65649c665c129221a4510831eacb38f7a43a644 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
+
+---
+ .../libedata-book/e-book-backend-sqlitedb-test.c   |    2 ++
+ calendar/backends/file/e-cal-backend-file.c        |    2 ++
+ camel/camel-index-control.c                        |    2 ++
+ camel/camel-text-index.c                           |    2 ++
+ camel/providers/imapx/test-imapx.c                 |    2 ++
+ camel/tests/lib/camel-test.c                       |    2 ++
+ tests/libebook/client/client-test-utils.c          |    2 ++
+ tests/libecal/client/client-test-utils.c           |    2 ++
+ tests/libedataserverui/test-client-examine-auth.c  |    2 ++
+ tests/libedataserverui/test-name-selector.c        |    2 ++
+ 10 files changed, 20 insertions(+), 0 deletions(-)
+
+diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb-test.c b/addressbook/libedata-book/e-book-backend-sqlitedb-test.c
+index df39af2..e887abb 100644
+--- a/addressbook/libedata-book/e-book-backend-sqlitedb-test.c
++++ b/addressbook/libedata-book/e-book-backend-sqlitedb-test.c
+@@ -197,7 +197,9 @@ main (gint argc,
+       gchar *argv[])
+ {
+ 	g_type_init ();
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++	#endif
+ 
+ 	if (argc != 2) {
+ 		g_print ("Please enter a path to store the cache \n");
+diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
+index ba1fcf0..b2bee69 100644
+--- a/calendar/backends/file/e-cal-backend-file.c
++++ b/calendar/backends/file/e-cal-backend-file.c
+@@ -3800,7 +3800,9 @@ main (gint argc,
+ 	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/camel/camel-index-control.c b/camel/camel-index-control.c
+index 87ae760..89ed82e 100644
+--- a/camel/camel-index-control.c
++++ b/camel/camel-index-control.c
+@@ -127,7 +127,9 @@ gint main (gint argc, gchar **argv)
+ 	if (argc < 2)
+ 		do_usage (argv[0]);
+ 
++	#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 563a332..f5b69fe 100644
+--- a/camel/camel-text-index.c
++++ b/camel/camel-text-index.c
+@@ -1862,7 +1862,9 @@ main (gint argc,
+ 
+ 	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 fe71d1c..de9a455 100644
+--- a/camel/providers/imapx/test-imapx.c
++++ b/camel/providers/imapx/test-imapx.c
+@@ -36,7 +36,9 @@ main (gint argc,
+ 	}
+ 
+ 	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 16caf79..743c658 100644
+--- a/camel/tests/lib/camel-test.c
++++ b/camel/tests/lib/camel-test.c
+@@ -103,8 +103,10 @@ camel_test_init (gint argc,
+ 	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/tests/libebook/client/client-test-utils.c b/tests/libebook/client/client-test-utils.c
+index 710ba25..f778333 100644
+--- a/tests/libebook/client/client-test-utils.c
++++ b/tests/libebook/client/client-test-utils.c
+@@ -67,7 +67,9 @@ main_initialize (void)
+ 		return;
+ 
+ 	g_type_init ();
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++	#endif
+ 
+ 	initialized = TRUE;
+ }
+diff --git a/tests/libecal/client/client-test-utils.c b/tests/libecal/client/client-test-utils.c
+index c6f7062..a39c994 100644
+--- a/tests/libecal/client/client-test-utils.c
++++ b/tests/libecal/client/client-test-utils.c
+@@ -63,7 +63,9 @@ main_initialize (void)
+ 		return;
+ 
+ 	g_type_init ();
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++	#endif
+ 
+ 	initialized = TRUE;
+ }
+diff --git a/tests/libedataserverui/test-client-examine-auth.c b/tests/libedataserverui/test-client-examine-auth.c
+index a02fb04..e94e33b 100644
+--- a/tests/libedataserverui/test-client-examine-auth.c
++++ b/tests/libedataserverui/test-client-examine-auth.c
+@@ -413,7 +413,9 @@ main (gint argc,
+       gchar **argv)
+ {
+ 	g_type_init ();
++	#if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++	#endif
+ 	gtk_init (&argc, &argv);
+ 
+ 	e_passwords_init ();
+diff --git a/tests/libedataserverui/test-name-selector.c b/tests/libedataserverui/test-name-selector.c
+index 3173382..bab8e4c 100644
+--- a/tests/libedataserverui/test-name-selector.c
++++ b/tests/libedataserverui/test-name-selector.c
+@@ -81,7 +81,9 @@ 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);
+ 
+-- 
+1.7.8.2
+