[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2231: add a patch for gtk-3.0/gtk/gtk.h ordering (bug 3931)

[Mats Wichmann]

------------------------------------------------------------
revno: 2231
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Wed 2014-03-05 10:00:05 -0700
message:
  add a patch for gtk-3.0/gtk/gtk.h ordering (bug 3931)
added:
  headers/gtk-3.0-gtk.patch
modified:
  headers/HACKS
  headers/gtk-3.0/gtk/gtk.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/HACKS'
--- a/headers/HACKS	2014-03-05 16:37:59 +0000
+++ b/headers/HACKS	2014-03-05 17:00:05 +0000
@@ -1,3 +1,4 @@
 cups/cups.h cups-hack.patch
 X11/ShellP.h ShellP-hack.patch
 gtk-3.0/gdk/gdk.h gtk-3.0-gdk.patch
+gtk-3.0/gtk/gtk.h gtk-3.0-gtk.patch

=== added file 'headers/gtk-3.0-gtk.patch'
--- a/headers/gtk-3.0-gtk.patch	1970-01-01 00:00:00 +0000
+++ b/headers/gtk-3.0-gtk.patch	2014-03-05 17:00:05 +0000
@@ -0,0 +1,74 @@
+=== modified file 'gtk-3.0/gtk/gtk.h'
+--- gtk-3.0/gtk/gtk.h	revid:mats at linuxfoundation.org-20140305163759-0y8mg11rwxllvcqe
++++ gtk-3.0/gtk/gtk.h	2014-03-05 16:55:05 +0000
+@@ -691,6 +691,8 @@
+ 
+     typedef struct _GtkPageSetup GtkPageSetup;
+ 
++    typedef struct _GtkWidget GtkWidget;	   /* XXX move from below */
++
+     typedef gint(*GtkKeySnoopFunc) (GtkWidget * grab_widget,
+ 				    GdkEventKey * event,
+ 				    gpointer func_data);
+@@ -717,7 +719,7 @@
+ 
+     typedef struct _GtkTooltip GtkTooltip;
+ 
+-    typedef struct _GtkWidget GtkWidget;
++    /* typedef struct _GtkWidget GtkWidget;		XXX move up */
+ 
+     typedef struct _GtkWidgetPath GtkWidgetPath;
+ 
+@@ -729,6 +731,16 @@
+ 
+     typedef struct _GtkTextMark GtkTextMark;
+ 
++    typedef struct _GtkCellRenderer GtkCellRenderer;  /* XXX move from below */
++
++    typedef struct _GtkTreeIter GtkTreeIter;	      /* XXX move from below */
++
++    typedef struct _GtkTreePath GtkTreePath;	      /* XXX move from below */
++
++    typedef struct _GtkTreeModel GtkTreeModel;	      /* XXX move from below */
++
++    typedef struct _GtkTreeSelection GtkTreeSelection;/* XXX move from below */
++
+     typedef gboolean(*GtkTreeSelectionFunc) (GtkTreeSelection * selection,
+ 					     GtkTreeModel * model,
+ 					     GtkTreePath * path,
+@@ -989,7 +1001,7 @@
+ 	GTK_CELL_RENDERER_EXPANDED
+     } GtkCellRendererState;
+ 
+-    typedef struct _GtkCellRenderer GtkCellRenderer;
++    /* typedef struct _GtkCellRenderer GtkCellRenderer;  XXX move up */
+ 
+     typedef struct _GtkCellRendererClass GtkCellRendererClass;
+ 
+@@ -1611,7 +1623,7 @@
+ 
+     typedef struct _GtkTreeView GtkTreeView;
+ 
+-    typedef struct _GtkTreeSelection GtkTreeSelection;
++    /* typedef struct _GtkTreeSelection GtkTreeSelection;   XXX move up */
+ 
+     typedef gboolean(*GtkTreeViewColumnDropFunc) (GtkTreeView * tree_view,
+ 						  GtkTreeViewColumn *
+@@ -1666,13 +1678,13 @@
+ 	GTK_LICENSE_ARTISTIC
+     } GtkLicense;
+ 
+-    typedef struct _GtkTreeIter GtkTreeIter;
++    /* typedef struct _GtkTreeIter GtkTreeIter;		XXX move up */
+ 
+-    typedef struct _GtkTreePath GtkTreePath;
++    /* typedef struct _GtkTreePath GtkTreePath;		XXX move up */
+ 
+     typedef struct _GtkTreeRowReference GtkTreeRowReference;
+ 
+-    typedef struct _GtkTreeModel GtkTreeModel;
++    /* typedef struct _GtkTreeModel GtkTreeModel;	XXX move up */
+ 
+     typedef gboolean(*GtkTreeModelForeachFunc) (GtkTreeModel * model,
+ 						GtkTreePath * path,
+

=== modified file 'headers/gtk-3.0/gtk/gtk.h'
--- a/headers/gtk-3.0/gtk/gtk.h	2014-03-05 15:29:22 +0000
+++ b/headers/gtk-3.0/gtk/gtk.h	2014-03-05 17:00:05 +0000
@@ -691,6 +691,8 @@
 
     typedef struct _GtkPageSetup GtkPageSetup;
 
+    typedef struct _GtkWidget GtkWidget;	   /* XXX move from below */
+
     typedef gint(*GtkKeySnoopFunc) (GtkWidget * grab_widget,
 				    GdkEventKey * event,
 				    gpointer func_data);
@@ -717,7 +719,7 @@
 
     typedef struct _GtkTooltip GtkTooltip;
 
-    typedef struct _GtkWidget GtkWidget;
+    /* typedef struct _GtkWidget GtkWidget;		XXX move up */
 
     typedef struct _GtkWidgetPath GtkWidgetPath;
 
@@ -729,6 +731,16 @@
 
     typedef struct _GtkTextMark GtkTextMark;
 
+    typedef struct _GtkCellRenderer GtkCellRenderer;  /* XXX move from below */
+
+    typedef struct _GtkTreeIter GtkTreeIter;	      /* XXX move from below */
+
+    typedef struct _GtkTreePath GtkTreePath;	      /* XXX move from below */
+
+    typedef struct _GtkTreeModel GtkTreeModel;	      /* XXX move from below */
+
+    typedef struct _GtkTreeSelection GtkTreeSelection;/* XXX move from below */
+
     typedef gboolean(*GtkTreeSelectionFunc) (GtkTreeSelection * selection,
 					     GtkTreeModel * model,
 					     GtkTreePath * path,
@@ -989,7 +1001,7 @@
 	GTK_CELL_RENDERER_EXPANDED
     } GtkCellRendererState;
 
-    typedef struct _GtkCellRenderer GtkCellRenderer;
+    /* typedef struct _GtkCellRenderer GtkCellRenderer;  XXX move up */
 
     typedef struct _GtkCellRendererClass GtkCellRendererClass;
 
@@ -1611,7 +1623,7 @@
 
     typedef struct _GtkTreeView GtkTreeView;
 
-    typedef struct _GtkTreeSelection GtkTreeSelection;
+    /* typedef struct _GtkTreeSelection GtkTreeSelection;   XXX move up */
 
     typedef gboolean(*GtkTreeViewColumnDropFunc) (GtkTreeView * tree_view,
 						  GtkTreeViewColumn *
@@ -1666,13 +1678,13 @@
 	GTK_LICENSE_ARTISTIC
     } GtkLicense;
 
-    typedef struct _GtkTreeIter GtkTreeIter;
+    /* typedef struct _GtkTreeIter GtkTreeIter;		XXX move up */
 
-    typedef struct _GtkTreePath GtkTreePath;
+    /* typedef struct _GtkTreePath GtkTreePath;		XXX move up */
 
     typedef struct _GtkTreeRowReference GtkTreeRowReference;
 
-    typedef struct _GtkTreeModel GtkTreeModel;
+    /* typedef struct _GtkTreeModel GtkTreeModel;	XXX move up */
 
     typedef gboolean(*GtkTreeModelForeachFunc) (GtkTreeModel * model,
 						GtkTreePath * path,

=== modified file 'package/Makefile'
--- a/package/Makefile	2014-03-05 16:37:59 +0000
+++ b/package/Makefile	2014-03-05 17:00:05 +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
-RPM_PACKAGE_RELEASE=15
+RPM_PACKAGE_RELEASE=16
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)