[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1982: restore lost commit relating to API changes (bug 3453)
Mats Wichmann
mats at linuxfoundation.org
Tue Jun 26 14:25:54 UTC 2012
------------------------------------------------------------
revno: 1982
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Tue 2012-06-26 08:25:54 -0600
message:
restore lost commit relating to API changes (bug 3453)
modified:
headers/cairo/cairo-ft.h
headers/glib-2.0/glib-object.h
headers/glib-2.0/glib.h
headers/gtk-2.0/gtk/gtk.h
headers/libxml2/libxml/parserInternals.h
headers/mkheader
-------------- next part --------------
=== modified file 'headers/cairo/cairo-ft.h'
--- a/headers/cairo/cairo-ft.h 2009-04-26 12:14:54 +0000
+++ b/headers/cairo/cairo-ft.h 2012-06-26 14:25:54 +0000
@@ -28,10 +28,18 @@
extern void cairo_ft_font_options_substitute(const cairo_font_options_t
* options,
FcPattern * pattern);
+ extern void cairo_ft_scaled_font_unlock_face(cairo_scaled_font_t *
+ scaled_font);
+#if __LSB_VERSION__ < 50
extern void 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);
+#endif /* __LSB_VERSION__ < 5.0 */
+
+#if __LSB_VERSION__ >= 50
+ extern FT_Face cairo_ft_scaled_font_lock_face(cairo_scaled_font_t *
+ scaled_font);
+#endif /* __LSB_VERSION__ >= 5.0 */
+
#ifdef __cplusplus
}
#endif
=== modified file 'headers/glib-2.0/glib-object.h'
--- a/headers/glib-2.0/glib-object.h 2010-08-31 20:10:09 +0000
+++ b/headers/glib-2.0/glib-object.h 2012-06-26 14:25:54 +0000
@@ -1495,7 +1495,6 @@
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 GParamSpec *g_value_dup_param(const GValue *);
extern gchar *g_value_dup_string(const GValue *);
extern gboolean g_value_fits_pointer(const GValue *);
@@ -1552,6 +1551,10 @@
extern gboolean g_value_type_compatible(GType, GType);
extern gboolean g_value_type_transformable(GType, GType);
extern void g_value_unset(GValue *);
+#if __LSB_VERSION__ < 50
+ extern GObject *g_value_dup_object(const GValue *);
+#endif /* __LSB_VERSION__ < 5.0 */
+
#if __LSB_VERSION__ >= 40
extern void g_object_add_toggle_ref(GObject *, GToggleNotify,
gpointer);
@@ -1584,6 +1587,10 @@
extern void g_value_set_gtype(GValue * value, GType v_gtype);
#endif /* __LSB_VERSION__ >= 4.1 */
+#if __LSB_VERSION__ >= 50
+ extern gpointer g_value_dup_object(const GValue *);
+#endif /* __LSB_VERSION__ >= 5.0 */
+
#ifdef __cplusplus
}
#endif
=== modified file 'headers/glib-2.0/glib.h'
--- a/headers/glib-2.0/glib.h 2012-05-10 10:30:41 +0000
+++ b/headers/glib-2.0/glib.h 2012-06-26 14:25:54 +0000
@@ -2857,16 +2857,6 @@
GKeyFileFlags flags,
GError * *error);
extern GKeyFile *g_key_file_new(void);
- extern void g_key_file_remove_comment(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);
@@ -2874,11 +2864,6 @@
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 void g_key_file_set_integer(GKeyFile * key_file,
const gchar * group_name,
const gchar * key, gint value);
@@ -3879,6 +3864,24 @@
extern GMemVTable *glib_mem_profiler_table;
extern const guint glib_micro_version;
extern const guint glib_minor_version;
+#if __LSB_VERSION__ < 50
+ extern void g_key_file_remove_comment(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_comment(GKeyFile * key_file,
+ const gchar * group_name,
+ const gchar * key,
+ const gchar * comment,
+ GError * *error);
+#endif /* __LSB_VERSION__ < 5.0 */
+
#if __LSB_VERSION__ >= 40
extern gchar *g_build_filenamev(gchar * *args);
extern gchar *g_build_pathv(const gchar * separator, gchar * *args);
@@ -4137,6 +4140,25 @@
extern gboolean g_unichar_iswide_cjk(gunichar c);
#endif /* __LSB_VERSION__ >= 4.1 */
+#if __LSB_VERSION__ >= 50
+ 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 gboolean g_key_file_set_comment(GKeyFile * key_file,
+ const gchar * group_name,
+ const gchar * key,
+ const gchar * comment,
+ GError * *error);
+#endif /* __LSB_VERSION__ >= 5.0 */
+
#ifdef __cplusplus
}
#endif
=== modified file 'headers/gtk-2.0/gtk/gtk.h'
--- a/headers/gtk-2.0/gtk/gtk.h 2012-05-10 10:30:41 +0000
+++ b/headers/gtk-2.0/gtk/gtk.h 2012-06-26 14:25:54 +0000
@@ -10161,7 +10161,6 @@
GdkAtom target, guint * info);
extern GtkTargetList *gtk_target_list_new(const GtkTargetEntry *
targets, guint ntargets);
- extern void gtk_target_list_ref(GtkTargetList * list);
extern void gtk_target_list_remove(GtkTargetList * list,
GdkAtom target);
extern void gtk_target_list_unref(GtkTargetList * list);
@@ -10978,13 +10977,6 @@
extern GType gtk_tree_iter_get_type(void);
extern void gtk_tree_model_filter_clear_cache(GtkTreeModelFilter *
filter);
- extern void
- gtk_tree_model_filter_convert_child_iter_to_iter(GtkTreeModelFilter
- * filter,
- GtkTreeIter *
- filter_iter,
- GtkTreeIter *
- child_iter);
extern GtkTreePath
*gtk_tree_model_filter_convert_child_path_to_path
(GtkTreeModelFilter * filter, GtkTreePath * child_path);
@@ -11095,13 +11087,6 @@
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 GtkTreePath
*gtk_tree_model_sort_convert_child_path_to_path(GtkTreeModelSort *
tree_model_sort,
@@ -12208,6 +12193,24 @@
guint xid);
#endif /* __LSB_VERSION__ < 3.2 */
+#if __LSB_VERSION__ < 50
+ extern void gtk_target_list_ref(GtkTargetList * list);
+ extern void
+ gtk_tree_model_filter_convert_child_iter_to_iter(GtkTreeModelFilter
+ * filter,
+ GtkTreeIter *
+ filter_iter,
+ GtkTreeIter *
+ child_iter);
+ extern void
+ gtk_tree_model_sort_convert_child_iter_to_iter(GtkTreeModelSort *
+ tree_model_sort,
+ GtkTreeIter *
+ sort_iter,
+ GtkTreeIter *
+ child_iter);
+#endif /* __LSB_VERSION__ < 5.0 */
+
#if __LSB_VERSION__ >= 32
extern void gtk_toolbar_set_icon_size(GtkToolbar * toolbar,
GtkIconSize icon_size);
@@ -13075,6 +13078,24 @@
gboolean setting);
#endif /* __LSB_VERSION__ >= 4.1 */
+#if __LSB_VERSION__ >= 50
+ extern GtkTargetList gtk_target_list_ref(GtkTargetList * list);
+ extern gboolean
+ gtk_tree_model_filter_convert_child_iter_to_iter(GtkTreeModelFilter
+ * filter,
+ GtkTreeIter *
+ filter_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);
+#endif /* __LSB_VERSION__ >= 5.0 */
+
#ifdef __cplusplus
}
#endif
=== modified file 'headers/libxml2/libxml/parserInternals.h'
--- a/headers/libxml2/libxml/parserInternals.h 2009-04-26 12:14:54 +0000
+++ b/headers/libxml2/libxml/parserInternals.h 2012-06-26 14:25:54 +0000
@@ -156,8 +156,6 @@
extern void xmlParserInputShrink(xmlParserInputPtr in);
extern unsigned int xmlParserMaxDepth;
extern xmlChar xmlPopInput(xmlParserCtxtPtr ctxt);
- extern void xmlPushInput(xmlParserCtxtPtr ctxt,
- xmlParserInputPtr input);
extern void xmlSetEntityReferenceFunc(xmlEntityReferenceFunc func);
extern int xmlSkipBlankChars(xmlParserCtxtPtr ctxt);
extern xmlChar *xmlSplitQName(xmlParserCtxtPtr ctxt,
@@ -183,6 +181,16 @@
xmlCharEncodingHandlerPtr handler);
extern int xmlSwitchToEncoding(xmlParserCtxtPtr ctxt,
xmlCharEncodingHandlerPtr handler);
+#if __LSB_VERSION__ < 50
+ extern void xmlPushInput(xmlParserCtxtPtr ctxt,
+ xmlParserInputPtr input);
+#endif /* __LSB_VERSION__ < 5.0 */
+
+#if __LSB_VERSION__ >= 50
+ extern int xmlPushInput(xmlParserCtxtPtr ctxt,
+ xmlParserInputPtr input);
+#endif /* __LSB_VERSION__ >= 5.0 */
+
#ifdef __cplusplus
}
#endif
=== modified file 'headers/mkheader'
--- a/headers/mkheader 2012-04-09 22:25:23 +0000
+++ b/headers/mkheader 2012-06-26 14:25:54 +0000
@@ -545,7 +545,7 @@
# A trick here - join ArchInt once more to join two intervals for the same symbol,
# if 'appearedin' value of one of them is equal to 'withdrawnin' value of another.
# This can happen if we change version of binary symbol without affecting source-level information
-$create.= "LEFT JOIN ArchInt AI_2 ON AI_1.AIarch=AI_2.AIarch AND AI_1.AIint=AI_2.AIint AND AI_1.AIwithdrawnin=AI_2.AIappearedin ";
+$create.= "LEFT JOIN ArchInt AI_2 ON AI_1.AIarch=AI_2.AIarch AND AI_1.AIint=AI_2.AIint AND AI_1.AIwithdrawnin=AI_2.AIappearedin AND AI_1.AIreturn=AI_2.AIreturn ";
$create.= "LEFT JOIN ArchType ON ATtid=Tid AND ATaid=AI_1.AIarch ";
$create.= "LEFT JOIN Architecture ON AI_1.AIarch=Aid ";
$create.= "WHERE Iheader=$Hid ";
More information about the lsb-messages
mailing list