[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2021: gio fixes (bug 3548)
Mats Wichmann
mats at linuxfoundation.org
Mon Dec 10 18:47:38 UTC 2012
------------------------------------------------------------
revno: 2021
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Mon 2012-12-10 11:47:38 -0700
message:
gio fixes (bug 3548)
modified:
headers/All/5.0/glib-2.0/gio/gaction.h.defs
headers/All/5.0/glib-2.0/gio/gactiongroup.h.defs
headers/All/5.0/glib-2.0/gio/gdbusobjectmanagerclient.h.defs
headers/All/5.0/glib-2.0/gio/gdrive.h.defs
headers/All/5.0/glib-2.0/gio/gtlsconnection.h.defs
headers/glib-2.0/gio/gaction.h
headers/glib-2.0/gio/gactiongroup.h
headers/glib-2.0/gio/gdbusobjectmanagerclient.h
headers/glib-2.0/gio/gdrive.h
headers/glib-2.0/gio/gtlsconnection.h
package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/glib-2.0/gio/gaction.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gaction.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gaction.h.defs 2012-12-10 18:47:38 +0000
@@ -7,9 +7,9 @@
typedef struct _GActionInterface {
GTypeInterface g_iface;
- const char *(*get_name) (GAction * action);
- (*get_parameter_type) (GAction * action);
- (*get_state_type) (GAction * action);
+ const gchar *get_name;
+ const GVariantType(*get_parameter_type) (GAction * action);
+ const GVariantType(*get_state_type) (GAction * action);
GVariant *(*get_state_hint) (GAction * action);
gboolean(*get_enabled) (GAction * action);
GVariant *(*get_state) (GAction * action);
=== modified file 'headers/All/5.0/glib-2.0/gio/gactiongroup.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gactiongroup.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gactiongroup.h.defs 2012-12-10 18:47:38 +0000
@@ -42,8 +42,8 @@
gboolean(*query_action) (GActionGroup * action_group,
const gchar * action_name,
gboolean * enabled,
- const GVariantType * *parameter_type,
- const GVariantType * *state_type,
+ const GVariantType * parameter_type,
+ const GVariantType * state_type,
GVariant * *state_hint, GVariant * *state);
} GActionGroupInterface;
extern void g_action_group_action_added(GActionGroup * action_group,
@@ -86,6 +86,9 @@
extern gboolean g_action_group_query_action(GActionGroup * action_group,
const char *action_name,
gboolean * enabled,
- *parameter_type, *state_type,
+ const GVariantType *
+ parameter_type,
+ const GVariantType *
+ state_type,
GVariant * *state_hint,
GVariant * *state);
=== modified file 'headers/All/5.0/glib-2.0/gio/gdbusobjectmanagerclient.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gdbusobjectmanagerclient.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gdbusobjectmanagerclient.h.defs 2012-12-10 18:47:38 +0000
@@ -21,7 +21,7 @@
GDBusProxy *
interface_proxy,
GVariant *
- changed properties,
+ changed_properties,
const gchar *
const
*invalidated_properties);
=== modified file 'headers/All/5.0/glib-2.0/gio/gdrive.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gdrive.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gdrive.h.defs 2012-12-10 18:47:38 +0000
@@ -29,15 +29,14 @@
gboolean(*poll_for_media_finish) (GDrive * drive,
GAsyncResult * result,
GError * *error);
- char *(*get_identifier) (GDrive * drive, GDrive * drive,
- const char *kind);
+ char *(*get_identifier) (GDrive * drive, const char *kind);
char **(*enumerate_identifiers) (GDrive * drive);
GDriveStartStopType(*get_start_stop_type) (GDrive * drive);
gboolean(*can_start) (GDrive * drive);
gboolean(*can_start_degraded) (GDrive * drive);
void (*start) (GDrive * drive, GDriveStartFlags flags,
- GMountOperation mount_operation,,
- GCancellable * cancellable,,
+ GMountOperation mount_operation,
+ GCancellable * cancellable,
GAsyncReadyCallback callback, gpointer user_data);
gboolean(*start_finish) (GDrive * drive, GAsyncResult * result,
GError * *error);
=== modified file 'headers/All/5.0/glib-2.0/gio/gtlsconnection.h.defs'
--- a/headers/All/5.0/glib-2.0/gio/gtlsconnection.h.defs 2012-12-07 15:01:13 +0000
+++ b/headers/All/5.0/glib-2.0/gio/gtlsconnection.h.defs 2012-12-10 18:47:38 +0000
@@ -14,7 +14,7 @@
GTlsCertificateFlags errors);
gboolean(*handshake) (GTlsConnection * conn,
GCancellable * cancellable, GError * *error);
- void (*handshake_async) (GTlsConnection * conn, int io_priority,,
+ void (*handshake_async) (GTlsConnection * conn, int io_priority,
GCancellable * cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
=== modified file 'headers/glib-2.0/gio/gaction.h'
--- a/headers/glib-2.0/gio/gaction.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gaction.h 2012-12-10 18:47:38 +0000
@@ -22,9 +22,9 @@
struct _GActionInterface {
GTypeInterface g_iface;
- const char *(*get_name) (GAction * action);
- (*get_parameter_type) (GAction * action);
- (*get_state_type) (GAction * action);
+ const gchar *get_name;
+ const GVariantType(*get_parameter_type) (GAction * action);
+ const GVariantType(*get_state_type) (GAction * action);
GVariant *(*get_state_hint) (GAction * action);
gboolean(*get_enabled) (GAction * action);
GVariant *(*get_state) (GAction * action);
=== modified file 'headers/glib-2.0/gio/gactiongroup.h'
--- a/headers/glib-2.0/gio/gactiongroup.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gactiongroup.h 2012-12-10 18:47:38 +0000
@@ -57,8 +57,8 @@
gboolean(*query_action) (GActionGroup * action_group,
const gchar * action_name,
gboolean * enabled,
- const GVariantType * *parameter_type,
- const GVariantType * *state_type,
+ const GVariantType * parameter_type,
+ const GVariantType * state_type,
GVariant * *state_hint,
GVariant * *state);
};
@@ -115,8 +115,10 @@
action_group,
const char *action_name,
gboolean * enabled,
- *parameter_type,
- *state_type,
+ const GVariantType *
+ parameter_type,
+ const GVariantType *
+ state_type,
GVariant * *state_hint,
GVariant * *state);
#ifdef __cplusplus
=== modified file 'headers/glib-2.0/gio/gdbusobjectmanagerclient.h'
--- a/headers/glib-2.0/gio/gdbusobjectmanagerclient.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gdbusobjectmanagerclient.h 2012-12-10 18:47:38 +0000
@@ -42,7 +42,7 @@
void (*interface_proxy_properties_changed)
(GDBusObjectManagerClient * manager,
GDBusObjectProxy * object_proxy, GDBusProxy * interface_proxy,
- GVariant * changed properties,
+ GVariant * changed_properties,
const gchar * const *invalidated_properties);
gpointer padding[8];
};
=== modified file 'headers/glib-2.0/gio/gdrive.h'
--- a/headers/glib-2.0/gio/gdrive.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gdrive.h 2012-12-10 18:47:38 +0000
@@ -53,15 +53,14 @@
gboolean(*poll_for_media_finish) (GDrive * drive,
GAsyncResult * result,
GError * *error);
- char *(*get_identifier) (GDrive * drive, GDrive * drive,
- const char *kind);
+ char *(*get_identifier) (GDrive * drive, const char *kind);
char **(*enumerate_identifiers) (GDrive * drive);
GDriveStartStopType(*get_start_stop_type) (GDrive * drive);
gboolean(*can_start) (GDrive * drive);
gboolean(*can_start_degraded) (GDrive * drive);
void (*start) (GDrive * drive, GDriveStartFlags flags,
- GMountOperation mount_operation,,
- GCancellable * cancellable,,
+ GMountOperation mount_operation,
+ GCancellable * cancellable,
GAsyncReadyCallback callback, gpointer user_data);
gboolean(*start_finish) (GDrive * drive, GAsyncResult * result,
GError * *error);
=== modified file 'headers/glib-2.0/gio/gtlsconnection.h'
--- a/headers/glib-2.0/gio/gtlsconnection.h 2012-12-07 15:29:08 +0000
+++ b/headers/glib-2.0/gio/gtlsconnection.h 2012-12-10 18:47:38 +0000
@@ -47,7 +47,7 @@
gboolean(*handshake) (GTlsConnection * conn,
GCancellable * cancellable,
GError * *error);
- void (*handshake_async) (GTlsConnection * conn, int io_priority,,
+ void (*handshake_async) (GTlsConnection * conn, int io_priority,
GCancellable * cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
=== modified file 'package/Makefile'
--- a/package/Makefile 2012-12-07 15:29:08 +0000
+++ b/package/Makefile 2012-12-10 18:47:38 +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=2
+RPM_PACKAGE_RELEASE=3
# 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