r14014 - in /desktop/experimental/glib2.0/debian: changelog patches/03_assertion_macros_compiler_warnings.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Mon Dec 31 10:02:28 2007
New Revision: 14014

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14014
Log:
* Add patch 03_assertion_macros_compiler_warnings.patch from upstream SVN
  to prevent several compiler warnings caused by a change with the assertion
  macros.

Added:
    desktop/experimental/glib2.0/debian/patches/03_assertion_macros_compiler_warnings.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=14014&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog (original)
+++ desktop/experimental/glib2.0/debian/changelog Mon Dec 31 10:02:28 2007
@@ -10,12 +10,15 @@
     a GIO file/directory monitoring module that uses fam.
   * Add patch 02_fix_build_issue.patch, taken from the Ubuntu package to fix
     the build.
+  * Add patch 03_assertion_macros_compiler_warnings.patch from upstream SVN
+    to prevent several compiler warnings caused by a change with the assertion
+    macros.
 
   [Loic Minier]
   * Build-dep on gtk-doc-tools to prevent a spurious warning from
     gtk-doc.make: "/bin/sh: line 11: test: !=: unary operator expected".
 
- -- Sebastian Dröge <slomo at debian.org>  Sun, 23 Dec 2007 05:58:17 +0100
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 31 Dec 2007 11:01:04 +0100
 
 glib2.0 (2.14.4-2) unstable; urgency=low
 

Added: desktop/experimental/glib2.0/debian/patches/03_assertion_macros_compiler_warnings.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/03_assertion_macros_compiler_warnings.patch?rev=14014&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/03_assertion_macros_compiler_warnings.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/03_assertion_macros_compiler_warnings.patch Mon Dec 31 10:02:28 2007
@@ -1,0 +1,54 @@
+--- trunk/glib/glib.symbols	2007/12/31 04:45:19	6220
++++ trunk/glib/glib.symbols	2007/12/31 05:25:25	6221
+@@ -1278,10 +1278,10 @@
+ 
+ #if IN_HEADER(__G_TEST_UTILS_H__)
+ #if IN_FILE(__G_TEST_UTILS_C__)
+-g_assertion_message
+-g_assertion_message_cmpnum
+-g_assertion_message_cmpstr
+-g_assertion_message_expr
++g_assertion_message G_GNUC_NORETURN
++g_assertion_message_cmpnum G_GNUC_NORETURN
++g_assertion_message_cmpstr G_GNUC_NORETURN
++g_assertion_message_expr G_GNUC_NORETURN
+ g_strcmp0
+ g_test_add_data_func
+ g_test_add_func
+
+--- trunk/glib/gtestutils.h	2007/12/31 04:45:19	6220
++++ trunk/glib/gtestutils.h	2007/12/31 05:25:25	6221
+@@ -166,12 +166,12 @@
+                                          const char     *file,
+                                          int             line,
+                                          const char     *func,
+-                                         const char     *message);
++                                         const char     *message) G_GNUC_NORETURN;
+ void    g_assertion_message_expr        (const char     *domain,
+                                          const char     *file,
+                                          int             line,
+                                          const char     *func,
+-                                         const char     *expr);
++                                         const char     *expr) G_GNUC_NORETURN;
+ void    g_assertion_message_cmpstr      (const char     *domain,
+                                          const char     *file,
+                                          int             line,
+@@ -179,7 +179,7 @@
+                                          const char     *expr,
+                                          const char     *arg1,
+                                          const char     *cmp,
+-                                         const char     *arg2);
++                                         const char     *arg2) G_GNUC_NORETURN;
+ void    g_assertion_message_cmpnum      (const char     *domain,
+                                          const char     *file,
+                                          int             line,
+@@ -188,7 +188,7 @@
+                                          long double     arg1,
+                                          const char     *cmp,
+                                          long double     arg2,
+-                                         char            numtype);
++                                         char            numtype) G_GNUC_NORETURN;
+ void    g_test_add_vtable               (const char     *testpath,
+                                          gsize           data_size,
+                                          gconstpointer   test_data,
+