[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2279: GdkPixbuf * is odd - not libgtk-3.0 specific. Fix another ref and turn on patching
Mats Wichmann
mats at linuxfoundation.org
Sat Jun 21 13:11:48 UTC 2014
------------------------------------------------------------
revno: 2279
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Sat 2014-06-21 07:11:48 -0600
message:
GdkPixbuf * is odd - not libgtk-3.0 specific. Fix another ref and turn on patching
modified:
headers/All/5.0/gtk-3.0/gtk/gtk.h.defs
headers/All/5.1/gtk-3.0/gtk/gtk.h.defs
headers/HACKS
headers/gtk-3.0-gtk.patch
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-19 21:46:05 +0000
+++ b/headers/All/5.0/gtk-3.0/gtk/gtk.h.defs 2014-06-21 13:11:48 +0000
@@ -1580,8 +1580,8 @@
GdkPixbuf *(*render_icon_pixbuf) (GtkThemingEngine * engine,
const GtkIconSource * source,
GtkIconSize size);
- void (*render_icon) (GtkThemingEngine * engine, cairo_t * cr, pixbuf,
- gdouble x, gdouble y);
+ void (*render_icon) (GtkThemingEngine * engine, cairo_t * cr,
+ GdkPixbuf * pixbuf, gdouble x, gdouble y);
gpointer padding;
} GtkThemingEngineClass;
typedef gboolean(*GtkFontFilterFunc) (const PangoFontFamily * family,
=== 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-19 21:46:05 +0000
+++ b/headers/All/5.1/gtk-3.0/gtk/gtk.h.defs 2014-06-21 13:11:48 +0000
@@ -1580,8 +1580,8 @@
GdkPixbuf *(*render_icon_pixbuf) (GtkThemingEngine * engine,
const GtkIconSource * source,
GtkIconSize size);
- void (*render_icon) (GtkThemingEngine * engine, cairo_t * cr, pixbuf,
- gdouble x, gdouble y);
+ void (*render_icon) (GtkThemingEngine * engine, cairo_t * cr,
+ GdkPixbuf * pixbuf, gdouble x, gdouble y);
gpointer padding;
} GtkThemingEngineClass;
typedef gboolean(*GtkFontFilterFunc) (const PangoFontFamily * family,
=== modified file 'headers/HACKS'
--- a/headers/HACKS 2014-03-28 14:12:01 +0000
+++ b/headers/HACKS 2014-06-21 13:11:48 +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
=== modified file 'headers/gtk-3.0-gtk.patch'
--- a/headers/gtk-3.0-gtk.patch 2014-03-13 23:52:15 +0000
+++ b/headers/gtk-3.0-gtk.patch 2014-06-21 13:11:48 +0000
@@ -1,7 +1,7 @@
=== modified file 'gtk-3.0/gtk/gtk.h'
---- gtk-3.0/gtk/gtk.h revid:mats at linuxfoundation.org-20140313174225-0k65ydcs72im4x85
-+++ gtk-3.0/gtk/gtk.h 2014-03-13 11:50:42.608726881 -0600
-@@ -708,6 +708,8 @@
+--- gtk-3.0/gtk/gtk.h revid:mats at linuxfoundation.org-20140619214605-xixla3qtz48b4enp
++++ gtk-3.0/gtk/gtk.h 2014-06-21 12:49:02 +0000
+@@ -792,6 +792,8 @@
typedef struct _GtkPageSetup GtkPageSetup;
@@ -10,7 +10,7 @@
typedef gint(*GtkKeySnoopFunc) (GtkWidget * grab_widget,
GdkEventKey * event,
gpointer func_data);
-@@ -734,7 +736,7 @@
+@@ -824,7 +826,7 @@
typedef struct _GtkTooltip GtkTooltip;
@@ -19,9 +19,9 @@
typedef struct _GtkWidgetPath GtkWidgetPath;
-@@ -748,6 +750,16 @@
+@@ -846,6 +848,16 @@
- typedef struct _GtkTextMark GtkTextMark;
+ typedef struct _GtkTreeSelectionPrivate GtkTreeSelectionPrivate;
+ typedef struct _GtkCellRenderer GtkCellRenderer; /* XXX move from below */
+
@@ -36,25 +36,25 @@
typedef gboolean(*GtkTreeSelectionFunc) (GtkTreeSelection * selection,
GtkTreeModel * model,
GtkTreePath * path,
-@@ -1087,7 +1099,7 @@
- GTK_CELL_RENDERER_EXPANDED
- } GtkCellRendererState;
+@@ -1333,7 +1345,7 @@
+ GTK_CELL_RENDERER_MODE_EDITABLE
+ } GtkCellRendererMode;
- typedef struct _GtkCellRenderer GtkCellRenderer;
+ /* typedef struct _GtkCellRenderer GtkCellRenderer; XXX move up */
- typedef struct _GtkCellRendererClass GtkCellRendererClass;
-
-@@ -1751,7 +1763,7 @@
-
- typedef struct _GtkTreeView GtkTreeView;
+ typedef struct _GtkCellRendererPrivate GtkCellRendererPrivate;
+
+@@ -2330,7 +2342,7 @@
+
+ typedef struct _GtkTreeViewPrivate GtkTreeViewPrivate;
- typedef struct _GtkTreeSelection GtkTreeSelection;
+ /* typedef struct _GtkTreeSelection GtkTreeSelection; XXX move up */
- typedef gboolean(*GtkTreeViewColumnDropFunc) (GtkTreeView * tree_view,
- GtkTreeViewColumn *
-@@ -1806,13 +1818,13 @@
+ typedef struct _GtkTreeSelectionClass GtkTreeSelectionClass;
+
+@@ -2398,13 +2410,13 @@
GTK_LICENSE_ARTISTIC
} GtkLicense;
@@ -69,6 +69,6 @@
- typedef struct _GtkTreeModel GtkTreeModel;
+ /* typedef struct _GtkTreeModel GtkTreeModel; XXX move up */
- typedef gboolean(*GtkTreeModelForeachFunc) (GtkTreeModel * model,
- GtkTreePath * path,
+ typedef struct _GtkTreeModelIface GtkTreeModelIface;
+
=== modified file 'headers/gtk-3.0/gtk/gtk.h'
--- a/headers/gtk-3.0/gtk/gtk.h 2014-06-19 21:46:05 +0000
+++ b/headers/gtk-3.0/gtk/gtk.h 2014-06-21 13:11:48 +0000
@@ -792,6 +792,8 @@
typedef struct _GtkPageSetup GtkPageSetup;
+ typedef struct _GtkWidget GtkWidget; /* XXX move from below */
+
typedef gint(*GtkKeySnoopFunc) (GtkWidget * grab_widget,
GdkEventKey * event,
gpointer func_data);
@@ -824,7 +826,7 @@
typedef struct _GtkTooltip GtkTooltip;
- typedef struct _GtkWidget GtkWidget;
+ /* typedef struct _GtkWidget GtkWidget; XXX move up */
typedef struct _GtkWidgetPath GtkWidgetPath;
@@ -846,6 +848,16 @@
typedef struct _GtkTreeSelectionPrivate GtkTreeSelectionPrivate;
+ 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,
@@ -1333,7 +1345,7 @@
GTK_CELL_RENDERER_MODE_EDITABLE
} GtkCellRendererMode;
- typedef struct _GtkCellRenderer GtkCellRenderer;
+ /* typedef struct _GtkCellRenderer GtkCellRenderer; XXX move up */
typedef struct _GtkCellRendererPrivate GtkCellRendererPrivate;
@@ -2330,7 +2342,7 @@
typedef struct _GtkTreeViewPrivate GtkTreeViewPrivate;
- typedef struct _GtkTreeSelection GtkTreeSelection;
+ /* typedef struct _GtkTreeSelection GtkTreeSelection; XXX move up */
typedef struct _GtkTreeSelectionClass GtkTreeSelectionClass;
@@ -2398,13 +2410,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 struct _GtkTreeModelIface GtkTreeModelIface;
@@ -3644,7 +3656,7 @@
const GtkIconSource * source,
GtkIconSize size);
void (*render_icon) (GtkThemingEngine * engine, cairo_t * cr,
- pixbuf, gdouble x, gdouble y);
+ GdkPixbuf * pixbuf, gdouble x, gdouble y);
gpointer padding;
};
=== modified file 'package/Makefile'
--- a/package/Makefile 2014-06-19 21:46:05 +0000
+++ b/package/Makefile 2014-06-21 13:11:48 +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=8
+BUILDNO=9
# 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