[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2219: some fixes for gdk.h (bug 3932)

[Mats Wichmann]

------------------------------------------------------------
revno: 2219
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Fri 2014-02-28 16:45:44 -0700
message:
  some fixes for gdk.h (bug 3932)
modified:
  headers/All/5.0/gtk-3.0/gdk/gdk.h.defs
  headers/All/5.1/gtk-3.0/gdk/gdk.h.defs
  headers/gtk-3.0/gdk/gdk.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/gtk-3.0/gdk/gdk.h.defs'
--- a/headers/All/5.0/gtk-3.0/gdk/gdk.h.defs	2014-02-28 19:31:50 +0000
+++ b/headers/All/5.0/gtk-3.0/gdk/gdk.h.defs	2014-02-28 23:45:44 +0000
@@ -310,7 +310,7 @@
 typedef struct _GdkEventMotion GdkEventMotion;
 typedef struct _GdkEventSequence GdkEventSequence;
 typedef union _GdkEvent GdkEvent;
-typedef void (*GdkEventFunc) (void);
+typedef void (*GdkEventFunc) (GdkEvent * filter_info, gpointer data);
 typedef void GdkXEvent;
 typedef enum {
     GDK_FILTER_CONTINUE,
@@ -476,7 +476,8 @@
     GDK_WINDOW_EDGE_SOUTH,
     GDK_WINDOW_EDGE_SOUTH_EAST
 } GdkWindowEdge;
-typedef gboolean(*GdkWindowChildFunc) (void);
+typedef gboolean(*GdkWindowChildFunc) (GdkWindow * window,
+				       gpointer user_data);
 typedef struct _GdkTimeCoord GdkTimeCoord;
 typedef enum {
     GDK_SOURCE_MOUSE,

=== modified file 'headers/All/5.1/gtk-3.0/gdk/gdk.h.defs'
--- a/headers/All/5.1/gtk-3.0/gdk/gdk.h.defs	2014-02-28 19:31:50 +0000
+++ b/headers/All/5.1/gtk-3.0/gdk/gdk.h.defs	2014-02-28 23:45:44 +0000
@@ -310,7 +310,7 @@
 typedef struct _GdkEventMotion GdkEventMotion;
 typedef struct _GdkEventSequence GdkEventSequence;
 typedef union _GdkEvent GdkEvent;
-typedef void (*GdkEventFunc) (void);
+typedef void (*GdkEventFunc) (GdkEvent * filter_info, gpointer data);
 typedef void GdkXEvent;
 typedef enum {
     GDK_FILTER_CONTINUE,
@@ -476,7 +476,8 @@
     GDK_WINDOW_EDGE_SOUTH,
     GDK_WINDOW_EDGE_SOUTH_EAST
 } GdkWindowEdge;
-typedef gboolean(*GdkWindowChildFunc) (void);
+typedef gboolean(*GdkWindowChildFunc) (GdkWindow * window,
+				       gpointer user_data);
 typedef struct _GdkTimeCoord GdkTimeCoord;
 typedef enum {
     GDK_SOURCE_MOUSE,

=== modified file 'headers/gtk-3.0/gdk/gdk.h'
--- a/headers/gtk-3.0/gdk/gdk.h	2014-02-28 19:31:50 +0000
+++ b/headers/gtk-3.0/gdk/gdk.h	2014-02-28 23:45:44 +0000
@@ -330,7 +330,7 @@
 
     typedef union _GdkEvent GdkEvent;
 
-    typedef void (*GdkEventFunc) (void);
+    typedef void (*GdkEventFunc) (GdkEvent * filter_info, gpointer data);
 
     typedef void GdkXEvent;
 
@@ -516,7 +516,8 @@
 	GDK_WINDOW_EDGE_SOUTH_EAST
     } GdkWindowEdge;
 
-    typedef gboolean(*GdkWindowChildFunc) (void);
+    typedef gboolean(*GdkWindowChildFunc) (GdkWindow * window,
+					   gpointer user_data);
 
     typedef struct _GdkTimeCoord GdkTimeCoord;
 

=== modified file 'package/Makefile'
--- a/package/Makefile	2014-02-28 19:31:50 +0000
+++ b/package/Makefile	2014-02-28 23:45:44 +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=3
+RPM_PACKAGE_RELEASE=4
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)