[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1948: pick up some upstream ABI changes (bug 3121)

Mats Wichmann mats at linuxfoundation.org
Mon May 7 11:52:06 UTC 2012


------------------------------------------------------------
revno: 1948
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Mon 2012-05-07 05:52:06 -0600
message:
  pick up some upstream ABI changes (bug 3121)
modified:
  headers/All/3.1/glib-2.0/glib.h.defs
  headers/All/3.1/gtk-2.0/gtk/gtk.h.defs
  headers/All/3.2/glib-2.0/glib.h.defs
  headers/All/3.2/gtk-2.0/gtk/gtk.h.defs
  headers/All/4.0/glib-2.0/glib.h.defs
  headers/All/4.0/gtk-2.0/gtk/gtk.h.defs
  headers/All/4.1/glib-2.0/glib.h.defs
  headers/All/4.1/gtk-2.0/gtk/gtk.h.defs
  headers/All/5.0/cairo/cairo-ft.h.defs
  headers/All/5.0/glib-2.0/glib-object.h.defs
  headers/All/5.0/glib-2.0/glib.h.defs
  headers/All/5.0/gtk-2.0/gtk/gtk.h.defs
  headers/glib-2.0/glib.h
  headers/gtk-2.0/gtk/gtk.h
  mkfilelists
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/3.1/glib-2.0/glib.h.defs'
--- a/headers/All/3.1/glib-2.0/glib.h.defs	2011-01-05 19:23:32 +0000
+++ b/headers/All/3.1/glib-2.0/glib.h.defs	2012-05-07 11:52:06 +0000
@@ -1385,7 +1385,8 @@
 extern gchar *g_convert_with_fallback(const gchar * str, gssize len,
 				      const gchar * to_codeset,
 				      const gchar * from_codeset,
-				      gchar * fallback, gsize * bytes_read,
+				      const gchar * fallback,
+				      gsize * bytes_read,
 				      gsize * bytes_written,
 				      GError * *error);
 extern gchar *g_convert_with_iconv(const gchar * str, gssize len,

=== modified file 'headers/All/3.1/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/3.1/gtk-2.0/gtk/gtk.h.defs	2010-10-07 12:33:25 +0000
+++ b/headers/All/3.1/gtk-2.0/gtk/gtk.h.defs	2012-05-07 11:52:06 +0000
@@ -7075,9 +7075,9 @@
 extern void gtk_init_add(GtkFunction function, gpointer data);
 extern gboolean gtk_init_check(int *argc, char ***argv);
 extern gboolean gtk_init_with_args(int *argc, char ***argv,
-				   char *parameter_string,
+				   const char *parameter_string,
 				   GOptionEntry * entries,
-				   char *translation_domain,
+				   const char *translation_domain,
 				   GError * *error);
 extern GType gtk_input_dialog_get_type(void);
 extern GtkWidget *gtk_input_dialog_new(void);

=== modified file 'headers/All/3.2/glib-2.0/glib.h.defs'
--- a/headers/All/3.2/glib-2.0/glib.h.defs	2011-01-05 19:23:32 +0000
+++ b/headers/All/3.2/glib-2.0/glib.h.defs	2012-05-07 11:52:06 +0000
@@ -1385,7 +1385,8 @@
 extern gchar *g_convert_with_fallback(const gchar * str, gssize len,
 				      const gchar * to_codeset,
 				      const gchar * from_codeset,
-				      gchar * fallback, gsize * bytes_read,
+				      const gchar * fallback,
+				      gsize * bytes_read,
 				      gsize * bytes_written,
 				      GError * *error);
 extern gchar *g_convert_with_iconv(const gchar * str, gssize len,

=== modified file 'headers/All/3.2/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/3.2/gtk-2.0/gtk/gtk.h.defs	2010-10-07 12:33:25 +0000
+++ b/headers/All/3.2/gtk-2.0/gtk/gtk.h.defs	2012-05-07 11:52:06 +0000
@@ -7075,9 +7075,9 @@
 extern void gtk_init_add(GtkFunction function, gpointer data);
 extern gboolean gtk_init_check(int *argc, char ***argv);
 extern gboolean gtk_init_with_args(int *argc, char ***argv,
-				   char *parameter_string,
+				   const char *parameter_string,
 				   GOptionEntry * entries,
-				   char *translation_domain,
+				   const char *translation_domain,
 				   GError * *error);
 extern GType gtk_input_dialog_get_type(void);
 extern GtkWidget *gtk_input_dialog_new(void);

=== modified file 'headers/All/4.0/glib-2.0/glib.h.defs'
--- a/headers/All/4.0/glib-2.0/glib.h.defs	2011-01-05 19:23:32 +0000
+++ b/headers/All/4.0/glib-2.0/glib.h.defs	2012-05-07 11:52:06 +0000
@@ -1398,7 +1398,8 @@
 extern gchar *g_convert_with_fallback(const gchar * str, gssize len,
 				      const gchar * to_codeset,
 				      const gchar * from_codeset,
-				      gchar * fallback, gsize * bytes_read,
+				      const gchar * fallback,
+				      gsize * bytes_read,
 				      gsize * bytes_written,
 				      GError * *error);
 extern gchar *g_convert_with_iconv(const gchar * str, gssize len,

=== modified file 'headers/All/4.0/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/4.0/gtk-2.0/gtk/gtk.h.defs	2010-09-21 13:38:11 +0000
+++ b/headers/All/4.0/gtk-2.0/gtk/gtk.h.defs	2012-05-07 11:52:06 +0000
@@ -7167,9 +7167,9 @@
 extern void gtk_init_add(GtkFunction function, gpointer data);
 extern gboolean gtk_init_check(int *argc, char ***argv);
 extern gboolean gtk_init_with_args(int *argc, char ***argv,
-				   char *parameter_string,
+				   const char *parameter_string,
 				   GOptionEntry * entries,
-				   char *translation_domain,
+				   const char *translation_domain,
 				   GError * *error);
 extern GType gtk_input_dialog_get_type(void);
 extern GtkWidget *gtk_input_dialog_new(void);

=== modified file 'headers/All/4.1/glib-2.0/glib.h.defs'
--- a/headers/All/4.1/glib-2.0/glib.h.defs	2011-01-05 19:23:32 +0000
+++ b/headers/All/4.1/glib-2.0/glib.h.defs	2012-05-07 11:52:06 +0000
@@ -1563,7 +1563,8 @@
 extern gchar *g_convert_with_fallback(const gchar * str, gssize len,
 				      const gchar * to_codeset,
 				      const gchar * from_codeset,
-				      gchar * fallback, gsize * bytes_read,
+				      const gchar * fallback,
+				      gsize * bytes_read,
 				      gsize * bytes_written,
 				      GError * *error);
 extern gchar *g_convert_with_iconv(const gchar * str, gssize len,

=== modified file 'headers/All/4.1/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/4.1/gtk-2.0/gtk/gtk.h.defs	2010-12-07 20:09:20 +0000
+++ b/headers/All/4.1/gtk-2.0/gtk/gtk.h.defs	2012-05-07 11:52:06 +0000
@@ -7596,9 +7596,9 @@
 extern void gtk_init_add(GtkFunction function, gpointer data);
 extern gboolean gtk_init_check(int *argc, char ***argv);
 extern gboolean gtk_init_with_args(int *argc, char ***argv,
-				   char *parameter_string,
+				   const char *parameter_string,
 				   GOptionEntry * entries,
-				   char *translation_domain,
+				   const char *translation_domain,
 				   GError * *error);
 extern GType gtk_input_dialog_get_type(void);
 extern GtkWidget *gtk_input_dialog_new(void);

=== modified file 'headers/All/5.0/cairo/cairo-ft.h.defs'
--- a/headers/All/5.0/cairo/cairo-ft.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/All/5.0/cairo/cairo-ft.h.defs	2012-05-07 11:52:06 +0000
@@ -7,7 +7,7 @@
 								pattern);
 extern void cairo_ft_font_options_substitute(const cairo_font_options_t *
 					     options, FcPattern * pattern);
-extern void cairo_ft_scaled_font_lock_face(cairo_scaled_font_t *
-					   scaled_font);
+extern FT_Face cairo_ft_scaled_font_lock_face(cairo_scaled_font_t *
+					      scaled_font);
 extern void cairo_ft_scaled_font_unlock_face(cairo_scaled_font_t *
 					     scaled_font);

=== modified file 'headers/All/5.0/glib-2.0/glib-object.h.defs'
--- a/headers/All/5.0/glib-2.0/glib-object.h.defs	2010-08-31 20:10:09 +0000
+++ b/headers/All/5.0/glib-2.0/glib-object.h.defs	2012-05-07 11:52:06 +0000
@@ -1270,7 +1270,7 @@
 						 gpointer);
 extern void g_value_copy(const GValue *, GValue *);
 extern gpointer g_value_dup_boxed(const GValue *);
-extern GObject *g_value_dup_object(const GValue *);
+extern gpointer g_value_dup_object(const GValue *);
 extern GParamSpec *g_value_dup_param(const GValue *);
 extern gchar *g_value_dup_string(const GValue *);
 extern gboolean g_value_fits_pointer(const GValue *);

=== modified file 'headers/All/5.0/glib-2.0/glib.h.defs'
--- a/headers/All/5.0/glib-2.0/glib.h.defs	2011-01-05 19:23:32 +0000
+++ b/headers/All/5.0/glib-2.0/glib.h.defs	2012-05-07 11:52:06 +0000
@@ -1563,7 +1563,8 @@
 extern gchar *g_convert_with_fallback(const gchar * str, gssize len,
 				      const gchar * to_codeset,
 				      const gchar * from_codeset,
-				      gchar * fallback, gsize * bytes_read,
+				      const gchar * fallback,
+				      gsize * bytes_read,
 				      gsize * bytes_written,
 				      GError * *error);
 extern gchar *g_convert_with_iconv(const gchar * str, gssize len,
@@ -1940,15 +1941,16 @@
 					  GKeyFileFlags flags,
 					  GError * *error);
 extern GKeyFile *g_key_file_new(void);
-extern void g_key_file_remove_comment(GKeyFile * key_file,
+extern gboolean g_key_file_remove_comment(GKeyFile * key_file,
+					  const gchar * group_name,
+					  const gchar * key,
+					  GError * *error);
+extern gboolean g_key_file_remove_group(GKeyFile * key_file,
+					const gchar * group_name,
+					GError * *error);
+extern gboolean g_key_file_remove_key(GKeyFile * key_file,
 				      const gchar * group_name,
 				      const gchar * key, GError * *error);
-extern void g_key_file_remove_group(GKeyFile * key_file,
-				    const gchar * group_name,
-				    GError * *error);
-extern void g_key_file_remove_key(GKeyFile * key_file,
-				  const gchar * group_name,
-				  const gchar * key, GError * *error);
 extern void g_key_file_set_boolean(GKeyFile * key_file,
 				   const gchar * group_name,
 				   const gchar * key, gboolean value);
@@ -1956,10 +1958,11 @@
 					const gchar * group_name,
 					const gchar * key, gboolean * list,
 					gsize length);
-extern void g_key_file_set_comment(GKeyFile * key_file,
-				   const gchar * group_name,
-				   const gchar * key,
-				   const gchar * comment, GError * *error);
+extern gboolean g_key_file_set_comment(GKeyFile * key_file,
+				       const gchar * group_name,
+				       const gchar * key,
+				       const gchar * comment,
+				       GError * *error);
 extern void g_key_file_set_double(GKeyFile * key_file,
 				  const gchar * group_name,
 				  const gchar * key, gdouble value);

=== modified file 'headers/All/5.0/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/5.0/gtk-2.0/gtk/gtk.h.defs	2010-12-07 20:09:20 +0000
+++ b/headers/All/5.0/gtk-2.0/gtk/gtk.h.defs	2012-05-07 11:52:06 +0000
@@ -7596,9 +7596,9 @@
 extern void gtk_init_add(GtkFunction function, gpointer data);
 extern gboolean gtk_init_check(int *argc, char ***argv);
 extern gboolean gtk_init_with_args(int *argc, char ***argv,
-				   char *parameter_string,
+				   const char *parameter_string,
 				   GOptionEntry * entries,
-				   char *translation_domain,
+				   const char *translation_domain,
 				   GError * *error);
 extern GType gtk_input_dialog_get_type(void);
 extern GtkWidget *gtk_input_dialog_new(void);
@@ -9063,7 +9063,7 @@
 extern GType gtk_target_list_get_type(void);
 extern GtkTargetList *gtk_target_list_new(const GtkTargetEntry * targets,
 					  guint ntargets);
-extern void gtk_target_list_ref(GtkTargetList * list);
+extern GtkTargetList gtk_target_list_ref(GtkTargetList * list);
 extern void gtk_target_list_remove(GtkTargetList * list, GdkAtom target);
 extern void gtk_target_list_unref(GtkTargetList * list);
 extern void gtk_target_table_free(GtkTargetEntry * targets,
@@ -9795,7 +9795,7 @@
 extern void gtk_tree_iter_free(GtkTreeIter * iter);
 extern GType gtk_tree_iter_get_type(void);
 extern void gtk_tree_model_filter_clear_cache(GtkTreeModelFilter * filter);
-extern void
+extern gboolean
 gtk_tree_model_filter_convert_child_iter_to_iter(GtkTreeModelFilter *
 						 filter,
 						 GtkTreeIter * filter_iter,
@@ -9905,13 +9905,11 @@
 					  gint * new_order);
 extern void gtk_tree_model_sort_clear_cache(GtkTreeModelSort *
 					    tree_model_sort);
-extern void gtk_tree_model_sort_convert_child_iter_to_iter(GtkTreeModelSort
-							   *
-							   tree_model_sort,
-							   GtkTreeIter *
-							   sort_iter,
-							   GtkTreeIter *
-							   child_iter);
+extern gboolean
+gtk_tree_model_sort_convert_child_iter_to_iter(GtkTreeModelSort *
+					       tree_model_sort,
+					       GtkTreeIter * sort_iter,
+					       GtkTreeIter * child_iter);
 extern GtkTreePath
     *gtk_tree_model_sort_convert_child_path_to_path(GtkTreeModelSort *
 						    tree_model_sort,

=== modified file 'headers/glib-2.0/glib.h'
--- a/headers/glib-2.0/glib.h	2011-01-05 19:23:32 +0000
+++ b/headers/glib-2.0/glib.h	2012-05-07 11:52:06 +0000
@@ -2450,7 +2450,7 @@
     extern gchar *g_convert_with_fallback(const gchar * str, gssize len,
 					  const gchar * to_codeset,
 					  const gchar * from_codeset,
-					  gchar * fallback,
+					  const gchar * fallback,
 					  gsize * bytes_read,
 					  gsize * bytes_written,
 					  GError * *error);

=== modified file 'headers/gtk-2.0/gtk/gtk.h'
--- a/headers/gtk-2.0/gtk/gtk.h	2010-12-07 20:09:20 +0000
+++ b/headers/gtk-2.0/gtk/gtk.h	2012-05-07 11:52:06 +0000
@@ -8970,9 +8970,9 @@
     extern void gtk_init_add(GtkFunction function, gpointer data);
     extern gboolean gtk_init_check(int *argc, char ***argv);
     extern gboolean gtk_init_with_args(int *argc, char ***argv,
-				       char *parameter_string,
+				       const char *parameter_string,
 				       GOptionEntry * entries,
-				       char *translation_domain,
+				       const char *translation_domain,
 				       GError * *error);
     extern GType gtk_input_dialog_get_type(void);
     extern GtkWidget *gtk_input_dialog_new(void);

=== modified file 'mkfilelists'
--- a/mkfilelists	2011-01-31 13:54:26 +0000
+++ b/mkfilelists	2012-05-07 11:52:06 +0000
@@ -29,7 +29,7 @@
 #============== Editable section ============== 
 # for package lists, one library-version name corresponding to the
 # default version vanishes and becomes just lib - this version:
-DEFAULTVER = "4.1"
+DEFAULTVER = "5.0"
 
 # Lists of names of the modules in core and desktop as they appear
 # in the database - this may need manual tweaking on changes

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-05-03 16:37:25 +0000
+++ b/package/Makefile	2012-05-07 11:52:06 +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=4
+RPM_PACKAGE_RELEASE=6
 
 # 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