From 7e7e58fe9bda87e0e5087db4e76cb3359f7f9c9c Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 9 Nov 2011 10:42:41 -0500
Subject: [PATCH] Fix more build issues.

---
 evolution-ews-3.3.1-skip-g-thread-init.patch | 110 +++++++++++++++++++
 evolution-ews.spec                           |   2 +
 2 files changed, 112 insertions(+)
 create mode 100644 evolution-ews-3.3.1-skip-g-thread-init.patch

diff --git a/evolution-ews-3.3.1-skip-g-thread-init.patch b/evolution-ews-3.3.1-skip-g-thread-init.patch
new file mode 100644
index 0000000..4034859
--- /dev/null
+++ b/evolution-ews-3.3.1-skip-g-thread-init.patch
@@ -0,0 +1,110 @@
+diff -up evolution-ews-3.3.1/src/addressbook/e-book-backend-sqlitedb-test.c.skip-g-thread-init evolution-ews-3.3.1/src/addressbook/e-book-backend-sqlitedb-test.c
+--- evolution-ews-3.3.1/src/addressbook/e-book-backend-sqlitedb-test.c.skip-g-thread-init	2011-11-09 10:41:20.188682319 -0500
++++ evolution-ews-3.3.1/src/addressbook/e-book-backend-sqlitedb-test.c	2011-11-09 10:42:04.240214627 -0500
+@@ -194,7 +194,6 @@ gint
+ main (gint argc, gchar *argv[])
+ {
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 
+ 	if (argc != 2) {
+ 		g_print ("Please enter a path to store the cache \n");
+diff -up evolution-ews-3.3.1/src/addressbook/ews-oab-decoder.c.skip-g-thread-init evolution-ews-3.3.1/src/addressbook/ews-oab-decoder.c
+--- evolution-ews-3.3.1/src/addressbook/ews-oab-decoder.c.skip-g-thread-init	2011-11-09 10:41:20.190682297 -0500
++++ evolution-ews-3.3.1/src/addressbook/ews-oab-decoder.c	2011-11-09 10:42:07.567179322 -0500
+@@ -1018,7 +1018,6 @@ main (gint argc, gchar *argv [])
+ 	struct _db_data data;
+ 
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 
+ 	if (argc != 3) {
+ 		g_print ("Pass the oab filename  and cache dir as argument \n");
+diff -up evolution-ews-3.3.1/src/addressbook/lzx/ews-oal-decompress.c.skip-g-thread-init evolution-ews-3.3.1/src/addressbook/lzx/ews-oal-decompress.c
+--- evolution-ews-3.3.1/src/addressbook/lzx/ews-oal-decompress.c.skip-g-thread-init	2011-11-09 10:41:20.181682392 -0500
++++ evolution-ews-3.3.1/src/addressbook/lzx/ews-oal-decompress.c	2011-11-09 10:42:02.381234354 -0500
+@@ -265,7 +265,6 @@ main (int argc, char *argv [])
+ 	}
+ 
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 
+ 	if (oal_decompress_v4_full_detail_file (argv [1], argv [2], NULL))
+ 		g_print ("Successfully decompressed \n");
+diff -up evolution-ews-3.3.1/src/server/tests/test-autocompletion.c.skip-g-thread-init evolution-ews-3.3.1/src/server/tests/test-autocompletion.c
+--- evolution-ews-3.3.1/src/server/tests/test-autocompletion.c.skip-g-thread-init	2011-11-09 10:41:20.174682466 -0500
++++ evolution-ews-3.3.1/src/server/tests/test-autocompletion.c	2011-11-09 10:41:52.574338442 -0500
+@@ -108,7 +108,6 @@ autocompletion_tests_run ()
+ 	g_print ("Testing autocompletion... \n");
+ 
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 
+ 	main_loop = g_main_loop_new (NULL, TRUE);
+ 	g_idle_add ((GSourceFunc) idle_cb, NULL);
+diff -up evolution-ews-3.3.1/src/server/tests/test-connection.c.skip-g-thread-init evolution-ews-3.3.1/src/server/tests/test-connection.c
+--- evolution-ews-3.3.1/src/server/tests/test-connection.c.skip-g-thread-init	2011-11-09 10:41:20.170682509 -0500
++++ evolution-ews-3.3.1/src/server/tests/test-connection.c	2011-11-09 10:41:48.338383406 -0500
+@@ -167,7 +167,6 @@ idle_cb (gpointer data)
+ void connection_tests_run ()
+ {
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 
+ 	main_loop = g_main_loop_new (NULL, TRUE);
+ 	g_idle_add ((GSourceFunc) idle_cb, NULL);
+diff -up evolution-ews-3.3.1/src/server/tests/test-createfolder.c.skip-g-thread-init evolution-ews-3.3.1/src/server/tests/test-createfolder.c
+--- evolution-ews-3.3.1/src/server/tests/test-createfolder.c.skip-g-thread-init	2011-11-09 10:41:20.175682456 -0500
++++ evolution-ews-3.3.1/src/server/tests/test-createfolder.c	2011-11-09 10:41:54.725315611 -0500
+@@ -101,7 +101,6 @@ void
+ createfolder_tests_run ()
+ {
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 
+ 	main_loop = g_main_loop_new (NULL, TRUE);
+ 	g_idle_add ((GSourceFunc) idle_cb, NULL);
+diff -up evolution-ews-3.3.1/src/server/tests/test-cuditem.c.skip-g-thread-init evolution-ews-3.3.1/src/server/tests/test-cuditem.c
+--- evolution-ews-3.3.1/src/server/tests/test-cuditem.c.skip-g-thread-init	2011-11-09 10:41:20.178682425 -0500
++++ evolution-ews-3.3.1/src/server/tests/test-cuditem.c	2011-11-09 10:41:58.687273559 -0500
+@@ -130,7 +130,6 @@ idle_cb (gpointer data)
+ void cuditem_tests_run ()
+ {
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 
+ 	main_loop = g_main_loop_new (NULL, TRUE);
+ 	g_idle_add ((GSourceFunc) idle_cb, NULL);
+diff -up evolution-ews-3.3.1/src/server/tests/test-deletefolder.c.skip-g-thread-init evolution-ews-3.3.1/src/server/tests/test-deletefolder.c
+--- evolution-ews-3.3.1/src/server/tests/test-deletefolder.c.skip-g-thread-init	2011-11-09 10:41:20.177682436 -0500
++++ evolution-ews-3.3.1/src/server/tests/test-deletefolder.c	2011-11-09 10:41:56.510296663 -0500
+@@ -96,7 +96,6 @@ deletefolder_tests_run (gconstpointer da
+ 	g_return_if_fail (*fid != NULL);
+ 
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 
+ 	main_loop = g_main_loop_new (NULL, TRUE);
+ 	g_idle_add ((GSourceFunc) idle_cb, fid);
+diff -up evolution-ews-3.3.1/src/server/tests/test-getattachment.c.skip-g-thread-init evolution-ews-3.3.1/src/server/tests/test-getattachment.c
+--- evolution-ews-3.3.1/src/server/tests/test-getattachment.c.skip-g-thread-init	2011-11-09 10:41:20.172682487 -0500
++++ evolution-ews-3.3.1/src/server/tests/test-getattachment.c	2011-11-09 10:41:50.606359331 -0500
+@@ -109,7 +109,6 @@ idle_cb (gpointer data)
+ void get_attachments_tests_run ()
+ {
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 
+ 	main_loop = g_main_loop_new (NULL, TRUE);
+ 	g_idle_add ((GSourceFunc) idle_cb, NULL);
+diff -up evolution-ews-3.3.1/src/server/tests/test-syncfolder.c.skip-g-thread-init evolution-ews-3.3.1/src/server/tests/test-syncfolder.c
+--- evolution-ews-3.3.1/src/server/tests/test-syncfolder.c.skip-g-thread-init	2011-11-09 10:41:20.180682403 -0500
++++ evolution-ews-3.3.1/src/server/tests/test-syncfolder.c	2011-11-09 10:42:00.438254974 -0500
+@@ -245,7 +245,6 @@ void op_tests_run ()
+ 	g_print ("Testing operations... \n");
+ 
+ 	g_type_init ();
+-	g_thread_init (NULL);
+ 
+ 	main_loop = g_main_loop_new (NULL, TRUE);
+ 	g_idle_add ((GSourceFunc) idle_cb, NULL);
diff --git a/evolution-ews.spec b/evolution-ews.spec
index bff208a..b30ba3e 100644
--- a/evolution-ews.spec
+++ b/evolution-ews.spec
@@ -16,6 +16,7 @@ BuildRequires: intltool
 # Build fixes
 Patch1: evolution-ews-3.3.1-enable-deprecated-glib-symbols.patch
 Patch2: evolution-ews-3.3.1-illegal-includes.patch
+Patch3: evolution-ews-3.3.1-skip-g-thread-init.patch
 
 %description
 This package allows Evolution to interact with Microsoft Exchange servers,
@@ -25,6 +26,7 @@ versions 2007 and later, through its Exchange Web Services (EWS) interface.
 %setup -q
 %patch1 -p1 -b .enable-deprecated-glib-symbols
 %patch2 -p1 -b .illegal-includes
+%patch3 -p1 -b .skip-g-thread-init
 
 %build
 %configure