[evolution-exchange] Add patch to not call g_thread_init()
Milan Crha
mcrha at fedoraproject.org
Mon Oct 24 07:49:37 UTC 2011
commit 307152cb861d59fe974fb48948140caf79f5960f
Author: Milan Crha <mcrha at redhat.com>
Date: Mon Oct 24 09:49:31 2011 +0200
Add patch to not call g_thread_init()
evolution-exchange-3.3.1-no-g-thread-init.patch | 14 ++++++++++++++
evolution-exchange.spec | 7 +++++--
2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/evolution-exchange-3.3.1-no-g-thread-init.patch b/evolution-exchange-3.3.1-no-g-thread-init.patch
new file mode 100644
index 0000000..5dad81d
--- /dev/null
+++ b/evolution-exchange-3.3.1-no-g-thread-init.patch
@@ -0,0 +1,14 @@
+diff --git a/tools/ximian-connector-setup.c b/tools/ximian-connector-setup.c
+index 747028c..7c33b4a 100644
+--- a/tools/ximian-connector-setup.c
++++ b/tools/ximian-connector-setup.c
+@@ -89,7 +89,9 @@ main (gint argc,
+ textdomain (GETTEXT_PACKAGE);
+
+ g_type_init ();
++ #if !GLIB_CHECK_VERSION(2,31,0)
+ g_thread_init (NULL);
++ #endif
+ gtk_init_with_args (&argc, &argv, NULL, NULL, (gchar *) GETTEXT_PACKAGE, &error);
+
+ if (error != NULL) {
diff --git a/evolution-exchange.spec b/evolution-exchange.spec
index 013800b..b4608b3 100644
--- a/evolution-exchange.spec
+++ b/evolution-exchange.spec
@@ -30,7 +30,8 @@ Obsoletes: evolution-connector < %{version}-%{release}
### Patches ###
-Patch11: evolution-exchange-2.10.1-fix-64bit-acinclude.patch
+Patch01: evolution-exchange-2.10.1-fix-64bit-acinclude.patch
+Patch02: evolution-exchange-3.3.1-no-g-thread-init.patch
### Dependencies ###
@@ -61,7 +62,8 @@ Microsoft Exchange Server.
%prep
%setup -q -n evolution-exchange-%{version}
-%patch11 -p1 -b .fix-64bit-acinclude
+%patch01 -p1 -b .fix-64bit-acinclude
+%patch02 -p1 -b .no-g-thread-init
%build
export CPPFLAGS="-I%{_includedir}/et"
@@ -149,6 +151,7 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_exchange_a
%changelog
* Mon Oct 24 2011 Milan Crha <mcrha at redhat.com> - 3.3.1-1
- Update to 3.3.1
+- Add patch to not call g_thread_init()
* Mon Sep 26 2011 Milan Crha <mcrha at redhat.com> - 3.2.0-1
- Update to 3.2.0
More information about the scm-commits
mailing list