[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2190: fix syntax error in glib-object.h exposed by earlier change (bug 3914)
Mats Wichmann
mats at linuxfoundation.org
Sat Feb 1 21:46:39 UTC 2014
------------------------------------------------------------
revno: 2190
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Sat 2014-02-01 14:46:39 -0700
message:
fix syntax error in glib-object.h exposed by earlier change (bug 3914)
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/All/5.0/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 2014-01-31 21:59:28 +0000
+++ b/headers/All/3.1/glib-2.0/glib-object.h.defs 2014-02-01 21:46:39 +0000
@@ -896,12 +896,12 @@
const GValue * param_value,
gpointer invocation_hint,
gpointer marshal_data);
-extern void g_cclosure_marshal_VOID(int0_t) (GClosure * closure,
- GValue * return_value,
- guint n_param_values,
- const GValue * param_value,
- gpointer invocation_hint,
- gpointer marshal_data);
+extern void g_cclosure_marshal_VOID__INT(GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_value,
+ gpointer invocation_hint,
+ gpointer marshal_data);
extern void g_cclosure_marshal_VOID__LONG(GClosure * closure,
GValue * return_value,
guint n_param_values,
@@ -938,16 +938,12 @@
const GValue * param_value,
gpointer invocation_hint,
gpointer marshal_data);
-extern void g_cclosure_marshal_VOID(unsigned int0_t) (GClosure * closure,
- GValue *
- return_value,
- guint n_param_values,
- const GValue *
- param_value,
- gpointer
- invocation_hint,
- gpointer
- marshal_data);
+extern void g_cclosure_marshal_VOID__UINT(GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_value,
+ gpointer invocation_hint,
+ gpointer marshal_data);
extern void g_cclosure_marshal_VOID__UINT_POINTER(GClosure * closure,
GValue * return_value,
guint n_param_values,
=== 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 2014-01-31 21:59:28 +0000
+++ b/headers/All/3.2/glib-2.0/glib-object.h.defs 2014-02-01 21:46:39 +0000
@@ -896,12 +896,12 @@
const GValue * param_value,
gpointer invocation_hint,
gpointer marshal_data);
-extern void g_cclosure_marshal_VOID(int0_t) (GClosure * closure,
- GValue * return_value,
- guint n_param_values,
- const GValue * param_value,
- gpointer invocation_hint,
- gpointer marshal_data);
+extern void g_cclosure_marshal_VOID__INT(GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_value,
+ gpointer invocation_hint,
+ gpointer marshal_data);
extern void g_cclosure_marshal_VOID__LONG(GClosure * closure,
GValue * return_value,
guint n_param_values,
@@ -938,16 +938,12 @@
const GValue * param_value,
gpointer invocation_hint,
gpointer marshal_data);
-extern void g_cclosure_marshal_VOID(unsigned int0_t) (GClosure * closure,
- GValue *
- return_value,
- guint n_param_values,
- const GValue *
- param_value,
- gpointer
- invocation_hint,
- gpointer
- marshal_data);
+extern void g_cclosure_marshal_VOID__UINT(GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_value,
+ gpointer invocation_hint,
+ gpointer marshal_data);
extern void g_cclosure_marshal_VOID__UINT_POINTER(GClosure * closure,
GValue * return_value,
guint n_param_values,
=== 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 2014-01-31 21:59:28 +0000
+++ b/headers/All/4.0/glib-2.0/glib-object.h.defs 2014-02-01 21:46:39 +0000
@@ -898,12 +898,12 @@
const GValue * param_value,
gpointer invocation_hint,
gpointer marshal_data);
-extern void g_cclosure_marshal_VOID(int0_t) (GClosure * closure,
- GValue * return_value,
- guint n_param_values,
- const GValue * param_value,
- gpointer invocation_hint,
- gpointer marshal_data);
+extern void g_cclosure_marshal_VOID__INT(GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_value,
+ gpointer invocation_hint,
+ gpointer marshal_data);
extern void g_cclosure_marshal_VOID__LONG(GClosure * closure,
GValue * return_value,
guint n_param_values,
@@ -940,16 +940,12 @@
const GValue * param_value,
gpointer invocation_hint,
gpointer marshal_data);
-extern void g_cclosure_marshal_VOID(unsigned int0_t) (GClosure * closure,
- GValue *
- return_value,
- guint n_param_values,
- const GValue *
- param_value,
- gpointer
- invocation_hint,
- gpointer
- marshal_data);
+extern void g_cclosure_marshal_VOID__UINT(GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_value,
+ gpointer invocation_hint,
+ gpointer marshal_data);
extern void g_cclosure_marshal_VOID__UINT_POINTER(GClosure * closure,
GValue * return_value,
guint n_param_values,
=== 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 2014-01-31 21:59:28 +0000
+++ b/headers/All/4.1/glib-2.0/glib-object.h.defs 2014-02-01 21:46:39 +0000
@@ -901,12 +901,12 @@
const GValue * param_value,
gpointer invocation_hint,
gpointer marshal_data);
-extern void g_cclosure_marshal_VOID(int0_t) (GClosure * closure,
- GValue * return_value,
- guint n_param_values,
- const GValue * param_value,
- gpointer invocation_hint,
- gpointer marshal_data);
+extern void g_cclosure_marshal_VOID__INT(GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_value,
+ gpointer invocation_hint,
+ gpointer marshal_data);
extern void g_cclosure_marshal_VOID__LONG(GClosure * closure,
GValue * return_value,
guint n_param_values,
@@ -943,16 +943,12 @@
const GValue * param_value,
gpointer invocation_hint,
gpointer marshal_data);
-extern void g_cclosure_marshal_VOID(unsigned int0_t) (GClosure * closure,
- GValue *
- return_value,
- guint n_param_values,
- const GValue *
- param_value,
- gpointer
- invocation_hint,
- gpointer
- marshal_data);
+extern void g_cclosure_marshal_VOID__UINT(GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_value,
+ gpointer invocation_hint,
+ gpointer marshal_data);
extern void g_cclosure_marshal_VOID__UINT_POINTER(GClosure * closure,
GValue * return_value,
guint n_param_values,
=== modified file 'headers/All/5.0/glib-2.0/glib-object.h.defs'
--- a/headers/All/5.0/glib-2.0/glib-object.h.defs 2014-01-31 21:59:28 +0000
+++ b/headers/All/5.0/glib-2.0/glib-object.h.defs 2014-02-01 21:46:39 +0000
@@ -1169,12 +1169,12 @@
gpointer marshal_data,
int n_params,
GType * param_types);
-extern void g_cclosure_marshal_VOID(int0_t) (GClosure * closure,
- GValue * return_value,
- guint n_param_values,
- const GValue * param_value,
- gpointer invocation_hint,
- gpointer marshal_data);
+extern void g_cclosure_marshal_VOID__INT(GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_value,
+ gpointer invocation_hint,
+ gpointer marshal_data);
extern void g_cclosure_marshal_VOID__INTv(GClosure * closure,
GValue * return_value,
gpointer instance, va_list args,
@@ -1258,16 +1258,12 @@
gpointer marshal_data,
int n_params,
GType * param_types);
-extern void g_cclosure_marshal_VOID(unsigned int0_t) (GClosure * closure,
- GValue *
- return_value,
- guint n_param_values,
- const GValue *
- param_value,
- gpointer
- invocation_hint,
- gpointer
- marshal_data);
+extern void g_cclosure_marshal_VOID__UINT(GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_value,
+ gpointer invocation_hint,
+ gpointer marshal_data);
extern void g_cclosure_marshal_VOID__UINT_POINTER(GClosure * closure,
GValue * return_value,
guint n_param_values,
=== modified file 'headers/glib-2.0/glib-object.h'
--- a/headers/glib-2.0/glib-object.h 2014-01-31 21:59:28 +0000
+++ b/headers/glib-2.0/glib-object.h 2014-02-01 21:46:39 +0000
@@ -1403,13 +1403,12 @@
const GValue * param_value,
gpointer invocation_hint,
gpointer marshal_data);
- extern void g_cclosure_marshal_VOID(int0_t) (GClosure * closure,
- GValue * return_value,
- guint n_param_values,
- const GValue *
- param_value,
- gpointer invocation_hint,
- gpointer marshal_data);
+ extern void g_cclosure_marshal_VOID__INT(GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_value,
+ gpointer invocation_hint,
+ gpointer marshal_data);
extern void g_cclosure_marshal_VOID__LONG(GClosure * closure,
GValue * return_value,
guint n_param_values,
@@ -1447,18 +1446,12 @@
const GValue * param_value,
gpointer invocation_hint,
gpointer marshal_data);
- extern void g_cclosure_marshal_VOID(unsigned int0_t) (GClosure *
- closure,
- GValue *
- return_value,
- guint
- n_param_values,
- const GValue *
- param_value,
- gpointer
- invocation_hint,
- gpointer
- marshal_data);
+ extern void g_cclosure_marshal_VOID__UINT(GClosure * closure,
+ GValue * return_value,
+ guint n_param_values,
+ const GValue * param_value,
+ gpointer invocation_hint,
+ gpointer marshal_data);
extern void g_cclosure_marshal_VOID__UINT_POINTER(GClosure * closure,
GValue *
return_value,
=== modified file 'package/Makefile'
--- a/package/Makefile 2014-01-31 21:59:28 +0000
+++ b/package/Makefile 2014-02-01 21:46:39 +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=1
+RPM_PACKAGE_RELEASE=2
# 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