[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2072: seems like glib-object changes vanished, here they are again
Mats Wichmann
mats at linuxfoundation.org
Sat Feb 16 20:52:50 UTC 2013
------------------------------------------------------------
revno: 2072
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Sat 2013-02-16 13:52:50 -0700
message:
seems like glib-object changes vanished, here they are again
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 2013-02-08 18:30:43 +0000
+++ b/headers/All/3.1/glib-2.0/glib-object.h.defs 2013-02-16 20:52:50 +0000
@@ -311,19 +311,6 @@
(g_define_type_id, TYPE_IFACE, &g_implement_interface_info); }
#define G_CCLOSURE_SWAP_DATA(cclosure) \
(((GClosure*) (cclosure))->derivative_flag)
-#define G_OBJECT_WARN_INVALID_PSPEC(object,pname,property_id,pspec) \
-G_STMT_START { \
- GObject *_object = (GObject*) (object); \
- GParamSpec *_pspec = (GParamSpec*) (pspec); \
- guint _property_id = (property_id); \
- g_warning ("%s: invalid %s id %u for \"%s\" of type `%s' in `%s'", \
- G_STRLOC, \
- (pname), \
- _property_id, \
- _pspec->name, \
- g_type_name (G_PARAM_SPEC_TYPE (_pspec)), \
- G_OBJECT_TYPE_NAME (_object)); \
-} G_STMT_END
#define G_TYPE_FROM_CLASS(g_class) (((GTypeClass*) (g_class))->g_type)
#define G_VALUE_TYPE(value) (((GValue*) (value))->g_type)
#define _G_TYPE_IGC(ip,gt,ct) ((ct*) (((GTypeInstance*) ip)->g_class))
@@ -426,7 +413,6 @@
typedef struct _GTypeInstance {
GTypeClass *g_class;
} GTypeInstance;
-typedef float gfloat;
typedef struct _GValue GValue;
typedef enum {
G_PARAM_READABLE = 1,
@@ -491,6 +477,7 @@
gpointer v_pointer;
} data[2];
};
+typedef float gfloat;
typedef struct _GObjectConstructParam {
GParamSpec *pspec;
GValue *value;
=== 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 2013-02-08 18:30:43 +0000
+++ b/headers/All/3.2/glib-2.0/glib-object.h.defs 2013-02-16 20:52:50 +0000
@@ -311,19 +311,6 @@
(g_define_type_id, TYPE_IFACE, &g_implement_interface_info); }
#define G_CCLOSURE_SWAP_DATA(cclosure) \
(((GClosure*) (cclosure))->derivative_flag)
-#define G_OBJECT_WARN_INVALID_PSPEC(object,pname,property_id,pspec) \
-G_STMT_START { \
- GObject *_object = (GObject*) (object); \
- GParamSpec *_pspec = (GParamSpec*) (pspec); \
- guint _property_id = (property_id); \
- g_warning ("%s: invalid %s id %u for \"%s\" of type `%s' in `%s'", \
- G_STRLOC, \
- (pname), \
- _property_id, \
- _pspec->name, \
- g_type_name (G_PARAM_SPEC_TYPE (_pspec)), \
- G_OBJECT_TYPE_NAME (_object)); \
-} G_STMT_END
#define G_TYPE_FROM_CLASS(g_class) (((GTypeClass*) (g_class))->g_type)
#define G_VALUE_TYPE(value) (((GValue*) (value))->g_type)
#define _G_TYPE_IGC(ip,gt,ct) ((ct*) (((GTypeInstance*) ip)->g_class))
@@ -426,7 +413,6 @@
typedef struct _GTypeInstance {
GTypeClass *g_class;
} GTypeInstance;
-typedef float gfloat;
typedef struct _GValue GValue;
typedef enum {
G_PARAM_READABLE = 1,
@@ -491,6 +477,7 @@
gpointer v_pointer;
} data[2];
};
+typedef float gfloat;
typedef struct _GObjectConstructParam {
GParamSpec *pspec;
GValue *value;
=== 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 2013-02-08 18:30:43 +0000
+++ b/headers/All/4.0/glib-2.0/glib-object.h.defs 2013-02-16 20:52:50 +0000
@@ -311,19 +311,6 @@
(g_define_type_id, TYPE_IFACE, &g_implement_interface_info); }
#define G_CCLOSURE_SWAP_DATA(cclosure) \
(((GClosure*) (cclosure))->derivative_flag)
-#define G_OBJECT_WARN_INVALID_PSPEC(object,pname,property_id,pspec) \
-G_STMT_START { \
- GObject *_object = (GObject*) (object); \
- GParamSpec *_pspec = (GParamSpec*) (pspec); \
- guint _property_id = (property_id); \
- g_warning ("%s: invalid %s id %u for \"%s\" of type `%s' in `%s'", \
- G_STRLOC, \
- (pname), \
- _property_id, \
- _pspec->name, \
- g_type_name (G_PARAM_SPEC_TYPE (_pspec)), \
- G_OBJECT_TYPE_NAME (_object)); \
-} G_STMT_END
#define G_TYPE_FROM_CLASS(g_class) (((GTypeClass*) (g_class))->g_type)
#define G_VALUE_TYPE(value) (((GValue*) (value))->g_type)
#define _G_TYPE_IGC(ip,gt,ct) ((ct*) (((GTypeInstance*) ip)->g_class))
@@ -426,7 +413,6 @@
typedef struct _GTypeInstance {
GTypeClass *g_class;
} GTypeInstance;
-typedef float gfloat;
typedef struct _GValue GValue;
typedef enum {
G_PARAM_READABLE = 1,
@@ -491,6 +477,7 @@
gpointer v_pointer;
} data[2];
};
+typedef float gfloat;
typedef struct _GObjectConstructParam {
GParamSpec *pspec;
GValue *value;
=== 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 2013-02-08 18:30:43 +0000
+++ b/headers/All/4.1/glib-2.0/glib-object.h.defs 2013-02-16 20:52:50 +0000
@@ -311,19 +311,6 @@
(g_define_type_id, TYPE_IFACE, &g_implement_interface_info); }
#define G_CCLOSURE_SWAP_DATA(cclosure) \
(((GClosure*) (cclosure))->derivative_flag)
-#define G_OBJECT_WARN_INVALID_PSPEC(object,pname,property_id,pspec) \
-G_STMT_START { \
- GObject *_object = (GObject*) (object); \
- GParamSpec *_pspec = (GParamSpec*) (pspec); \
- guint _property_id = (property_id); \
- g_warning ("%s: invalid %s id %u for \"%s\" of type `%s' in `%s'", \
- G_STRLOC, \
- (pname), \
- _property_id, \
- _pspec->name, \
- g_type_name (G_PARAM_SPEC_TYPE (_pspec)), \
- G_OBJECT_TYPE_NAME (_object)); \
-} G_STMT_END
#define G_TYPE_FROM_CLASS(g_class) (((GTypeClass*) (g_class))->g_type)
#define G_VALUE_TYPE(value) (((GValue*) (value))->g_type)
#define _G_TYPE_IGC(ip,gt,ct) ((ct*) (((GTypeInstance*) ip)->g_class))
@@ -429,7 +416,6 @@
typedef struct _GTypeInstance {
GTypeClass *g_class;
} GTypeInstance;
-typedef float gfloat;
typedef struct _GValue GValue;
typedef enum {
G_PARAM_READABLE = 1,
@@ -494,6 +480,7 @@
gpointer v_pointer;
} data[2];
};
+typedef float gfloat;
typedef struct _GObjectConstructParam {
GParamSpec *pspec;
GValue *value;
=== modified file 'headers/glib-2.0/glib-object.h'
--- a/headers/glib-2.0/glib-object.h 2013-02-08 18:30:43 +0000
+++ b/headers/glib-2.0/glib-object.h 2013-02-16 20:52:50 +0000
@@ -306,19 +306,6 @@
(data))
#define G_CCLOSURE_SWAP_DATA(cclosure) \
(((GClosure*) (cclosure))->derivative_flag)
-#define G_OBJECT_WARN_INVALID_PSPEC(object,pname,property_id,pspec) \
-G_STMT_START { \
- GObject *_object = (GObject*) (object); \
- GParamSpec *_pspec = (GParamSpec*) (pspec); \
- guint _property_id = (property_id); \
- g_warning ("%s: invalid %s id %u for \"%s\" of type `%s' in `%s'", \
- G_STRLOC, \
- (pname), \
- _property_id, \
- _pspec->name, \
- g_type_name (G_PARAM_SPEC_TYPE (_pspec)), \
- G_OBJECT_TYPE_NAME (_object)); \
-} G_STMT_END
#define G_TYPE_FROM_CLASS(g_class) (((GTypeClass*) (g_class))->g_type)
#define G_VALUE_TYPE(value) (((GValue*) (value))->g_type)
#define _G_TYPE_IGC(ip,gt,ct) ((ct*) (((GTypeInstance*) ip)->g_class))
@@ -449,6 +436,19 @@
#endif /* __LSB_VERSION__ >= 4.1 */
#if __LSB_VERSION__ >= 50
+#define G_OBJECT_WARN_INVALID_PSPEC(object,pname,property_id,pspec) \
+G_STMT_START { \
+ GObject *_object = (GObject*) (object); \
+ GParamSpec *_pspec = (GParamSpec*) (pspec); \
+ guint _property_id = (property_id); \
+ g_warning ("%s: invalid %s id %u for \"%s\" of type `%s' in `%s'", \
+ G_STRLOC, \
+ (pname), \
+ _property_id, \
+ _pspec->name, \
+ g_type_name (G_PARAM_SPEC_TYPE (_pspec)), \
+ G_OBJECT_TYPE_NAME (_object)); \
+} G_STMT_END
#define G_CLOSURE_N_NOTIFIERS(cl) (((cl)->n_guards << 1L) + \
(cl)->n_fnotifiers + (cl)->n_inotifiers)
#define G_TYPE_CLASS_GET_PRIVATE(klass,g_type,c_type) ((c_type*) g_type_class_get_private ((GTypeClass*) (klass), (g_type)))
@@ -642,11 +642,6 @@
typedef gboolean(*GTypeClassCacheFunc) (gpointer, GTypeClass *);
-#if __LSB_VERSION__ < 50
- typedef float gfloat;
-
-#endif /* __LSB_VERSION__ < 5.0 */
-
struct _GTypeClass {
GType g_type;
};
@@ -937,6 +932,11 @@
typedef gchar **GStrv;
+#if __LSB_VERSION__ < 50
+ typedef float gfloat;
+
+#endif /* __LSB_VERSION__ < 5.0 */
+
#if __LSB_VERSION__ >= 40
typedef void (*GToggleNotify) (gpointer data, GObject * object,
gboolean is_last_ref);
=== modified file 'package/Makefile'
--- a/package/Makefile 2013-02-16 13:36:55 +0000
+++ b/package/Makefile 2013-02-16 20:52:50 +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=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)
More information about the lsb-messages
mailing list