[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2064: fix up GValue definition (bug 3728)

[Mats Wichmann]

------------------------------------------------------------
revno: 2064
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Wed 2013-02-06 13:08:57 -0700
message:
  fix up GValue definition (bug 3728)
modified:
  headers/All/3.1/glib-2.0/glib-object.h.defs
  headers/All/3.2/glib-2.0/glib-object.h.defs
  headers/All/4.0/glib-2.0/glib-object.h.defs
  headers/All/4.1/glib-2.0/glib-object.h.defs
  headers/glib-2.0/glib-object.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/3.1/glib-2.0/glib-object.h.defs'
--- a/headers/All/3.1/glib-2.0/glib-object.h.defs	2012-12-26 13:52:10 +0000
+++ b/headers/All/3.1/glib-2.0/glib-object.h.defs	2013-02-06 20:08:57 +0000
@@ -463,6 +463,20 @@
     volatile guint ref_count;
     GData *qdata;
 } GObject;
+struct _GValue {
+    GType g_type;
+    union {
+	gint v_int;
+	guint v_uint;
+	glong v_long;
+	gulong v_ulong;
+	gint64 v_int64;
+	guint64 v_uint64;
+	gfloat v_float;
+	gdouble v_double;
+	gpointer v_pointer;
+    } data[2];
+};
 typedef float gfloat;
 typedef struct _GObjectConstructParam {
     GParamSpec *pspec;

=== modified file 'headers/All/3.2/glib-2.0/glib-object.h.defs'
--- a/headers/All/3.2/glib-2.0/glib-object.h.defs	2012-12-26 13:52:10 +0000
+++ b/headers/All/3.2/glib-2.0/glib-object.h.defs	2013-02-06 20:08:57 +0000
@@ -463,6 +463,20 @@
     volatile guint ref_count;
     GData *qdata;
 } GObject;
+struct _GValue {
+    GType g_type;
+    union {
+	gint v_int;
+	guint v_uint;
+	glong v_long;
+	gulong v_ulong;
+	gint64 v_int64;
+	guint64 v_uint64;
+	gfloat v_float;
+	gdouble v_double;
+	gpointer v_pointer;
+    } data[2];
+};
 typedef float gfloat;
 typedef struct _GObjectConstructParam {
     GParamSpec *pspec;

=== modified file 'headers/All/4.0/glib-2.0/glib-object.h.defs'
--- a/headers/All/4.0/glib-2.0/glib-object.h.defs	2012-12-26 13:52:10 +0000
+++ b/headers/All/4.0/glib-2.0/glib-object.h.defs	2013-02-06 20:08:57 +0000
@@ -463,6 +463,20 @@
     volatile guint ref_count;
     GData *qdata;
 } GObject;
+struct _GValue {
+    GType g_type;
+    union {
+	gint v_int;
+	guint v_uint;
+	glong v_long;
+	gulong v_ulong;
+	gint64 v_int64;
+	guint64 v_uint64;
+	gfloat v_float;
+	gdouble v_double;
+	gpointer v_pointer;
+    } data[2];
+};
 typedef float gfloat;
 typedef struct _GObjectConstructParam {
     GParamSpec *pspec;

=== modified file 'headers/All/4.1/glib-2.0/glib-object.h.defs'
--- a/headers/All/4.1/glib-2.0/glib-object.h.defs	2012-12-26 13:52:10 +0000
+++ b/headers/All/4.1/glib-2.0/glib-object.h.defs	2013-02-06 20:08:57 +0000
@@ -466,6 +466,20 @@
     volatile guint ref_count;
     GData *qdata;
 } GObject;
+struct _GValue {
+    GType g_type;
+    union {
+	gint v_int;
+	guint v_uint;
+	glong v_long;
+	gulong v_ulong;
+	gint64 v_int64;
+	guint64 v_uint64;
+	gfloat v_float;
+	gdouble v_double;
+	gpointer v_pointer;
+    } data[2];
+};
 typedef float gfloat;
 typedef struct _GObjectConstructParam {
     GParamSpec *pspec;

=== modified file 'headers/glib-2.0/glib-object.h'
--- a/headers/glib-2.0/glib-object.h	2013-02-05 04:03:39 +0000
+++ b/headers/glib-2.0/glib-object.h	2013-02-06 20:08:57 +0000
@@ -651,10 +651,8 @@
     };
 
     struct _GValue {
-#if __LSB_VERSION__ >= 50
 	GType g_type;
 	union {
-#if __LSB_VERSION__ >= 50
 	    gint v_int;
 	    guint v_uint;
 	    glong v_long;
@@ -664,9 +662,7 @@
 	    gfloat v_float;
 	    gdouble v_double;
 	    gpointer v_pointer;
-#endif				/* __LSB_VERSION__ >= 50 */
 	} data[2];
-#endif				/* __LSB_VERSION__ >= 50 */
     };
 
     struct _GParamSpec {

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-02-06 19:46:34 +0000
+++ b/package/Makefile	2013-02-06 20:08:57 +0000
@@ -46,7 +46,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)