[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1950: update gtk struct fields formerly marked reserved (bug 3363)

Mats Wichmann mats at linuxfoundation.org
Thu May 10 10:30:41 UTC 2012


------------------------------------------------------------
revno: 1950
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Thu 2012-05-10 04:30:41 -0600
message:
  update gtk struct fields formerly marked reserved (bug 3363)
modified:
  headers/All/5.0/atk-1.0/atk/atk.h.defs
  headers/All/5.0/glib-2.0/glib.h.defs
  headers/All/5.0/gtk-2.0/gdk/gdk.h.defs
  headers/All/5.0/gtk-2.0/gtk/gtk.h.defs
  headers/All/5.0/gtk-2.0/gtk/gtkstatusicon.h.defs
  headers/All/5.0/pango-1.0/pango/pango.h.defs
  headers/atk-1.0/atk/atk.h
  headers/glib-2.0/glib.h
  headers/gtk-2.0/gdk/gdk.h
  headers/gtk-2.0/gtk/gtk.h
  headers/gtk-2.0/gtk/gtkstatusicon.h
  headers/pango-1.0/pango/pango.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/atk-1.0/atk/atk.h.defs'
--- a/headers/All/5.0/atk-1.0/atk/atk.h.defs	2009-11-03 20:41:16 +0000
+++ b/headers/All/5.0/atk-1.0/atk/atk.h.defs	2012-05-10 10:30:41 +0000
@@ -551,7 +551,7 @@
      gint(*get_n_mime_types) (AtkStreamableContent *);
     const gchar *(*get_mime_type) (AtkStreamableContent *, gint);
     GIOChannel *(*get_stream) (AtkStreamableContent *, const gchar *);
-    AtkFunction pad1;
+    const gchar *(*get_uri) (void);
     AtkFunction pad2;
     AtkFunction pad3;
     AtkFunction pad4;
@@ -596,7 +596,7 @@
     void (*state_change) (AtkObject *, const gchar *, gboolean);
     void (*visible_data_changed) (AtkObject *);
     void (*active_descendant_changed) (AtkObject *, gpointer *);
-    AtkFunction pad1;
+    AtkAttributeSet *(*get_attributes) (void);
     AtkFunction pad2;
     AtkFunction pad3;
 } AtkObjectClass;
@@ -676,7 +676,7 @@
     void (*get_maximum_value) (AtkValue *, GValue *);
     void (*get_minimum_value) (AtkValue *, GValue *);
      gboolean(*set_current_value) (AtkValue *, const GValue *);
-    AtkFunction pad1;
+    void (*create_window) (AtkValue *, GValue *);
     AtkFunction pad2;
 } AtkValueIface;
 typedef struct _AtkRelationClass {
@@ -756,7 +756,7 @@
     void (*get_image_size) (AtkImage *, gint *, gint *);
      gboolean(*set_image_description) (AtkImage *, const gchar *);
     AtkFunction pad1;
-    AtkFunction pad2;
+    const gchar *(*get_image_locale) (void);
 } AtkImageIface;
 typedef struct _AtkComponentIface {
     GTypeInterface parent;
@@ -777,7 +777,7 @@
      AtkLayer(*get_layer) (AtkComponent *);
      gint(*get_mdi_zorder) (AtkComponent *);
     void (*bounds_changed) (AtkComponent *, AtkRectangle *);
-    AtkFunction pad2;
+     gdouble(*get_alpha) (void);
 } AtkComponentIface;
 typedef struct _AtkEditableTextIface {
     GTypeInterface parent_interface;
@@ -796,10 +796,10 @@
     GTypeInterface parent;
     const gchar *(*get_document_type) (AtkDocument *);
      gpointer(*get_document) (AtkDocument *);
-    AtkFunction pad1;
-    AtkFunction pad2;
-    AtkFunction pad3;
-    AtkFunction pad4;
+    const gchar *(*get_document_locale) (AtkDocument *);
+    AtkAttributeSet *(*get_document_attributes) (void);
+    const gchar *(*get_document_attribute_value) (void);
+     gboolean(*set_document_attribute) (void);
     AtkFunction pad5;
     AtkFunction pad6;
     AtkFunction pad7;

=== modified file 'headers/All/5.0/glib-2.0/glib.h.defs'
--- a/headers/All/5.0/glib-2.0/glib.h.defs	2012-05-07 11:52:06 +0000
+++ b/headers/All/5.0/glib-2.0/glib.h.defs	2012-05-10 10:30:41 +0000
@@ -646,8 +646,8 @@
     GSList *poll_fds;
     GSource *prev;
     GSource *next;
-    gpointer reserved1;
-    gpointer reserved2;
+    char *name;
+    GSourcePrivate *priv;
 } GSource;
 typedef gboolean(*GSourceFunc) (gpointer);
 typedef struct _GSourceCallbackFuncs {
@@ -1278,6 +1278,7 @@
     G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND
 } GBookmarkFileError;
 typedef struct _GBookmarkFile GBookmarkFile;
+typedef struct _GSourcePrivate GSourcePrivate;
 extern void g_allocator_free(GAllocator * allocator);
 extern GAllocator *g_allocator_new(const gchar * name, guint n_preallocs);
 extern GArray *g_array_append_vals(GArray * array, gconstpointer data,

=== modified file 'headers/All/5.0/gtk-2.0/gdk/gdk.h.defs'
--- a/headers/All/5.0/gtk-2.0/gdk/gdk.h.defs	2010-05-11 12:20:04 +0000
+++ b/headers/All/5.0/gtk-2.0/gdk/gdk.h.defs	2012-05-10 10:30:41 +0000
@@ -1236,11 +1236,11 @@
 				     PangoFont *, gint, gint,
 				     PangoGlyphString *);
     void (*draw_trapezoids) (GdkDrawable *, GdkGC *, GdkTrapezoid *, gint);
-    void (*_gdk_reserved3) (void);
-    void (*_gdk_reserved4) (void);
-    void (*_gdk_reserved5) (void);
-    void (*_gdk_reserved6) (void);
-    void (*_gdk_reserved7) (void);
+    cairo_surface_t *(*ref_cairo_surface) (void);
+    GdkDrawable *(*get_source_drawable) (void);
+    void (*set_cairo_clip) (void);
+    cairo_surface_t *(*create_cairo_surface) (void);
+    void (*draw_drawable_with_src) (void);
     void (*_gdk_reserved9) (void);
     void (*_gdk_reserved10) (void);
     void (*_gdk_reserved11) (void);
@@ -1318,6 +1318,14 @@
     GDK_WA_WMCLASS = 1 << 7,
     GDK_WA_NOREDIR = 1 << 8
 } GdkWindowAttributesType;
+typedef struct _GdkEventGrabBroken {
+    GdkEventType type;
+    GdkWindow *window;
+    gint8 send_event;
+    gboolean keyboard;
+    gboolean implicit;
+    GdkWindow *grab_window;
+} GdkEventGrabBroken;
 extern void gdk_add_client_message_filter(GdkAtom message_type,
 					  GdkFilterFunc func,
 					  gpointer data);

=== 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	2012-05-07 11:52:06 +0000
+++ b/headers/All/5.0/gtk-2.0/gtk/gtk.h.defs	2012-05-10 10:30:41 +0000
@@ -2812,7 +2812,7 @@
     PangoTabArray *tabs;
     GtkWrapMode wrap_mode;
     PangoLanguage *language;
-    gpointer padding1;
+    GdkColor *pg_bg_color;
     guint invisible:1;
     guint bg_full_height:1;
     guint editable:1;
@@ -3307,9 +3307,10 @@
     AtkObject *(*get_accessible) (GtkWidget *);
     void (*screen_changed) (GtkWidget *, GdkScreen *);
      gboolean(*can_activate_accel) (GtkWidget *, guint);
-    void (*_gtk_reserved2) (void);
-    void (*_gtk_reserved3) (void);
-    void (*_gtk_reserved4) (void);
+     gboolean(*grab_broken_event) (void);
+    void (*composited_changed) (GtkWidget *);
+     gboolean(*query_tooltip) (GtkWidget *, gint, gint, gboolean,
+			       GtkTooltip *);
     void (*_gtk_reserved5) (void);
     void (*_gtk_reserved6) (void);
     void (*_gtk_reserved7) (void);
@@ -4224,8 +4225,8 @@
     void (*activate_item) (GtkMenuItem *);
     void (*toggle_size_request) (GtkMenuItem *, gint *);
     void (*toggle_size_allocate) (GtkMenuItem *, gint);
-    void (*_gtk_reserved1) (void);
-    void (*_gtk_reserved2) (void);
+    void (*set_label) (void);
+    const gchar *(*get_label) (void);
     void (*_gtk_reserved3) (void);
     void (*_gtk_reserved4) (void);
 } GtkMenuItemClass;
@@ -4265,7 +4266,7 @@
     GtkWidget *(*create_tool_item) (GtkAction *);
     void (*connect_proxy) (GtkAction *, GtkWidget *);
     void (*disconnect_proxy) (GtkAction *, GtkWidget *);
-    void (*_gtk_reserved1) (void);
+    GtkWidget *(*create_menu) (GtkAction *);
     void (*_gtk_reserved2) (void);
     void (*_gtk_reserved3) (void);
     void (*_gtk_reserved4) (void);
@@ -4360,7 +4361,7 @@
     void (*select_item) (GtkMenuShell *, GtkWidget *);
     void (*insert) (GtkMenuShell *, GtkWidget *, gint);
      gint(*get_popup_delay) (GtkMenuShell *);
-    void (*_gtk_reserved1) (void);
+     gboolean(*move_selected) (void);
     void (*_gtk_reserved2) (void);
     void (*_gtk_reserved3) (void);
 } GtkMenuShellClass;
@@ -4376,7 +4377,7 @@
     void (*move_cursor) (GtkLabel *, GtkMovementStep, gint, gboolean);
     void (*copy_clipboard) (GtkLabel *);
     void (*populate_popup) (GtkLabel *, GtkMenu *);
-    void (*_gtk_reserved1) (void);
+     gboolean(*activate_link) (void);
     void (*_gtk_reserved2) (void);
     void (*_gtk_reserved3) (void);
     void (*_gtk_reserved4) (void);
@@ -4542,7 +4543,7 @@
 			const GtkTextIter *);
     void (*begin_user_action) (GtkTextBuffer *);
     void (*end_user_action) (GtkTextBuffer *);
-    void (*_gtk_reserved1) (void);
+    void (*paste_done) (void);
     void (*_gtk_reserved2) (void);
     void (*_gtk_reserved3) (void);
     void (*_gtk_reserved4) (void);
@@ -4766,7 +4767,7 @@
     void (*draw_resize_grip) (GtkStyle *, GdkWindow *, GtkStateType,
 			      GdkRectangle *, GtkWidget *, const gchar *,
 			      GdkWindowEdge, gint, gint, gint, gint);
-    void (*_gtk_reserved1) (void);
+    void (*get_text_area_size) (void);
     void (*_gtk_reserved2) (void);
     void (*_gtk_reserved3) (void);
     void (*_gtk_reserved4) (void);
@@ -4906,7 +4907,7 @@
     void (*copy_clipboard) (GtkEntry *);
     void (*paste_clipboard) (GtkEntry *);
     void (*toggle_overwrite) (GtkEntry *);
-    void (*_gtk_reserved1) (void);
+    void (*get_text_area_size) (void);
     void (*_gtk_reserved2) (void);
     void (*_gtk_reserved3) (void);
 } GtkEntryClass;
@@ -4916,7 +4917,7 @@
      gint(*output) (GtkSpinButton *);
     void (*value_changed) (GtkSpinButton *);
     void (*change_value) (GtkSpinButton *, GtkScrollType);
-    void (*_gtk_reserved1) (void);
+    void (*cursor_on_match) (GtkSpinButton *);
     void (*_gtk_reserved2) (void);
     void (*_gtk_reserved3) (void);
     void (*_gtk_reserved4) (void);
@@ -4948,7 +4949,8 @@
 				GtkTreeIter *);
     void (*action_activated) (GtkEntryCompletion *, gint);
      gboolean(*insert_prefix) (GtkEntryCompletion *, const gchar *);
-    void (*_gtk_reserved0) (void);
+     gboolean(*cursor_on_match) (GtkEntryCompletion *, GtkTreeModel *,
+				 GtkTreeIter *);
     void (*_gtk_reserved1) (void);
     void (*_gtk_reserved2) (void);
 } GtkEntryCompletionClass;
@@ -5236,7 +5238,7 @@
 } GtkSeparatorMenuItem;
 typedef struct _GtkAboutDialogClass {
     GtkDialogClass parent_class;
-    void (*_gtk_reserved1) (void);
+     gboolean(*activate_link) (void);
     void (*_gtk_reserved2) (void);
     void (*_gtk_reserved3) (void);
     void (*_gtk_reserved4) (void);
@@ -5250,7 +5252,7 @@
 } GtkListStoreClass;
 typedef struct _GtkFileChooserButtonClass {
     GtkHBoxClass parent_class;
-    void *__gtk_reserved1;
+    void (*file_set) (void);
     void *__gtk_reserved2;
     void *__gtk_reserved3;
     void *__gtk_reserved4;
@@ -5294,9 +5296,9 @@
      gboolean(*focus_tab) (GtkNotebook *, GtkNotebookTab);
     void (*change_current_page) (GtkNotebook *, gint);
     void (*move_focus_out) (GtkNotebook *, GtkDirectionType);
-    void (*_gtk_reserved1) (void);
-    void (*_gtk_reserved2) (void);
-    void (*_gtk_reserved3) (void);
+     gboolean(*reorder_tab) (void);
+     gint(*insert_page) (void);
+    GtkNotebook *(*create_window) (void);
     void (*_gtk_reserved4) (void);
 } GtkNotebookClass;
 typedef struct _GtkImageMenuItemClass {
@@ -5554,7 +5556,7 @@
     GtkWidget *(*create_custom_widget) (void);
     void (*custom_widget_apply) (void);
      gboolean(*preview) (void);
-    void (*_gtk_reserved1) (void);
+    void (*update_custom_widget) (void);
     void (*_gtk_reserved2) (void);
     void (*_gtk_reserved3) (void);
     void (*_gtk_reserved4) (void);
@@ -5748,6 +5750,7 @@
 } GtkCellRendererAccelMode;
 typedef void (*GtkTreeViewSearchPositionFunc) (GtkTreeView *, GtkWidget *,
 					       gpointer);
+typedef struct _GtkTooltip GtkTooltip;
 extern const gchar *const *gtk_about_dialog_get_artists(GtkAboutDialog *
 							about);
 extern const gchar *const *gtk_about_dialog_get_authors(GtkAboutDialog *

=== modified file 'headers/All/5.0/gtk-2.0/gtk/gtkstatusicon.h.defs'
--- a/headers/All/5.0/gtk-2.0/gtk/gtkstatusicon.h.defs	2010-12-07 20:09:20 +0000
+++ b/headers/All/5.0/gtk-2.0/gtk/gtkstatusicon.h.defs	2012-05-10 10:30:41 +0000
@@ -16,14 +16,16 @@
     void (*activate) (void);
     void (*popup_menu) (void);
      gboolean(*size_changed) (void);
-    void *__gtk_reserved1;
-    void *__gtk_reserved2;
-    void *__gtk_reserved3;
-    void *__gtk_reserved4;
+     gboolean(*button_press_event) (GtkStatusIcon *, GdkEventButton *);
+     gboolean(*button_release_event) (GtkStatusIcon *, GdkEventButton *);
+     gboolean(*scroll_event) (GtkStatusIcon *, GdkEventButton *);
+     gboolean(*query_tooltip) (GtkStatusIcon *, gint, gint, gboolean,
+			       GtkTooltip *);
     void *__gtk_reserved5;
     void *__gtk_reserved6;
 } GtkStatusIconClass;
 typedef struct _GtkStatusIconPrivate GtkStatusIconPrivate;
+typedef struct _GtkTooltip GtkTooltip;
 extern gboolean gtk_status_icon_get_blinking(GtkStatusIcon * status_icon);
 extern gboolean gtk_status_icon_get_geometry(GtkStatusIcon * status_icon,
 					     GdkScreen * *screen,

=== modified file 'headers/All/5.0/pango-1.0/pango/pango.h.defs'
--- a/headers/All/5.0/pango-1.0/pango/pango.h.defs	2012-04-09 22:25:23 +0000
+++ b/headers/All/5.0/pango-1.0/pango/pango.h.defs	2012-05-10 10:30:41 +0000
@@ -441,7 +441,7 @@
     void (*begin) (PangoRenderer *);
     void (*end) (PangoRenderer *);
     void (*prepare_run) (PangoRenderer *, PangoLayoutRun *);
-    void (*_pango_reserved1) (void);
+    void (*draw_glyph_item) (void);
     void (*_pango_reserved2) (void);
     void (*_pango_reserved3) (void);
     void (*_pango_reserved4) (void);

=== modified file 'headers/atk-1.0/atk/atk.h'
--- a/headers/atk-1.0/atk/atk.h	2009-04-26 12:14:54 +0000
+++ b/headers/atk-1.0/atk/atk.h	2012-05-10 10:30:41 +0000
@@ -696,7 +696,12 @@
 	 gint(*get_n_mime_types) (AtkStreamableContent *);
 	const gchar *(*get_mime_type) (AtkStreamableContent *, gint);
 	GIOChannel *(*get_stream) (AtkStreamableContent *, const gchar *);
+#if __LSB_VERSION__ < 50
 	AtkFunction pad1;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	const gchar *(*get_uri) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	AtkFunction pad2;
 	AtkFunction pad3;
 	AtkFunction pad4;
@@ -746,7 +751,12 @@
 	void (*state_change) (AtkObject *, const gchar *, gboolean);
 	void (*visible_data_changed) (AtkObject *);
 	void (*active_descendant_changed) (AtkObject *, gpointer *);
+#if __LSB_VERSION__ < 50
 	AtkFunction pad1;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	AtkAttributeSet *(*get_attributes) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	AtkFunction pad2;
 	AtkFunction pad3;
     };
@@ -832,7 +842,12 @@
 	void (*get_maximum_value) (AtkValue *, GValue *);
 	void (*get_minimum_value) (AtkValue *, GValue *);
 	 gboolean(*set_current_value) (AtkValue *, const GValue *);
+#if __LSB_VERSION__ < 50
 	AtkFunction pad1;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	void (*create_window) (AtkValue *, GValue *);
+#endif				/* __LSB_VERSION__ >= 50 */
 	AtkFunction pad2;
     };
 
@@ -922,7 +937,12 @@
 	void (*get_image_size) (AtkImage *, gint *, gint *);
 	 gboolean(*set_image_description) (AtkImage *, const gchar *);
 	AtkFunction pad1;
+#if __LSB_VERSION__ < 50
 	AtkFunction pad2;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	const gchar *(*get_image_locale) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
     };
 
     struct _AtkComponentIface {
@@ -946,7 +966,12 @@
 	 AtkLayer(*get_layer) (AtkComponent *);
 	 gint(*get_mdi_zorder) (AtkComponent *);
 	void (*bounds_changed) (AtkComponent *, AtkRectangle *);
+#if __LSB_VERSION__ < 50
 	AtkFunction pad2;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	 gdouble(*get_alpha) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
     };
 
     struct _AtkEditableTextIface {
@@ -968,10 +993,30 @@
 	GTypeInterface parent;
 	const gchar *(*get_document_type) (AtkDocument *);
 	 gpointer(*get_document) (AtkDocument *);
+#if __LSB_VERSION__ < 50
 	AtkFunction pad1;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	const gchar *(*get_document_locale) (AtkDocument *);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	AtkFunction pad2;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	AtkAttributeSet *(*get_document_attributes) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	AtkFunction pad3;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	const gchar *(*get_document_attribute_value) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	AtkFunction pad4;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	 gboolean(*set_document_attribute) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	AtkFunction pad5;
 	AtkFunction pad6;
 	AtkFunction pad7;

=== modified file 'headers/glib-2.0/glib.h'
--- a/headers/glib-2.0/glib.h	2012-05-07 11:52:06 +0000
+++ b/headers/glib-2.0/glib.h	2012-05-10 10:30:41 +0000
@@ -1880,6 +1880,11 @@
 
 #endif				/* __LSB_VERSION__ >= 4.1 */
 
+#if __LSB_VERSION__ >= 50
+    typedef struct _GSourcePrivate GSourcePrivate;
+
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
     struct _GThread {
 	GThreadFunc func;
 	gpointer data;
@@ -2013,8 +2018,18 @@
 	GSList *poll_fds;
 	GSource *prev;
 	GSource *next;
+#if __LSB_VERSION__ < 50
 	gpointer reserved1;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	char *name;
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	gpointer reserved2;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	GSourcePrivate *priv;
+#endif				/* __LSB_VERSION__ >= 50 */
     };
 
     struct _GSourceCallbackFuncs {

=== modified file 'headers/gtk-2.0/gdk/gdk.h'
--- a/headers/gtk-2.0/gdk/gdk.h	2012-04-09 22:25:23 +0000
+++ b/headers/gtk-2.0/gdk/gdk.h	2012-05-10 10:30:41 +0000
@@ -959,6 +959,11 @@
 	GDK_WA_NOREDIR = 1 << 8
     } GdkWindowAttributesType;
 
+#if __LSB_VERSION__ >= 50
+    typedef struct _GdkEventGrabBroken GdkEventGrabBroken;
+
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
     struct _GdkDrawable {
 	GObject parent_instance;
     };
@@ -1520,11 +1525,36 @@
 					 gint, PangoGlyphString *);
 	void (*draw_trapezoids) (GdkDrawable *, GdkGC *, GdkTrapezoid *,
 				 gint);
+#if __LSB_VERSION__ < 50
 	void (*_gdk_reserved3) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	cairo_surface_t *(*ref_cairo_surface) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	void (*_gdk_reserved4) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	GdkDrawable *(*get_source_drawable) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	void (*_gdk_reserved5) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	void (*set_cairo_clip) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	void (*_gdk_reserved6) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	cairo_surface_t *(*create_cairo_surface) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	void (*_gdk_reserved7) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	void (*draw_drawable_with_src) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_gdk_reserved9) (void);
 	void (*_gdk_reserved10) (void);
 	void (*_gdk_reserved11) (void);
@@ -1590,6 +1620,18 @@
 	void (*_gdk_reserved4) (void);
     };
 
+#if __LSB_VERSION__ >= 50
+    struct _GdkEventGrabBroken {
+	GdkEventType type;
+	GdkWindow *window;
+	gint8 send_event;
+	gboolean keyboard;
+	gboolean implicit;
+	GdkWindow *grab_window;
+    };
+
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
 
 /* Function prototypes */
 

=== modified file 'headers/gtk-2.0/gtk/gtk.h'
--- a/headers/gtk-2.0/gtk/gtk.h	2012-05-07 11:52:06 +0000
+++ b/headers/gtk-2.0/gtk/gtk.h	2012-05-10 10:30:41 +0000
@@ -3677,6 +3677,11 @@
 
 #endif				/* __LSB_VERSION__ >= 4.1 */
 
+#if __LSB_VERSION__ >= 50
+    typedef struct _GtkTooltip GtkTooltip;
+
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
     enum {
 	GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID = -1,
 	GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID = -2
@@ -4223,7 +4228,12 @@
 	PangoTabArray *tabs;
 	GtkWrapMode wrap_mode;
 	PangoLanguage *language;
+#if __LSB_VERSION__ < 50
 	gpointer padding1;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	GdkColor *pg_bg_color;
+#endif				/* __LSB_VERSION__ >= 50 */
 	guint invisible:1;
 	guint bg_full_height:1;
 	guint editable:1;
@@ -4707,9 +4717,25 @@
 	AtkObject *(*get_accessible) (GtkWidget *);
 	void (*screen_changed) (GtkWidget *, GdkScreen *);
 	 gboolean(*can_activate_accel) (GtkWidget *, guint);
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved2) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	 gboolean(*grab_broken_event) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved3) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	void (*composited_changed) (GtkWidget *);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved4) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	 gboolean(*query_tooltip) (GtkWidget *, gint, gint, gboolean,
+				   GtkTooltip *);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_gtk_reserved5) (void);
 	void (*_gtk_reserved6) (void);
 	void (*_gtk_reserved7) (void);
@@ -5537,8 +5563,18 @@
 	void (*activate_item) (GtkMenuItem *);
 	void (*toggle_size_request) (GtkMenuItem *, gint *);
 	void (*toggle_size_allocate) (GtkMenuItem *, gint);
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved1) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	void (*set_label) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved2) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	const gchar *(*get_label) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_gtk_reserved3) (void);
 	void (*_gtk_reserved4) (void);
     };
@@ -5582,7 +5618,12 @@
 	GtkWidget *(*create_tool_item) (GtkAction *);
 	void (*connect_proxy) (GtkAction *, GtkWidget *);
 	void (*disconnect_proxy) (GtkAction *, GtkWidget *);
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved1) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	GtkWidget *(*create_menu) (GtkAction *);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_gtk_reserved2) (void);
 	void (*_gtk_reserved3) (void);
 	void (*_gtk_reserved4) (void);
@@ -5686,7 +5727,12 @@
 	void (*select_item) (GtkMenuShell *, GtkWidget *);
 	void (*insert) (GtkMenuShell *, GtkWidget *, gint);
 	 gint(*get_popup_delay) (GtkMenuShell *);
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved1) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	 gboolean(*move_selected) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_gtk_reserved2) (void);
 	void (*_gtk_reserved3) (void);
     };
@@ -5704,7 +5750,12 @@
 	void (*move_cursor) (GtkLabel *, GtkMovementStep, gint, gboolean);
 	void (*copy_clipboard) (GtkLabel *);
 	void (*populate_popup) (GtkLabel *, GtkMenu *);
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved1) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	 gboolean(*activate_link) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_gtk_reserved2) (void);
 	void (*_gtk_reserved3) (void);
 	void (*_gtk_reserved4) (void);
@@ -5890,7 +5941,12 @@
 			    const GtkTextIter *, const GtkTextIter *);
 	void (*begin_user_action) (GtkTextBuffer *);
 	void (*end_user_action) (GtkTextBuffer *);
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved1) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	void (*paste_done) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_gtk_reserved2) (void);
 	void (*_gtk_reserved3) (void);
 	void (*_gtk_reserved4) (void);
@@ -6139,7 +6195,12 @@
 				  GdkRectangle *, GtkWidget *,
 				  const gchar *, GdkWindowEdge, gint, gint,
 				  gint, gint);
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved1) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	void (*get_text_area_size) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_gtk_reserved2) (void);
 	void (*_gtk_reserved3) (void);
 	void (*_gtk_reserved4) (void);
@@ -6296,7 +6357,12 @@
 	void (*copy_clipboard) (GtkEntry *);
 	void (*paste_clipboard) (GtkEntry *);
 	void (*toggle_overwrite) (GtkEntry *);
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved1) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	void (*get_text_area_size) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_gtk_reserved2) (void);
 	void (*_gtk_reserved3) (void);
     };
@@ -6307,7 +6373,12 @@
 	 gint(*output) (GtkSpinButton *);
 	void (*value_changed) (GtkSpinButton *);
 	void (*change_value) (GtkSpinButton *, GtkScrollType);
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved1) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	void (*cursor_on_match) (GtkSpinButton *);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_gtk_reserved2) (void);
 	void (*_gtk_reserved3) (void);
 	void (*_gtk_reserved4) (void);
@@ -6342,7 +6413,13 @@
 				    GtkTreeIter *);
 	void (*action_activated) (GtkEntryCompletion *, gint);
 	 gboolean(*insert_prefix) (GtkEntryCompletion *, const gchar *);
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved0) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	 gboolean(*cursor_on_match) (GtkEntryCompletion *, GtkTreeModel *,
+				     GtkTreeIter *);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_gtk_reserved1) (void);
 	void (*_gtk_reserved2) (void);
     };
@@ -6677,7 +6754,12 @@
 
     struct _GtkAboutDialogClass {
 	GtkDialogClass parent_class;
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved1) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	 gboolean(*activate_link) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_gtk_reserved2) (void);
 	void (*_gtk_reserved3) (void);
 	void (*_gtk_reserved4) (void);
@@ -6693,7 +6775,12 @@
 
     struct _GtkFileChooserButtonClass {
 	GtkHBoxClass parent_class;
+#if __LSB_VERSION__ < 50
 	void *__gtk_reserved1;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	void (*file_set) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void *__gtk_reserved2;
 	void *__gtk_reserved3;
 	void *__gtk_reserved4;
@@ -6739,9 +6826,24 @@
 	 gboolean(*focus_tab) (GtkNotebook *, GtkNotebookTab);
 	void (*change_current_page) (GtkNotebook *, gint);
 	void (*move_focus_out) (GtkNotebook *, GtkDirectionType);
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved1) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	 gboolean(*reorder_tab) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved2) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	 gint(*insert_page) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved3) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	GtkNotebook *(*create_window) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_gtk_reserved4) (void);
     };
 
@@ -6890,7 +6992,12 @@
 	GtkWidget *(*create_custom_widget) (void);
 	void (*custom_widget_apply) (void);
 	 gboolean(*preview) (void);
+#if __LSB_VERSION__ < 50
 	void (*_gtk_reserved1) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	void (*update_custom_widget) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_gtk_reserved2) (void);
 	void (*_gtk_reserved3) (void);
 	void (*_gtk_reserved4) (void);

=== modified file 'headers/gtk-2.0/gtk/gtkstatusicon.h'
--- a/headers/gtk-2.0/gtk/gtkstatusicon.h	2010-12-07 20:09:20 +0000
+++ b/headers/gtk-2.0/gtk/gtkstatusicon.h	2012-05-10 10:30:41 +0000
@@ -29,6 +29,11 @@
 
     typedef struct _GtkStatusIconPrivate GtkStatusIconPrivate;
 
+#if __LSB_VERSION__ >= 50
+    typedef struct _GtkTooltip GtkTooltip;
+
+#endif				/* __LSB_VERSION__ >= 5.0 */
+
     struct _GtkStatusIcon {
 	GObject parent_instance;
 	GtkStatusIconPrivate *priv;
@@ -39,10 +44,32 @@
 	void (*activate) (void);
 	void (*popup_menu) (void);
 	 gboolean(*size_changed) (void);
+#if __LSB_VERSION__ < 50
 	void *__gtk_reserved1;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	 gboolean(*button_press_event) (GtkStatusIcon *, GdkEventButton *);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	void *__gtk_reserved2;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	 gboolean(*button_release_event) (GtkStatusIcon *,
+					  GdkEventButton *);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	void *__gtk_reserved3;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	 gboolean(*scroll_event) (GtkStatusIcon *, GdkEventButton *);
+#endif				/* __LSB_VERSION__ >= 50 */
+#if __LSB_VERSION__ < 50
 	void *__gtk_reserved4;
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	 gboolean(*query_tooltip) (GtkStatusIcon *, gint, gint, gboolean,
+				   GtkTooltip *);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void *__gtk_reserved5;
 	void *__gtk_reserved6;
     };

=== modified file 'headers/pango-1.0/pango/pango.h'
--- a/headers/pango-1.0/pango/pango.h	2012-04-09 22:25:23 +0000
+++ b/headers/pango-1.0/pango/pango.h	2012-05-10 10:30:41 +0000
@@ -568,7 +568,12 @@
 	void (*begin) (PangoRenderer *);
 	void (*end) (PangoRenderer *);
 	void (*prepare_run) (PangoRenderer *, PangoLayoutRun *);
+#if __LSB_VERSION__ < 50
 	void (*_pango_reserved1) (void);
+#endif				/* __LSB_VERSION__ < 50 */
+#if __LSB_VERSION__ >= 50
+	void (*draw_glyph_item) (void);
+#endif				/* __LSB_VERSION__ >= 50 */
 	void (*_pango_reserved2) (void);
 	void (*_pango_reserved3) (void);
 	void (*_pango_reserved4) (void);

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-05-07 12:13:17 +0000
+++ b/package/Makefile	2012-05-10 10:30:41 +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=7
+RPM_PACKAGE_RELEASE=8
 
 # 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