r15070 - in /desktop/unstable/glib2.0/debian: changelog patches/80_static-mutex-aliasing-warnings.patch patches/81_c99-inline-warnings.patch patches/series

[slomo at users.alioth.debian.org]

Author: slomo
Date: Thu Mar 13 19:41:52 2008
New Revision: 15070

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15070
Log:
* 80_static-mutex-aliasing-warnings.patch: Prevent warnings about
  breaking strict-aliasing rules when using G_LOCK().
  See http://bugzilla.gnome.org/show_bug.cgi?id=316221
* 81_c99-inline-warnings.patch: Fix warnings when using G_INLINE_FUNC
  in C99 mode (Closes: #470796).
  See http://bugzilla.gnome.org/show_bug.cgi?id=522292

Added:
    desktop/unstable/glib2.0/debian/patches/80_static-mutex-aliasing-warnings.patch
    desktop/unstable/glib2.0/debian/patches/81_c99-inline-warnings.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/series

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=15070&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog (original)
+++ desktop/unstable/glib2.0/debian/changelog Thu Mar 13 19:41:52 2008
@@ -1,5 +1,6 @@
 glib2.0 (2.16.1-2) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * 02_usr_share_gnome_applications.patch: ported from GnomeVFS. Use 
     /usr/share/gnome/applications/defaults.list to obtain the defaults 
     for MIME mapping. Currently this file is still shipped by GnomeVFS.
@@ -9,7 +10,15 @@
     including those necessary for live-initramfs.
   * 04_nfs4.patch: ported from GnomeVFS. Support for nfs4 filesystems.
 
- -- Josselin Mouette <joss at debian.org>  Tue, 11 Mar 2008 20:59:50 +0100
+  [ Sebastian Dröge ]
+  * 80_static-mutex-aliasing-warnings.patch: Prevent warnings about
+    breaking strict-aliasing rules when using G_LOCK().
+    See http://bugzilla.gnome.org/show_bug.cgi?id=316221
+  * 81_c99-inline-warnings.patch: Fix warnings when using G_INLINE_FUNC
+    in C99 mode (Closes: #470796).
+    See http://bugzilla.gnome.org/show_bug.cgi?id=522292
+
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 13 Mar 2008 20:39:35 +0100
 
 glib2.0 (2.16.1-1) unstable; urgency=low
 

Added: desktop/unstable/glib2.0/debian/patches/80_static-mutex-aliasing-warnings.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/80_static-mutex-aliasing-warnings.patch?rev=15070&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/80_static-mutex-aliasing-warnings.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/80_static-mutex-aliasing-warnings.patch Thu Mar 13 19:41:52 2008
@@ -1,0 +1,19 @@
+--- trunk/glib/gthread.h	2008/03/12 15:04:22	6690
++++ 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 */
+ 
+

Added: desktop/unstable/glib2.0/debian/patches/81_c99-inline-warnings.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/81_c99-inline-warnings.patch?rev=15070&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/81_c99-inline-warnings.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/81_c99-inline-warnings.patch Thu Mar 13 19:41:52 2008
@@ -1,0 +1,12 @@
+--- glib/glib/gutils.h.old	2008-03-13 20:37:06.000000000 +0100
++++ glib/glib/gutils.h	2008-03-13 20:38:08.000000000 +0100
+@@ -97,7 +97,7 @@
+ #  define G_INLINE_FUNC
+ #  undef  G_CAN_INLINE
+ #elif defined (__GNUC__) 
+-#  ifdef __GNUC_STDC_INLINE__
++#  if defined (__GNUC_STDC_INLINE__) || defined (__GNUC_GNU_INLINE__)
+ #   define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
+ #  else
+ #   define G_INLINE_FUNC extern inline
+

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=15070&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series (original)
+++ desktop/unstable/glib2.0/debian/patches/series Thu Mar 13 19:41:52 2008
@@ -3,3 +3,5 @@
 03_blacklist-directories.patch
 04_nfs4.patch
 60_wait-longer-for-threads-to-die.patch
+80_static-mutex-aliasing-warnings.patch
+81_c99-inline-warnings.patch