[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2278: pretty much assured 'there is always one more fix' - see previous two commits

[Mats Wichmann]

------------------------------------------------------------
revno: 2278
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Thu 2014-06-19 15:46:05 -0600
message:
  pretty much assured 'there is always one more fix' - see previous two commits
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-19 18:26:32 +0000
+++ b/headers/All/5.0/gtk-3.0/gtk/gtk.h.defs	2014-06-19 21:46:05 +0000
@@ -1577,9 +1577,9 @@
     void (*render_activity) (GtkThemingEngine * engine, cairo_t * cr,
 			     gdouble x0, gdouble y0, gdouble x1,
 			     gdouble y1);
-     (*render_icon_pixbuf) (GtkThemingEngine * engine,
-			    const GtkIconSource * source,
-			    GtkIconSize size);
+    GdkPixbuf *(*render_icon_pixbuf) (GtkThemingEngine * engine,
+				      const GtkIconSource * source,
+				      GtkIconSize size);
     void (*render_icon) (GtkThemingEngine * engine, cairo_t * cr, pixbuf,
 			 gdouble x, gdouble y);
     gpointer padding;

=== 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 18:26:32 +0000
+++ b/headers/All/5.1/gtk-3.0/gtk/gtk.h.defs	2014-06-19 21:46:05 +0000
@@ -1577,9 +1577,9 @@
     void (*render_activity) (GtkThemingEngine * engine, cairo_t * cr,
 			     gdouble x0, gdouble y0, gdouble x1,
 			     gdouble y1);
-     (*render_icon_pixbuf) (GtkThemingEngine * engine,
-			    const GtkIconSource * source,
-			    GtkIconSize size);
+    GdkPixbuf *(*render_icon_pixbuf) (GtkThemingEngine * engine,
+				      const GtkIconSource * source,
+				      GtkIconSize size);
     void (*render_icon) (GtkThemingEngine * engine, cairo_t * cr, pixbuf,
 			 gdouble x, gdouble y);
     gpointer padding;

=== modified file 'headers/gtk-3.0/gtk/gtk.h'
--- a/headers/gtk-3.0/gtk/gtk.h	2014-06-19 18:26:32 +0000
+++ b/headers/gtk-3.0/gtk/gtk.h	2014-06-19 21:46:05 +0000
@@ -3640,9 +3640,9 @@
 	void (*render_activity) (GtkThemingEngine * engine, cairo_t * cr,
 				 gdouble x0, gdouble y0, gdouble x1,
 				 gdouble y1);
-	 (*render_icon_pixbuf) (GtkThemingEngine * engine,
-				const GtkIconSource * source,
-				GtkIconSize size);
+	GdkPixbuf *(*render_icon_pixbuf) (GtkThemingEngine * engine,
+					  const GtkIconSource * source,
+					  GtkIconSize size);
 	void (*render_icon) (GtkThemingEngine * engine, cairo_t * cr,
 			     pixbuf, gdouble x, gdouble y);
 	gpointer padding;

=== modified file 'package/Makefile'
--- a/package/Makefile	2014-06-19 18:26:32 +0000
+++ b/package/Makefile	2014-06-19 21:46: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
-BUILDNO=7
+BUILDNO=8
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)