rpms/gaim/devel gaim-2.0.0-beta3-threadsafe-dbus.patch, NONE, 1.1 gaim.spec, 1.134, 1.135

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19461

Modified Files:
	gaim.spec 
Added Files:
	gaim-2.0.0-beta3-threadsafe-dbus.patch 
Log Message:
GNOME-VFS dbus crash (#201791)


gaim-2.0.0-beta3-threadsafe-dbus.patch:
 configure.ac      |    2 +-
 src/Makefile.am   |    1 +
 src/dbus-server.c |    2 ++
 src/gtkmain.c     |    9 +++++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE gaim-2.0.0-beta3-threadsafe-dbus.patch ---
diff -urN gaim-2.0.0beta3.orig/configure.ac gaim-2.0.0beta3/configure.ac
--- gaim-2.0.0beta3.orig/configure.ac	2006-03-26 02:45:35.000000000 -0500
+++ gaim-2.0.0beta3/configure.ac	2006-08-14 23:16:22.000000000 -0400
@@ -587,7 +587,7 @@
 AM_PATH_GLIB_2_0(2.0.0,,AC_MSG_ERROR([
 *** GLib 2.0 is required to build Gaim; please make sure you have the GLib
 *** development headers installed. The latest version of GLib is
-*** always available at http://www.gtk.org/.]))
+*** always available at http://www.gtk.org/.]),gthread)
 AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR([
 *** GTK+ 2.0 is required to build Gaim; please make sure you have the GTK+
 *** development headers installed. The latest version of GTK+ is
diff -urN gaim-2.0.0beta3.orig/src/dbus-server.c gaim-2.0.0beta3/src/dbus-server.c
--- gaim-2.0.0beta3.orig/src/dbus-server.c	2006-02-11 00:25:47.000000000 -0500
+++ gaim-2.0.0beta3/src/dbus-server.c	2006-08-14 21:57:09.000000000 -0400
@@ -710,6 +710,8 @@
 
 gboolean gaim_dbus_init(void) 
 {
+    if (g_thread_supported())
+        dbus_g_thread_init();
     gaim_dbus_init_ids();
     return gaim_dbus_dispatch_init() ;
 }
diff -urN gaim-2.0.0beta3.orig/src/gtkmain.c gaim-2.0.0beta3/src/gtkmain.c
--- gaim-2.0.0beta3.orig/src/gtkmain.c	2006-03-06 23:45:22.000000000 -0500
+++ gaim-2.0.0beta3/src/gtkmain.c	2006-08-14 23:07:45.000000000 -0400
@@ -643,6 +643,15 @@
 	gtk_rc_add_default_file(search_path);
 	g_free(search_path);
 
+#if (defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE))
+       /* Since threads can be yanked in all unawares by other libraries,
+        * and some libraries aren't smart enough to initialize the thread
+        * subsystem when they need it, we need to do this here.  We also
+        * threadify dbus when that gets initialized.  Ugh. */
+       if (!g_thread_supported())
+               g_thread_init(NULL);
+       gdk_threads_init();
+#endif /* Glib has threads */
 
 	gui_check = gtk_init_check(&argc, &argv);
 	if (!gui_check) {
diff -urN gaim-2.0.0beta3.orig/src/Makefile.am gaim-2.0.0beta3/src/Makefile.am
--- gaim-2.0.0beta3.orig/src/Makefile.am	2006-03-25 10:45:49.000000000 -0500
+++ gaim-2.0.0beta3/src/Makefile.am	2006-08-14 22:05:14.000000000 -0400
@@ -334,6 +334,7 @@
 gaim_LDFLAGS = -export-dynamic
 gaim_LDADD = \
 	@LIBOBJS@ \
+	$(GLIB_LIBS) \
 	$(GTK_LIBS) \
 	$(DBUS_LIBS) \
 	$(SOUND_LIBS) \


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- gaim.spec	5 Aug 2006 17:49:27 -0000	1.134
+++ gaim.spec	15 Aug 2006 03:45:13 -0000	1.135
@@ -29,7 +29,7 @@
 
 Name:		gaim
 Version:	2.0.0
-Release:	0.11.%{betaver}%{?dist}
+Release:	0.12.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -57,6 +57,7 @@
 ## Patches 100+: To be Included in Future Upstream
 Patch181: gaim-2.0.0-beta3-silc-realname.patch
 Patch182: gaim-2.0.0-beta3-utf8-name-crash.patch
+Patch183: gaim-2.0.0-beta3-threadsafe-dbus.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -160,6 +161,7 @@
 ## Patches 100+: To be Included in Future Upstream
 %patch181 -p2
 %patch182 -p0
+%patch183 -p1
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -297,6 +299,9 @@
 %{_libdir}/pkgconfig/gaim.pc
 
 %changelog
+* Mon Aug 14 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.12.beta3
+- GNOME-VFS dbus crash (#201791)
+
 * Mon Jul 31 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.11.beta3
 - rebuild for new libebook