[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2266: clean up some gtk3 issues reported by tool

Mats Wichmann mats at linuxfoundation.org
Wed Jun 11 15:11:39 UTC 2014


------------------------------------------------------------
revno: 2266
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Wed 2014-06-11 09:11:39 -0600
message:
  clean up some gtk3 issues reported by tool
modified:
  headers/All/5.0/gtk-3.0/gtk/gtk.h.defs
  headers/All/5.1/gtk-3.0/gtk/gtk.h.defs
  headers/gtk-3.0/gtk/gtk.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/gtk-3.0/gtk/gtk.h.defs'
--- a/headers/All/5.0/gtk-3.0/gtk/gtk.h.defs	2014-06-05 21:04:28 +0000
+++ b/headers/All/5.0/gtk-3.0/gtk/gtk.h.defs	2014-06-11 15:11:39 +0000
@@ -1237,7 +1237,7 @@
     GtkMountOperationPrivate *priv;
 } GtkMountOperation;
 typedef struct _GtkMountOperationClass {
-    GMountOperationClass parent_instance;
+    GMountOperationClass parent_class;
     void (*_gtk_reserved1) (void);
     void (*_gtk_reserved2) (void);
     void (*_gtk_reserved3) (void);
@@ -1315,7 +1315,7 @@
     GtkMenuButtonPrivate *priv;
 } GtkMenuButton;
 typedef struct _GtkMenuButtonClass {
-    GtkToggleButtonClass parent;
+    GtkToggleButtonClass parent_class;
     void (*_gtk_reserved1) (void);
     void (*_gtk_reserved2) (void);
     void (*_gtk_reserved3) (void);
@@ -1960,7 +1960,7 @@
     gpointer padding[14];
 } GtkApplicationWindowClass;
 typedef struct _GtkApplicationWindow {
-    GtkWindow instance;
+    GtkWindow parent_instance;
     GtkApplicationWindowPrivate *priv;
 } GtkApplicationWindow;
 typedef struct _GtkEntryCompletion {
@@ -2863,7 +2863,7 @@
 } GtkMenuToolButton;
 typedef struct _GtkMenuToolButtonPrivate GtkMenuToolButtonPrivate;
 typedef struct _GtkColorChooserWidget {
-    GtkBox widget;
+    GtkBox parent_instance;
     GtkColorChooserWidgetPrivate *priv;
 } GtkColorChooserWidget;
 typedef struct _GtkColorChooserWidgetPrivate GtkColorChooserWidgetPrivate;

=== modified file 'headers/All/5.1/gtk-3.0/gtk/gtk.h.defs'
--- a/headers/All/5.1/gtk-3.0/gtk/gtk.h.defs	2014-06-05 21:04:28 +0000
+++ b/headers/All/5.1/gtk-3.0/gtk/gtk.h.defs	2014-06-11 15:11:39 +0000
@@ -1237,7 +1237,7 @@
     GtkMountOperationPrivate *priv;
 } GtkMountOperation;
 typedef struct _GtkMountOperationClass {
-    GMountOperationClass parent_instance;
+    GMountOperationClass parent_class;
     void (*_gtk_reserved1) (void);
     void (*_gtk_reserved2) (void);
     void (*_gtk_reserved3) (void);
@@ -1315,7 +1315,7 @@
     GtkMenuButtonPrivate *priv;
 } GtkMenuButton;
 typedef struct _GtkMenuButtonClass {
-    GtkToggleButtonClass parent;
+    GtkToggleButtonClass parent_class;
     void (*_gtk_reserved1) (void);
     void (*_gtk_reserved2) (void);
     void (*_gtk_reserved3) (void);
@@ -1960,7 +1960,7 @@
     gpointer padding[14];
 } GtkApplicationWindowClass;
 typedef struct _GtkApplicationWindow {
-    GtkWindow instance;
+    GtkWindow parent_instance;
     GtkApplicationWindowPrivate *priv;
 } GtkApplicationWindow;
 typedef struct _GtkEntryCompletion {
@@ -2863,7 +2863,7 @@
 } GtkMenuToolButton;
 typedef struct _GtkMenuToolButtonPrivate GtkMenuToolButtonPrivate;
 typedef struct _GtkColorChooserWidget {
-    GtkBox widget;
+    GtkBox parent_instance;
     GtkColorChooserWidgetPrivate *priv;
 } GtkColorChooserWidget;
 typedef struct _GtkColorChooserWidgetPrivate GtkColorChooserWidgetPrivate;

=== modified file 'headers/gtk-3.0/gtk/gtk.h'
--- a/headers/gtk-3.0/gtk/gtk.h	2014-06-11 14:07:37 +0000
+++ b/headers/gtk-3.0/gtk/gtk.h	2014-06-11 15:11:39 +0000
@@ -3261,7 +3261,7 @@
     };
 
     struct _GtkMountOperationClass {
-	GMountOperationClass parent_instance;
+	GMountOperationClass parent_class;
 	void (*_gtk_reserved1) (void);
 	void (*_gtk_reserved2) (void);
 	void (*_gtk_reserved3) (void);
@@ -3333,7 +3333,7 @@
     };
 
     struct _GtkMenuButtonClass {
-	GtkToggleButtonClass parent;
+	GtkToggleButtonClass parent_class;
 	void (*_gtk_reserved1) (void);
 	void (*_gtk_reserved2) (void);
 	void (*_gtk_reserved3) (void);
@@ -3869,7 +3869,7 @@
     struct _GtkStyleProviderIface;
 
     struct _GtkApplicationWindow {
-	GtkWindow instance;
+	GtkWindow parent_instance;
 	GtkApplicationWindowPrivate *priv;
     };
 
@@ -4280,7 +4280,7 @@
     struct _GtkMenuToolButtonClass;
 
     struct _GtkColorChooserWidget {
-	GtkBox widget;
+	GtkBox parent_instance;
 	GtkColorChooserWidgetPrivate *priv;
     };
 

=== modified file 'package/Makefile'
--- a/package/Makefile	2014-06-11 14:07:37 +0000
+++ b/package/Makefile	2014-06-11 15:11:39 +0000
@@ -50,7 +50,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
-BUILDNO=1
+BUILDNO=2
 
 # 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