rpms/evolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove leftover dbus-glib calls.

Browse source
This commit is contained in:
Matthew Barnes 2010-08-06 14:50:59 -04:00
commit 200b480af6
2 changed files with 37 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

33
evolution-2.31.6-no-dbus-glib.patch Normal file
View file

@ -0,0 +1,33 @@
diff -up evolution-2.31.6/calendar/gui/alarm-notify/notify-main.c.no-dbus-glib evolution-2.31.6/calendar/gui/alarm-notify/notify-main.c
--- evolution-2.31.6/calendar/gui/alarm-notify/notify-main.c.no-dbus-glib 2010-08-06 14:48:18.324805041 -0400
+++ evolution-2.31.6/calendar/gui/alarm-notify/notify-main.c 2010-08-06 14:48:49.018582948 -0400
@@ -57,7 +57,6 @@ main (gint argc, gchar **argv)
textdomain (GETTEXT_PACKAGE);
g_thread_init (NULL);
- dbus_g_thread_init ();
#ifdef G_OS_WIN32
path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL);
diff -up evolution-2.31.6/capplet/anjal-settings-main.c.no-dbus-glib evolution-2.31.6/capplet/anjal-settings-main.c
--- evolution-2.31.6/capplet/anjal-settings-main.c.no-dbus-glib 2010-08-06 14:48:25.502555241 -0400
+++ evolution-2.31.6/capplet/anjal-settings-main.c 2010-08-06 14:48:54.586593625 -0400
@@ -225,7 +225,6 @@ main (gint argc, gchar *argv[])
if (!g_thread_get_initialized ())
g_thread_init (NULL);
- dbus_g_thread_init ();
client = gconf_client_get_default();
diff -up evolution-2.31.6/shell/main.c.no-dbus-glib evolution-2.31.6/shell/main.c
--- evolution-2.31.6/shell/main.c.no-dbus-glib 2010-08-06 14:48:34.018804548 -0400
+++ evolution-2.31.6/shell/main.c 2010-08-06 14:48:59.620635199 -0400
@@ -492,7 +492,6 @@ main (gint argc, gchar **argv)
g_type_init ();
if (!g_thread_get_initialized ())
g_thread_init (NULL);
- dbus_g_thread_init ();
#ifdef G_OS_WIN32
path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL);

4
evolution.spec
View file

@ -55,6 +55,9 @@ Patch12: evolution-2.9.1-im-context-reset.patch
# RH bug #589555
Patch13: evolution-2.30.1-help-contents.patch
# Remove leftover dbus-glib calls.
Patch14: evolution-2.31.6-no-dbus-glib.patch
## Dependencies ###
Requires(pre): GConf2
@ -207,6 +210,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
%patch10 -p1 -b .ldaphack
%patch12 -p1 -b .im-context-reset
%patch13 -p1 -b .help-contents
%patch14 -p1 -b .no-dbus-glib
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib