rpms/logjam/F-7 logjam-4.5.3-disable-threads.patch, NONE, 1.1 logjam.spec, 1.33, 1.34

Tom Callaway (spot) fedora-extras-commits at redhat.com
Tue Mar 11 20:00:30 UTC 2008


Author: spot

Update of /cvs/extras/rpms/logjam/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17915/F-7

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5.3-disable-threads.patch 
Log Message:

missed one patch


logjam-4.5.3-disable-threads.patch:

--- NEW FILE logjam-4.5.3-disable-threads.patch ---
diff -up logjam-4.5.3/src/init.c.BAD logjam-4.5.3/src/init.c
--- logjam-4.5.3/src/init.c.BAD	2008-03-11 14:48:18.000000000 -0400
+++ logjam-4.5.3/src/init.c	2008-03-11 14:49:35.000000000 -0400
@@ -177,13 +177,13 @@ setup_locales() {
 
 static void
 setup_glibgdk() {
-#ifdef HAVE_GTK
+#if defined (HAVE_GTK) && defined (G_OS_WIN32)
 	/* calls to these thread inits must happen before any other
 	 * g* calls. */
 	if (!g_thread_supported()) g_thread_init(NULL);
 	gdk_threads_init();
 	gdk_threads_enter();
-#endif /* HAVE_GTK */
+#endif /* HAVE_GTK && G_OS_WIN32 */
 
 	g_type_init();
 


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/F-7/logjam.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- logjam.spec	11 Mar 2008 19:53:07 -0000	1.33
+++ logjam.spec	11 Mar 2008 19:59:59 -0000	1.34
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	13%{?dist}
+Release:	14%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -102,6 +102,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-14
+- missed one patch
+
 * Tue Mar 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-13
 - disable unused threading on linux, resolves bz 435124
 - enable tags support (bz 434754)




More information about the fedora-extras-commits mailing list