[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2259: fix GdkStatus (bug 3943)

[Mats Wichmann]

------------------------------------------------------------
revno: 2259
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Thu 2014-04-03 14:42:48 -0600
message:
  fix GdkStatus (bug 3943)
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-03-21 18:48:20 +0000
+++ b/headers/All/5.0/gtk-3.0/gdk/gdk.h.defs	2014-04-03 20:42:48 +0000
@@ -742,8 +742,13 @@
     GDK_MODIFIER_INTENT_NO_TEXT_INPUT,
     GDK_MODIFIER_INTENT_SHIFT_GROUP
 } GdkModifierIntent;
-typedef enum
-    GdkStatus;
+typedef enum {
+    GDK_OK = 0,
+    GDK_ERROR = -1,
+    GDK_ERROR_PARAM = -2,
+    GDK_ERROR_FILE = -3,
+    GDK_ERROR_MEM = -4
+} GdkStatus;
 typedef enum {
     GDK_GRAB_SUCCESS,
     GDK_GRAB_ALREADY_GRABBED,

=== 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-03-21 18:48:20 +0000
+++ b/headers/All/5.1/gtk-3.0/gdk/gdk.h.defs	2014-04-03 20:42:48 +0000
@@ -742,8 +742,13 @@
     GDK_MODIFIER_INTENT_NO_TEXT_INPUT,
     GDK_MODIFIER_INTENT_SHIFT_GROUP
 } GdkModifierIntent;
-typedef enum
-    GdkStatus;
+typedef enum {
+    GDK_OK = 0,
+    GDK_ERROR = -1,
+    GDK_ERROR_PARAM = -2,
+    GDK_ERROR_FILE = -3,
+    GDK_ERROR_MEM = -4
+} GdkStatus;
 typedef enum {
     GDK_GRAB_SUCCESS,
     GDK_GRAB_ALREADY_GRABBED,

=== modified file 'headers/gtk-3.0/gdk/gdk.h'
--- a/headers/gtk-3.0/gdk/gdk.h	2014-03-21 18:48:20 +0000
+++ b/headers/gtk-3.0/gdk/gdk.h	2014-04-03 20:42:48 +0000
@@ -584,8 +584,13 @@
 	GDK_MODIFIER_INTENT_SHIFT_GROUP
     } GdkModifierIntent;
 
-    typedef enum
-	GdkStatus;
+    typedef enum {
+	GDK_OK = 0,
+	GDK_ERROR = -1,
+	GDK_ERROR_PARAM = -2,
+	GDK_ERROR_FILE = -3,
+	GDK_ERROR_MEM = -4
+    } GdkStatus;
 
     typedef enum {
 	GDK_GRAB_SUCCESS,

=== modified file 'package/Makefile'
--- a/package/Makefile	2014-03-28 15:08:35 +0000
+++ b/package/Makefile	2014-04-03 20:42: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
-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)