rpms/glib2/devel inline.patch,NONE,1.1 glib2.spec,1.157,1.158

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	glib2.spec 
Added Files:
	inline.patch 
Log Message:
fix inline support


inline.patch:

--- NEW FILE inline.patch ---
diff -up glib-2.15.6/glib/gutils.h.inline glib-2.15.6/glib/gutils.h
--- glib-2.15.6/glib/gutils.h.inline	2008-03-03 09:46:44.000000000 -0500
+++ glib-2.15.6/glib/gutils.h	2008-03-03 09:46:52.000000000 -0500
@@ -97,7 +97,11 @@ G_BEGIN_DECLS
 #  define G_INLINE_FUNC
 #  undef  G_CAN_INLINE
 #elif defined (__GNUC__) 
-#  define G_INLINE_FUNC static __inline __attribute__ ((unused))
+#  ifdef __GNUC_STDC_INLINE__
+#   define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
+#  else
+#   define G_INLINE_FUNC extern inline
+#  endif
 #elif defined (G_CAN_INLINE) 
 #  define G_INLINE_FUNC static inline
 #else /* can't inline */


Index: glib2.spec
===================================================================
RCS file: /cvs/extras/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- glib2.spec	25 Feb 2008 20:21:00 -0000	1.157
+++ glib2.spec	3 Mar 2008 14:48:18 -0000	1.158
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.15.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -18,6 +18,8 @@
 BuildRequires: libselinux-devel
 # for sys/inotify.h
 BuildRequires: glibc-devel
+# fixed in upstream svn
+Patch0: inline.patch
 
 
 %description 
@@ -51,6 +53,7 @@
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p1 -b .inline
 
 %build
 %configure --disable-gtk-doc --enable-static 
@@ -123,6 +126,9 @@
 %{_libdir}/lib*.a
 
 %changelog
+* Mon Mar  3 2008 Matthias Clasen <mclasen at redhat.com> - 2.15.6-2
+- Fix inline support
+
 * Mon Feb 25 2008 Matthias Clasen <mclasen at redhat.com> - 2.15.6-1
 - Update to 2.15.6