rpms/rhythmbox/F-8 rhythmbox-0.11.3-force-python-thread-init.patch, NONE, 1.1 rhythmbox.spec, 1.146, 1.147

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23577

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.11.3-force-python-thread-init.patch 
Log Message:
* Fri Nov 30 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.3-5
- Add patch to avoid crashing if no Python plugins are enabled by default
  (#393531)


rhythmbox-0.11.3-force-python-thread-init.patch:

--- NEW FILE rhythmbox-0.11.3-force-python-thread-init.patch ---
diff --git a/shell/main.c b/shell/main.c
index 71dde32..5d478fa 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -73,6 +73,10 @@
 #include "rb-playlist-manager.h"
 #include "rb-playlist-manager-glue.h"
 
+#ifdef ENABLE_PYTHON
+#include "rb-python-module.h"
+#endif
+
 #define HAVE_LIBGNOME_GOPTION defined(GNOME_PARAM_GOPTION_CONTEXT)
 
 static gboolean debug           = FALSE;
@@ -322,6 +326,15 @@ main (int argc, char **argv)
 
 		rb_profile_start ("mainloop");
 #ifdef ENABLE_PYTHON
+		{
+			/* force python etc. to be loaded.
+			 * otherwise, pyg_begin_allow_threads will crash,
+			 * and even if it didn't, we wouldn't be able to provide
+			 * thread safety for plugins loaded later on.
+			 */
+			GObject *z = g_object_new (RB_TYPE_PYTHON_MODULE, NULL);
+			g_object_unref (z);
+		}
 		pyg_begin_allow_threads;
 #endif
 		gtk_main ();


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-8/rhythmbox.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- rhythmbox.spec	17 Nov 2007 13:51:21 -0000	1.146
+++ rhythmbox.spec	30 Nov 2007 14:05:24 -0000	1.147
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -51,6 +51,8 @@
 Patch1: rb-delete-ipod-tracks.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=497430
 Patch2: rb-fix-broken-daap-playback.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=499208
+Patch3: rhythmbox-0.11.3-force-python-thread-init.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -83,6 +85,7 @@
 %patch1 -p0 -b .ipod-trash
 popd
 %patch2 -p0 -b .broken-daap
+%patch3 -p1 -b .python-threading
 
 %build
 
@@ -193,6 +196,10 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Fri Nov 30 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.3-5
+- Add patch to avoid crashing if no Python plugins are enabled by default
+  (#393531)
+
 * Sat Nov 17 2007 - Bastien Nocera <bnocera at redhat.com> - 0.11.3-4
 - Better DAAP fix (#382351)