r12347 - in /desktop/experimental/glib2.0/debian: changelog patches/67_gcc43-inline.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Aug 16 15:11:03 2007
New Revision: 12347

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12347
Log:
* Update patch 67_gcc43-inline to also fix the headers for GCC 4.2.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/67_gcc43-inline.patch

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=12347&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog (original)
+++ desktop/experimental/glib2.0/debian/changelog Thu Aug 16 15:11:03 2007
@@ -1,8 +1,9 @@
 glib2.0 (2.13.7-4) UNRELEASED; urgency=low
 
   * Fix double --host/--build flags to configure.
-
- -- Loic Minier <lool at dooz.org>  Sun, 12 Aug 2007 14:13:35 +0200
+  * Update patch 67_gcc43-inline to also fix the headers for GCC 4.2.
+
+ -- Loic Minier <lool at dooz.org>  Thu, 16 Aug 2007 17:10:49 +0200
 
 glib2.0 (2.13.7-3) experimental; urgency=low
 

Modified: desktop/experimental/glib2.0/debian/patches/67_gcc43-inline.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/67_gcc43-inline.patch?rev=12347&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/67_gcc43-inline.patch (original)
+++ desktop/experimental/glib2.0/debian/patches/67_gcc43-inline.patch Thu Aug 16 15:11:03 2007
@@ -1,5 +1,5 @@
 GNOME #315437; Debian #416863; Gentoo #156475; fixes building of packages
-using glib against GCC 4.3
+using glib against GCC 4.2 and 4.3
 
 Index: glib2.0-2.13.4/glib/gutils.h
 ===================================================================
@@ -13,7 +13,7 @@
 -#  define G_INLINE_FUNC extern inline
 -#elif defined (G_CAN_INLINE) 
 +#elif defined (__GNUC__)
-+#  if __GNUC_PREREQ (4,3) && defined (__STDC_VERSION__) \
++#  if __GNUC_PREREQ (4,2) && defined (__STDC_VERSION__) \
 +   && __STDC_VERSION__ >= 199901L
 +#    define G_INLINE_FUNC extern __inline __attribute__ ((__gnu_inline__))
 +#  else