rpms/gupnp-tools/devel gupnp-tools-0.6.1-gthreadinit.patch, NONE, 1.1 gupnp-tools.spec, 1.1, 1.2

Peter Robinson pbrobinson at fedoraproject.org
Fri Oct 24 15:39:22 UTC 2008


Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9997

Modified Files:
	gupnp-tools.spec 
Added Files:
	gupnp-tools-0.6.1-gthreadinit.patch 
Log Message:
- Add a patch


gupnp-tools-0.6.1-gthreadinit.patch:

--- NEW FILE gupnp-tools-0.6.1-gthreadinit.patch ---
--- gupnp-tools-0.6.1/src/universal-cp/gui.c~	2008-02-22 22:37:07.000000000 +0100
+++ gupnp-tools-0.6.1/src/universal-cp/gui.c	2008-10-11 15:19:07.000000000 +0200
@@ -102,7 +102,7 @@
 
         gtk_init (argc, argv);
         glade_init ();
-        g_thread_init (NULL);
+        if (!g_thread_supported ()) g_thread_init (NULL);
 
         glade_xml = glade_xml_new (GLADE_FILE, NULL, NULL);
         if (glade_xml == NULL) {
--- gupnp-tools-0.6.1/src/av-cp/gui.c~	2008-01-29 16:37:45.000000000 +0100
+++ gupnp-tools-0.6.1/src/av-cp/gui.c	2008-10-11 15:19:23.000000000 +0200
@@ -83,7 +83,7 @@
 
         gtk_init (argc, argv);
         glade_init ();
-        g_thread_init (NULL);
+        if (!g_thread_supported ()) g_thread_init (NULL);
 
         glade_xml = glade_xml_new (GLADE_FILE, NULL, NULL);
         if (glade_xml == NULL) {
--- gupnp-tools-0.6.1/src/network-light/upnp.c~	2008-09-22 18:25:18.000000000 +0200
+++ gupnp-tools-0.6.1/src/network-light/upnp.c	2008-10-11 15:19:14.000000000 +0200
@@ -561,7 +561,7 @@
 {
         GError *error;
 
-        g_thread_init (NULL);
+        if (!g_thread_supported ()) g_thread_init (NULL);
 
         error = NULL;
         context = gupnp_context_new (NULL, NULL, 0, &error);


Index: gupnp-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-tools/devel/gupnp-tools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gupnp-tools.spec	24 Oct 2008 15:14:21 -0000	1.1
+++ gupnp-tools.spec	24 Oct 2008 15:38:51 -0000	1.2
@@ -7,6 +7,7 @@
 License:        GPLv2+
 URL:            http://www.gupnp.org/
 Source0:        http://www.gupnp.org/sources/%{name}/%{name}-%{version}.tar.gz
+Patch0:		gupnp-tools-0.6.1-gthreadinit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gupnp-devel
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gthreadinit
 
 %build
 %configure --disable-static




More information about the scm-commits mailing list