OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=16

glib-gcc43.patch

@@ -0,0 +1,15 @@
+--- glib/gutils.h.orig	2007-09-26 14:27:57.000000000 +0200
++++ glib/gutils.h	2007-09-26 14:29:13.000000000 +0200
+@@ -97,7 +97,11 @@
+ #  define G_INLINE_FUNC
+ #  undef  G_CAN_INLINE
+ #elif defined (__GNUC__) 
+-#  define G_INLINE_FUNC extern inline
++#  if defined (__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 */

glib2.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 11 15:19:01 CEST 2007 - rguenther@suse.de
+
+- Fix glib2 headers for C99 programs and GCC 4.3.
+
 -------------------------------------------------------------------
 Mon Sep 17 10:33:10 CEST 2007 - sbrabec@suse.cz
 

glib2.spec

@@ -17,7 +17,7 @@ License:        LGPL v2 or later
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
 Version:        2.14.1
-Release:        2
+Release:        7
 Summary:        A Library with Convenient Functions Written in C
 Url:            http://www.gtk.org/
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2
@@ -29,6 +29,7 @@ Source3:        gtk-doc.m4
 Patch0:         glib-mkinstalldirs.patch
 Patch1:         glib-aclocal.patch
 Patch2:         glib-cast.patch
+Patch3:         glib-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       %{name}-lang = %{version}
 # For temporary %%pre script only.
@@ -124,6 +125,7 @@ Authors:
 %patch0
 %patch1
 %patch2
+%patch3
 if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
     cp -a %{S:3} m4macros/
 fi
@@ -178,8 +180,9 @@ rm -rf $RPM_BUILD_ROOT
 # Own these repositories to not depend on gtk-doc while building:
 %dir %{_datadir}/gtk-doc
 %dir %{_datadir}/gtk-doc/html
-
 %changelog
+* Thu Oct 11 2007 - rguenther@suse.de
+- Fix glib2 headers for C99 programs and GCC 4.3.
 * Mon Sep 17 2007 - sbrabec@suse.cz
 - Updated to version 2.14.1:
   * more bugs fixed