Update to dbus-glib-0.112.
This commit is contained in:
ajacoutot
parent
fc5cf700e4
commit
e53643199c
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.56 2019/07/12 20:51:09 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.57 2021/03/27 07:56:17 ajacoutot Exp $
|
||||
|
||||
COMMENT= glib bindings for dbus message system
|
||||
|
||||
DISTNAME= dbus-glib-0.110
|
||||
DISTNAME= dbus-glib-0.112
|
||||
EPOCH= 0
|
||||
REVISION= 1
|
||||
|
||||
SHARED_LIBS += dbus-glib-1 5.0 # 5.4
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (dbus-glib-0.110.tar.gz) = fOR2DPZsaRSPa9bJL+qruIEt7jCEayTND3OVxDbX6CU=
|
||||
SIZE (dbus-glib-0.110.tar.gz) = 836497
|
||||
SHA256 (dbus-glib-0.112.tar.gz) = fVUNzN/NKG4ziVUBgp7Zce62XGFOc6rbSgiu73GbFDo=
|
||||
SIZE (dbus-glib-0.112.tar.gz) = 715340
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
$OpenBSD: patch-dbus_dbus-binding-tool-glib_c,v 1.1 2019/02/26 08:15:13 ajacoutot Exp $
|
||||
|
||||
From 9c038151b491dead7b9f9ca2d1a70c16417966a0 Mon Sep 17 00:00:00 2001
|
||||
From: x00292102 <xiezhipeng1@huawei.com>
|
||||
Date: Tue, 10 Apr 2018 11:46:38 +0800
|
||||
Subject: Fix double free for data.channel
|
||||
|
||||
Index: dbus/dbus-binding-tool-glib.c
|
||||
--- dbus/dbus-binding-tool-glib.c.orig
|
||||
+++ dbus/dbus-binding-tool-glib.c
|
||||
@@ -870,11 +870,13 @@ dbus_binding_tool_output_glib_server (BaseInfo *info,
|
||||
ret = FALSE;
|
||||
g_io_channel_shutdown (data.channel, TRUE, error);
|
||||
g_io_channel_unref (data.channel);
|
||||
+ data.channel = NULL;
|
||||
goto io_lose;
|
||||
}
|
||||
|
||||
g_io_channel_shutdown (data.channel, TRUE, error);
|
||||
g_io_channel_unref (data.channel);
|
||||
+ data.channel = NULL;
|
||||
|
||||
/* Now spawn glib-genmarshal to insert all our required marshallers */
|
||||
argv = g_ptr_array_new ();
|
||||
@ -1,73 +0,0 @@
|
||||
$OpenBSD: patch-dbus_dbus-gobject_c,v 1.5 2019/02/26 08:15:13 ajacoutot Exp $
|
||||
|
||||
From 0e4c62b0000640ab46adc02bc4f774454bace4ad Mon Sep 17 00:00:00 2001
|
||||
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
||||
Date: Mon, 15 Sep 2014 15:54:29 +0100
|
||||
Subject: gerror_to_dbus_error_message: add support for remaining members of DBusGError
|
||||
|
||||
From 850459e0793e3bb1d3ca6a1c51735fa195ccc4f8 Mon Sep 17 00:00:00 2001
|
||||
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
||||
Date: Mon, 15 Sep 2014 15:55:39 +0100
|
||||
Subject: invoke_object_method: when demarshalling fails, use the right error
|
||||
|
||||
Index: dbus/dbus-gobject.c
|
||||
--- dbus/dbus-gobject.c.orig
|
||||
+++ dbus/dbus-gobject.c
|
||||
@@ -1623,6 +1623,48 @@ gerror_to_dbus_error_message (const DBusGObjectInfo *o
|
||||
case DBUS_GERROR_FILE_NOT_FOUND:
|
||||
name = DBUS_ERROR_FILE_NOT_FOUND;
|
||||
break;
|
||||
+ case DBUS_GERROR_FILE_EXISTS:
|
||||
+ name = DBUS_ERROR_FILE_EXISTS;
|
||||
+ break;
|
||||
+ case DBUS_GERROR_UNKNOWN_METHOD:
|
||||
+ name = DBUS_ERROR_UNKNOWN_METHOD;
|
||||
+ break;
|
||||
+ case DBUS_GERROR_TIMED_OUT:
|
||||
+ name = DBUS_ERROR_TIMED_OUT;
|
||||
+ break;
|
||||
+ case DBUS_GERROR_MATCH_RULE_NOT_FOUND:
|
||||
+ name = DBUS_ERROR_MATCH_RULE_NOT_FOUND;
|
||||
+ break;
|
||||
+ case DBUS_GERROR_MATCH_RULE_INVALID:
|
||||
+ name = DBUS_ERROR_MATCH_RULE_INVALID;
|
||||
+ break;
|
||||
+ case DBUS_GERROR_SPAWN_EXEC_FAILED:
|
||||
+ name = DBUS_ERROR_SPAWN_EXEC_FAILED;
|
||||
+ break;
|
||||
+ case DBUS_GERROR_SPAWN_FORK_FAILED:
|
||||
+ name = DBUS_ERROR_SPAWN_FORK_FAILED;
|
||||
+ break;
|
||||
+ case DBUS_GERROR_SPAWN_CHILD_EXITED:
|
||||
+ name = DBUS_ERROR_SPAWN_CHILD_EXITED;
|
||||
+ break;
|
||||
+ case DBUS_GERROR_SPAWN_CHILD_SIGNALED:
|
||||
+ name = DBUS_ERROR_SPAWN_CHILD_SIGNALED;
|
||||
+ break;
|
||||
+ case DBUS_GERROR_SPAWN_FAILED:
|
||||
+ name = DBUS_ERROR_SPAWN_FAILED;
|
||||
+ break;
|
||||
+ case DBUS_GERROR_UNIX_PROCESS_ID_UNKNOWN:
|
||||
+ name = DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN;
|
||||
+ break;
|
||||
+ case DBUS_GERROR_INVALID_SIGNATURE:
|
||||
+ name = DBUS_ERROR_INVALID_SIGNATURE;
|
||||
+ break;
|
||||
+ case DBUS_GERROR_INVALID_FILE_CONTENT:
|
||||
+ name = DBUS_ERROR_INVALID_FILE_CONTENT;
|
||||
+ break;
|
||||
+ case DBUS_GERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN:
|
||||
+ name = DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN;
|
||||
+ break;
|
||||
case DBUS_GERROR_REMOTE_EXCEPTION:
|
||||
name = dbus_g_error_get_name ((GError*) error);
|
||||
break;
|
||||
@@ -1746,7 +1788,7 @@ invoke_object_method (GObject *object,
|
||||
{
|
||||
g_free (in_signature);
|
||||
g_array_free (types_array, TRUE);
|
||||
- reply = error_or_die (message, "org.freedesktop.DBus.GLib.ErrorError", error->message);
|
||||
+ reply = gerror_to_dbus_error_message (object_info, message, error);
|
||||
connection_send_or_die (connection, reply);
|
||||
dbus_message_unref (reply);
|
||||
g_error_free (error);
|
||||
@ -1,11 +1,11 @@
|
||||
@comment $OpenBSD: PLIST,v 1.20 2019/02/26 08:15:13 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.21 2021/03/27 07:56:17 ajacoutot Exp $
|
||||
@bin bin/dbus-binding-tool
|
||||
include/dbus-1.0/dbus/dbus-glib-bindings.h
|
||||
include/dbus-1.0/dbus/dbus-glib-lowlevel.h
|
||||
include/dbus-1.0/dbus/dbus-glib.h
|
||||
include/dbus-1.0/dbus/dbus-gtype-specialized.h
|
||||
include/dbus-1.0/dbus/dbus-gvalue-parse-variant.h
|
||||
lib/libdbus-glib-1.a
|
||||
@static-lib lib/libdbus-glib-1.a
|
||||
lib/libdbus-glib-1.la
|
||||
@lib lib/libdbus-glib-1.so.${LIBdbus-glib-1_VERSION}
|
||||
lib/pkgconfig/dbus-glib-1.pc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user