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

[lool at users.alioth.debian.org]

Author: lool
Date: Sat Jun 16 17:21:44 2007
New Revision: 11549

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11549
Log:
* New patch, 67_gcc43-inline, fixes FTBFS of apps using glib with GCC 4.3
  which uses C99 where the meaning of "inline" changed; patch was adapted
  from patches in GNOME #315437 and Gentoo #156475; closes: #416863.

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

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=11549&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog (original)
+++ desktop/experimental/glib2.0/debian/changelog Sat Jun 16 17:21:44 2007
@@ -1,3 +1,11 @@
+glib2.0 (2.13.4-2) experimental; urgency=low
+
+  * New patch, 67_gcc43-inline, fixes FTBFS of apps using glib with GCC 4.3
+    which uses C99 where the meaning of "inline" changed; patch was adapted
+    from patches in GNOME #315437 and Gentoo #156475; closes: #416863.
+
+ -- Loic Minier <lool at dooz.org>  Sat, 16 Jun 2007 18:49:57 +0200
+
 glib2.0 (2.13.4-1) experimental; urgency=low
 
   * Also honor parallel=n in DEB_BUILD_OPTIONS.

Added: 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=11549&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/67_gcc43-inline.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/67_gcc43-inline.patch Sat Jun 16 17:21:44 2007
@@ -1,0 +1,25 @@
+GNOME #315437; Debian #416863; Gentoo #156475; fixes building of packages
+using glib against GCC 4.3
+
+Index: glib2.0-2.13.4/glib/gutils.h
+===================================================================
+--- glib2.0-2.13.4.orig/glib/gutils.h	2007-06-16 18:27:37.000000000 +0200
++++ glib2.0-2.13.4/glib/gutils.h	2007-06-16 18:30:08.000000000 +0200
+@@ -96,9 +96,14 @@
+ #ifdef G_IMPLEMENT_INLINES
+ #  define G_INLINE_FUNC
+ #  undef  G_CAN_INLINE
+-#elif defined (__GNUC__) 
+-#  define G_INLINE_FUNC extern inline
+-#elif defined (G_CAN_INLINE) 
++#elif defined (__GNUC__)
++#  if __GNUC_PREREQ (4,3) && defined (__STDC_VERSION__) \
++   && __STDC_VERSION__ >= 199901L
++#    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 */
+ #  define G_INLINE_FUNC

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=11549&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series (original)
+++ desktop/experimental/glib2.0/debian/patches/series Sat Jun 16 17:21:44 2007
@@ -1,2 +1,3 @@
 #01_gettext_desktopfiles.patch
 60_output-lines-during-tests.patch
+67_gcc43-inline.patch