rpms/glib2/devel revert-316221.patch, NONE, 1.1 glib2.spec, 1.164, 1.165

Daniel Williams (dcbw) fedora-extras-commits at redhat.com
Mon Apr 14 00:35:27 UTC 2008


Author: dcbw

Update of /cvs/extras/rpms/glib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14546

Modified Files:
	glib2.spec 
Added Files:
	revert-316221.patch 
Log Message:
* Sun Apr 13 2008 Dan Williams <dcbw at redhat.com> - 2.16.3-3
- Revert upstream changes to g_static_mutex_get_mutex_impl_shortcut that broke
    users of GMutex and GStaticMutex (bgo#316221)



revert-316221.patch:

--- NEW FILE revert-316221.patch ---
--- trunk/glib/gthread.h	2007/10/21 17:01:29	5792
+++ trunk/glib/gthread.h	2008/03/12 15:36:38	6691
@@ -140,9 +140,15 @@
 /* internal function for fallback static mutex implementation */
 GMutex* g_static_mutex_get_mutex_impl   (GMutex **mutex);
 
+#ifdef __cplusplus
 #define g_static_mutex_get_mutex_impl_shortcut(mutex) \
   (g_atomic_pointer_get ((gpointer*)(void*)mutex) ? *(mutex) : \
    g_static_mutex_get_mutex_impl (mutex))
+#else
+#define g_static_mutex_get_mutex_impl_shortcut(mutex) \
+  (g_atomic_pointer_get (mutex) ? *(mutex) : \
+   g_static_mutex_get_mutex_impl (mutex))
+#endif
 
 /* shorthands for conditional and unconditional function calls */
 


Index: glib2.spec
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- glib2.spec	9 Apr 2008 15:00:24 -0000	1.164
+++ glib2.spec	14 Apr 2008 00:34:22 -0000	1.165
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.16.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -22,6 +22,10 @@
 # fix a possible crasher, http://bugzilla.gnome.org/show_bug.cgi?id=527132
 Patch0: appinfo.patch
 
+# revert a broken fix for http://bugzilla.gnome.org/show_bug.cgi?id=316221
+# committed on March 12, 2008
+Patch1: revert-316221.patch
+
 %description 
 GLib is the low-level core library that forms the basis
 for projects such as GTK+ and GNOME. It provides data structure
@@ -54,6 +58,7 @@
 %prep
 %setup -q -n glib-%{version}
 %patch0 -p1 -b .appinfo
+%patch1 -R -p1 -b .revert-316221
 
 %build
 %configure --disable-gtk-doc --enable-static 
@@ -126,6 +131,10 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Sun Apr 13 2008 Dan Williams <dcbw at redhat.com> - 2.16.3-3
+- Revert upstream changes to g_static_mutex_get_mutex_impl_shortcut that broke
+    users of GMutex and GStaticMutex (bgo#316221)
+
 * Wed Apr  9 2008 Matthias Clasen <mclasen at redhat.com> - 2.16.3-2
 - Fix a possible crash in application launching (bgo#527132)
 




More information about the fedora-extras-commits mailing list