Add patch to not call g_thread_init()
This commit is contained in:
parent
6e146bbb0b
commit
23fd26fe9f
44
evolution-3.3.1-no-g-thread-init.patch
Normal file
44
evolution-3.3.1-no-g-thread-init.patch
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
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")) {
|
@ -42,10 +42,12 @@ Obsoletes: libgal2 <= %{last_libgal2_version}
|
|||||||
### Patches ###
|
### Patches ###
|
||||||
|
|
||||||
# bad hack
|
# bad hack
|
||||||
Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
|
Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
|
||||||
|
|
||||||
# RH bug #589555
|
# RH bug #589555
|
||||||
Patch13: evolution-2.30.1-help-contents.patch
|
Patch02: evolution-2.30.1-help-contents.patch
|
||||||
|
|
||||||
|
Patch03: evolution-3.3.1-no-g-thread-init.patch
|
||||||
|
|
||||||
## Dependencies ###
|
## Dependencies ###
|
||||||
|
|
||||||
@ -201,8 +203,9 @@ This package contains the plugin to import Microsoft Personal Storage Table
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n evolution-%{version}
|
%setup -q -n evolution-%{version}
|
||||||
%patch10 -p1 -b .ldaphack
|
%patch01 -p1 -b .ldaphack
|
||||||
%patch13 -p1 -b .help-contents
|
%patch02 -p1 -b .help-contents
|
||||||
|
%patch03 -p1 -b .no-g-thread-init
|
||||||
|
|
||||||
mkdir -p krb5-fakeprefix/include
|
mkdir -p krb5-fakeprefix/include
|
||||||
mkdir -p krb5-fakeprefix/lib
|
mkdir -p krb5-fakeprefix/lib
|
||||||
@ -650,6 +653,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%changelog
|
%changelog
|
||||||
* Mon Oct 24 2011 Milan Crha <mcrha@redhat.com> - 3.3.1-1
|
* Mon Oct 24 2011 Milan Crha <mcrha@redhat.com> - 3.3.1-1
|
||||||
- Update to 3.3.1
|
- Update to 3.3.1
|
||||||
|
- Add patch to not call g_thread_init()
|
||||||
|
|
||||||
* Mon Sep 26 2011 Milan Crha <mcrha@redhat.com> - 3.2.0-1
|
* Mon Sep 26 2011 Milan Crha <mcrha@redhat.com> - 3.2.0-1
|
||||||
- Update to 3.2.0
|
- Update to 3.2.0
|
||||||
|
Loading…
Reference in New Issue
Block a user