[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1998: glib updates to help with dynchk gen problems (bug 3682)

Mats Wichmann mats at linuxfoundation.org
Wed Oct 24 14:43:14 UTC 2012


------------------------------------------------------------
revno: 1998
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Wed 2012-10-24 08:43:14 -0600
message:
  glib updates to help with dynchk gen problems (bug 3682)
modified:
  headers/All/5.0/glib-2.0/glib.h.defs
  headers/glib-2.0/glib.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/glib-2.0/glib.h.defs'
--- a/headers/All/5.0/glib-2.0/glib.h.defs	2012-10-24 14:07:13 +0000
+++ b/headers/All/5.0/glib-2.0/glib.h.defs	2012-10-24 14:43:14 +0000
@@ -472,6 +472,7 @@
 #define G_STATIC_MUTEX_INIT	{ NULL }
 
 typedef float gfloat;
+typedef gint64 goffset;
 
 #define __G_BOOKMARK_FILE_H__
 #define __G_SLICE_H__
@@ -1744,9 +1745,10 @@
 					GTimeVal * end_time);
 extern gpointer g_async_queue_timed_pop_unlocked(GAsyncQueue * queue,
 						 GTimeVal * end_time);
-extern g_async_queue_timeout_pop(GAsyncQueue * queue, guint64 timeout);
-extern g_async_queue_timeout_pop_unlocked(GAsyncQueue * queue,
+extern gpointer g_async_queue_timeout_pop(GAsyncQueue * queue,
 					  guint64 timeout);
+extern gpointer g_async_queue_timeout_pop_unlocked(GAsyncQueue * queue,
+						   guint64 timeout);
 extern gpointer g_async_queue_try_pop(GAsyncQueue * queue);
 extern gpointer g_async_queue_try_pop_unlocked(GAsyncQueue * queue);
 extern void g_async_queue_unlock(GAsyncQueue * queue);
@@ -2047,7 +2049,7 @@
 extern void g_datalist_clear(GData * *datalist);
 extern void g_datalist_foreach(GData * *datalist, GDataForeachFunc func,
 			       gpointer user_data);
-extern g_datalist_get_data(GData * *datalist, const char *key);
+extern gpointer g_datalist_get_data(GData * *datalist, const char *key);
 extern guint g_datalist_get_flags(GData * *datalist);
 extern gpointer g_datalist_id_get_data(GData * *datalist, GQuark key_id);
 extern gpointer g_datalist_id_remove_no_notify(GData * *datalist,
@@ -2248,7 +2250,7 @@
 				 GError * *error);
 extern gchar *g_find_program_in_path(const gchar * program);
 extern gchar *g_format_size(guint64 size);
-extern gchar *g_format_size_for_display(void);
+extern gchar *g_format_size_for_display(goffset size);
 extern gchar *g_format_size_full(guint64 size, GFormatSizeFlags flags);
 extern void g_free(gpointer mem);
 extern const gchar *g_get_application_name(void);
@@ -3748,7 +3750,7 @@
 			      gconstpointer user_data);
 extern gboolean g_tree_steal(GTree * tree, gconstpointer key);
 extern void g_tree_traverse(GTree * tree, GTraverseFunc traverse_func,
-			    void *user_data);
+			    GTraverseType traverse_type, void *user_data);
 extern void g_tree_unref(GTree * tree);
 extern gpointer g_try_malloc(gulong n_bytes);
 extern void *g_try_malloc0(gsize n_bytes);

=== modified file 'headers/glib-2.0/glib.h'
--- a/headers/glib-2.0/glib.h	2012-10-24 14:07:13 +0000
+++ b/headers/glib-2.0/glib.h	2012-10-24 14:43:14 +0000
@@ -1168,6 +1168,8 @@
 #if __LSB_VERSION__ >= 50
     typedef float gfloat;
 
+    typedef gint64 goffset;
+
 #endif				/* __LSB_VERSION__ >= 5.0 */
 
 
@@ -4745,9 +4747,10 @@
     /* g_async_queue_ref_unlocked is deprecated and should not be used in newly-written code. Since 2.8, reference counting is done atomically so g_async_queue_ref can be used regardless of the queue's lock. */
     extern void g_async_queue_ref_unlocked(GAsyncQueue *
 					   queue) LSB_DECL_DEPRECATED;
-    extern g_async_queue_timeout_pop(GAsyncQueue * queue, guint64 timeout);
-    extern g_async_queue_timeout_pop_unlocked(GAsyncQueue * queue,
+    extern gpointer g_async_queue_timeout_pop(GAsyncQueue * queue,
 					      guint64 timeout);
+    extern gpointer g_async_queue_timeout_pop_unlocked(GAsyncQueue * queue,
+						       guint64 timeout);
     /* g_async_queue_unref_and_unlock is deprecated and should not be used in newly-written code. Since 2.8, reference counting is done atomically so g_async_queue_unref can be used regardless of the queue's lock. */
     extern void g_async_queue_unref_and_unlock(GAsyncQueue *
 					       queue) LSB_DECL_DEPRECATED;
@@ -4849,7 +4852,8 @@
     extern gboolean g_cond_wait_until(GCond * cond, GMutex * mutex,
 				      gint64 end_time);
 #undef g_datalist_get_data
-    extern g_datalist_get_data(GData * *datalist, const char *key);
+    extern gpointer g_datalist_get_data(GData * *datalist,
+					const char *key);
     extern GDateTime *g_date_time_add(GDateTime * datetime,
 				      GTimeSpan timespan);
     extern GDateTime *g_date_time_add_days(GDateTime * datetime,
@@ -4949,7 +4953,8 @@
     extern GError *g_error_new_valist(GQuark domain, gint code,
 				      const gchar * format, va_list args);
     extern gchar *g_format_size(guint64 size);
-    extern gchar *g_format_size_for_display(void) LSB_DECL_DEPRECATED;
+    extern gchar *g_format_size_for_display(goffset size)
+	LSB_DECL_DEPRECATED;
     extern gchar *g_format_size_full(guint64 size, GFormatSizeFlags flags);
     extern gchar *g_get_codeset(void);
     extern gchar **g_get_environ(void);
@@ -5492,6 +5497,7 @@
     extern GTree *g_tree_ref(GTree * tree);
     /* g_tree_traverse is deprecated and should not be used in newly-written code. The order of a balanced tree is somewhat arbitrary. If you just want to visit all nodes in sorted order, use g_tree_foreach instead. If you really need to visit nodes in a different order, consider using an N-ary Tree. */
     extern void g_tree_traverse(GTree * tree, GTraverseFunc traverse_func,
+				GTraverseType traverse_type,
 				void *user_data) LSB_DECL_DEPRECATED;
     extern void g_tree_unref(GTree * tree);
     extern void *g_try_malloc0(gsize n_bytes);

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-10-24 14:07:13 +0000
+++ b/package/Makefile	2012-10-24 14:43:14 +0000
@@ -46,7 +46,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=2
+RPM_PACKAGE_RELEASE=3
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)



More information about the lsb-messages mailing list