diff --git a/.config b/.config index 1e28ac4..3babd73 100644 --- a/.config +++ b/.config @@ -3219,7 +3219,7 @@ CONFIG_PACKAGE_libdbus-glib=m # CONFIG_PACKAGE_libevent2-pthreads is not set # CONFIG_PACKAGE_libeventlog is not set # CONFIG_PACKAGE_libexif is not set -# CONFIG_PACKAGE_libexpat is not set +CONFIG_PACKAGE_libexpat=m # CONFIG_PACKAGE_libexslt is not set # CONFIG_PACKAGE_libezxml is not set # CONFIG_PACKAGE_libfaad2 is not set @@ -3779,7 +3779,8 @@ CONFIG_PACKAGE_comgt=y # CONFIG_PACKAGE_crypto-tools is not set # CONFIG_PACKAGE_cryptsetup is not set # CONFIG_PACKAGE_daemontools is not set -# CONFIG_PACKAGE_dbus is not set +CONFIG_PACKAGE_dbus=m +CONFIG_PACKAGE_dbus-utils=m # CONFIG_PACKAGE_devmem2 is not set # CONFIG_PACKAGE_dfu-util is not set # CONFIG_PACKAGE_dialog is not set diff --git a/feeds/packages/libs/dbus-glib/Makefile b/feeds/packages/libs/dbus-glib/Makefile index 8a79f98..7a46d93 100644 --- a/feeds/packages/libs/dbus-glib/Makefile +++ b/feeds/packages/libs/dbus-glib/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dbus-glib -PKG_VERSION:=0.80 +PKG_VERSION:=0.94 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://dbus.freedesktop.org/releases/dbus-glib/ -PKG_MD5SUM:=86ea60ba2118a1b9deafe8257f6a6a1a +PKG_MD5SUM:=e1f1506a6f4941e67bffd614b1ad5af6 PKG_FIXUP:=autoreconf diff --git a/feeds/packages/libs/dbus-glib/patches/001-cross.patch b/feeds/packages/libs/dbus-glib/patches/001-cross.patch index 486782d..9dc47c2 100644 --- a/feeds/packages/libs/dbus-glib/patches/001-cross.patch +++ b/feeds/packages/libs/dbus-glib/patches/001-cross.patch @@ -1,19 +1,25 @@ ---- a/dbus/Makefile.in -+++ b/dbus/Makefile.in -@@ -315,7 +315,7 @@ target_vendor = @target_vendor@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = . examples -+SUBDIRS = . - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ ---- a/Makefile.in -+++ b/Makefile.in -@@ -267,8 +267,8 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ +Index: dbus-glib-0.94/Makefile.am +=================================================================== +--- dbus-glib-0.94.orig/Makefile.am ++++ dbus-glib-0.94/Makefile.am +@@ -1,8 +1,8 @@ + ACLOCAL_AMFLAGS = -I m4 + GLIB_PC=dbus-glib-1.pc + +-SUBDIRS=dbus tools test doc +-DIST_SUBDIRS=dbus tools test doc m4 ++SUBDIRS=dbus tools ++DIST_SUBDIRS=dbus tools m4 + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = $(GLIB_PC) +Index: dbus-glib-0.94/Makefile.in +=================================================================== +--- dbus-glib-0.94.orig/Makefile.in ++++ dbus-glib-0.94/Makefile.in +@@ -318,8 +318,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ + ACLOCAL_AMFLAGS = -I m4 GLIB_PC = dbus-glib-1.pc -SUBDIRS = dbus tools test doc -DIST_SUBDIRS = dbus tools test doc m4 @@ -22,75 +28,83 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(GLIB_PC) DISTCLEANFILES = \ ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -1,24 +1,10 @@ +Index: dbus-glib-0.94/configure.ac +=================================================================== +--- dbus-glib-0.94.orig/configure.ac ++++ dbus-glib-0.94/configure.ac +@@ -55,9 +55,6 @@ AC_ARG_ENABLE(bash-completion, AS_HELP_S + AC_ARG_WITH(test-socket-dir, AS_HELP_STRING([--with-test-socket-dir=[dirname]],[Where to put sockets for make check])) + + +-AC_ARG_WITH(introspect-xml, AS_HELP_STRING([--with-introspect-xml=[filename]],[Pass in a pregenerated dbus daemon introspection xml file (as generated by 'dbus-daemon --introspect') to use instead of querying the installed dbus daemon])) +- +- + AM_CONDITIONAL(DBUS_BASH_COMPLETION, test x$enable_bash_completion = xyes) + if test x$enable_bash_completion = xyes; then + AC_DEFINE(DBUS_BASH_COMPLETION,1,[Enable bash completion]) +Index: dbus-glib-0.94/dbus/Makefile.in +=================================================================== +--- dbus-glib-0.94.orig/dbus/Makefile.in ++++ dbus-glib-0.94/dbus/Makefile.in +@@ -352,7 +352,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = . examples ++SUBDIRS = . + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ +Index: dbus-glib-0.94/tools/Makefile.am +=================================================================== +--- dbus-glib-0.94.orig/tools/Makefile.am ++++ dbus-glib-0.94/tools/Makefile.am +@@ -1,15 +1,10 @@ INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_COMPILATION -nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h libdbus_glibdir = $(includedir)/dbus-1.0/dbus --dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) -- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml -- --BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml +-dbus-glib-bindings.h: $(top_srcdir)/dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) +- $(DBUS_BINDING_TOOL) --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h $(top_srcdir)/dbus-bus-introspect.xml - --if USE_INTROSPECT_XML --dbus-bus-introspect.xml: $(INTROSPECT_XML_PATH) -- cp $(INTROSPECT_XML_PATH) dbus-bus-introspect.xml --else --dbus-bus-introspect.xml: -- DBUS_TOP_BUILDDIR=$(top_builddir) @DBUS_DAEMONDIR@dbus-daemon --introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml --endif +-BUILT_SOURCES = dbus-glib-bindings.h +BUILT_SOURCES = EXTRA_DIST = run-with-tmp-session-bus.sh session.conf CLEANFILES = \ - run-with-tmp-session-bus.conf \ -- dbus-bus-introspect.xml \ - dbus-glib-bindings.h -+ run-with-tmp-session-bus.conf ++ run-with-tmp-session-bus.conf +Index: dbus-glib-0.94/dbus/Makefile.am +=================================================================== +--- dbus-glib-0.94.orig/dbus/Makefile.am ++++ dbus-glib-0.94/dbus/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = . examples ++SUBDIRS = . + + INCLUDES = \ + -I$(top_srcdir) \ --- a/configure.ac +++ b/configure.ac -@@ -58,9 +58,6 @@ AC_ARG_ENABLE(bash-completion, AS_HELP_S - AC_ARG_WITH(test-socket-dir, AS_HELP_STRING([--with-test-socket-dir=[dirname]],[Where to put sockets for make check])) - - --AC_ARG_WITH(introspect-xml, AS_HELP_STRING([--with-introspect-xml=[filename]],[Pass in a pregenerated dbus daemon introspection xml file (as generated by 'dbus-daemon --introspect') to use instead of querying the installed dbus daemon])) -- -- - AM_CONDITIONAL(DBUS_BASH_COMPLETION, test x$enable_bash_completion = xyes) - if test x$enable_bash_completion = xyes; then - AC_DEFINE(DBUS_BASH_COMPLETION,1,[Enable bash completion]) -@@ -815,18 +812,6 @@ fi - AC_SUBST(TEST_SOCKET_DIR) - AC_DEFINE_UNQUOTED(DBUS_TEST_SOCKET_DIR, "$TEST_SOCKET_DIR", [Where to put test sockets]) - --#### Test if we should generate daemon introspection xml --use_introspect_xml=false -- --if ! test -z "$with_introspect_xml" ; then -- use_introspect_xml=true -- INTROSPECT_XML_PATH="$with_introspect_xml" -- AC_DEFINE(INTROSPECT_XML_PATH, "$INTROSPECT_XML_PATH", [Path to pregenerated xml for dbus daemon introspection]) -- AC_SUBST(INTROSPECT_XML_PATH) --fi -- --AM_CONDITIONAL(USE_INTROSPECT_XML, $use_introspect_xml) -- +@@ -815,18 +815,7 @@ AC_DEFINE_UNQUOTED(DBUS_TEST_SOCKET_DIR, AC_OUTPUT([ Makefile m4/Makefile ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,7 @@ - GLIB_PC=dbus-glib-1.pc - --SUBDIRS=dbus tools test doc --DIST_SUBDIRS=dbus tools test doc m4 -+SUBDIRS=dbus tools -+DIST_SUBDIRS=dbus tools m4 - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = $(GLIB_PC) +-doc/Makefile +-doc/reference/Makefile +-doc/reference/version.xml + dbus/Makefile +-dbus/examples/Makefile +-dbus/examples/statemachine/Makefile +-test/Makefile +-test/core/Makefile +-test/interfaces/Makefile +-test/data/valid-service-files/debug-glib.service +-test/data/valid-service-files/debug-echo.service +-test/data/valid-service-files/interfaces-test.service + tools/Makefile + dbus-glib-1.pc + dbus-glib-1-uninstalled.pc diff --git a/feeds/packages/libs/dbus-glib/patches/002-introspected-api.patch b/feeds/packages/libs/dbus-glib/patches/002-introspected-api.patch new file mode 100644 index 0000000..37f4147 --- /dev/null +++ b/feeds/packages/libs/dbus-glib/patches/002-introspected-api.patch @@ -0,0 +1,654 @@ +Index: dbus-glib-0.94/tools/dbus-glib-bindings.h +=================================================================== +--- dbus-glib-0.94.orig/tools/dbus-glib-bindings.h 1970-01-01 01:00:00.000000000 +0100 ++++ dbus-glib-0.94/tools/dbus-glib-bindings.h 2013-03-21 10:22:05.000000000 +0000 +@@ -0,0 +1,636 @@ ++/* Generated by dbus-binding-tool; do not edit! */ ++ ++#include ++#include ++ ++G_BEGIN_DECLS ++ ++#ifndef _DBUS_GLIB_ASYNC_DATA_FREE ++#define _DBUS_GLIB_ASYNC_DATA_FREE ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++void ++_dbus_glib_async_data_free (gpointer stuff) ++{ ++ g_slice_free (DBusGAsyncData, stuff); ++} ++#endif ++ ++#ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_DBus_Introspectable ++#define DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_DBus_Introspectable ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_Introspectable_introspect (DBusGProxy *proxy, char ** OUT_data, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "Introspect", error, G_TYPE_INVALID, G_TYPE_STRING, OUT_data, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_Introspectable_introspect_reply) (DBusGProxy *proxy, char * OUT_data, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_Introspectable_introspect_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ char * OUT_data; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRING, &OUT_data, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_Introspectable_introspect_reply)data->cb) (proxy, OUT_data, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_Introspectable_introspect_async (DBusGProxy *proxy, org_freedesktop_DBus_Introspectable_introspect_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "Introspect", org_freedesktop_DBus_Introspectable_introspect_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVALID); ++} ++#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_DBus_Introspectable */ ++ ++#ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_DBus ++#define DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_DBus ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_request_name (DBusGProxy *proxy, const char * IN_arg0, const guint IN_arg1, guint* OUT_arg2, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "RequestName", error, G_TYPE_STRING, IN_arg0, G_TYPE_UINT, IN_arg1, G_TYPE_INVALID, G_TYPE_UINT, OUT_arg2, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_request_name_reply) (DBusGProxy *proxy, guint OUT_arg2, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_request_name_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ guint OUT_arg2; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_UINT, &OUT_arg2, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_request_name_reply)data->cb) (proxy, OUT_arg2, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_request_name_async (DBusGProxy *proxy, const char * IN_arg0, const guint IN_arg1, org_freedesktop_DBus_request_name_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "RequestName", org_freedesktop_DBus_request_name_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_arg0, G_TYPE_UINT, IN_arg1, G_TYPE_INVALID); ++} ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_release_name (DBusGProxy *proxy, const char * IN_arg0, guint* OUT_arg1, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "ReleaseName", error, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID, G_TYPE_UINT, OUT_arg1, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_release_name_reply) (DBusGProxy *proxy, guint OUT_arg1, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_release_name_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ guint OUT_arg1; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_UINT, &OUT_arg1, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_release_name_reply)data->cb) (proxy, OUT_arg1, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_release_name_async (DBusGProxy *proxy, const char * IN_arg0, org_freedesktop_DBus_release_name_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "ReleaseName", org_freedesktop_DBus_release_name_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID); ++} ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_start_service_by_name (DBusGProxy *proxy, const char * IN_arg0, const guint IN_arg1, guint* OUT_arg2, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "StartServiceByName", error, G_TYPE_STRING, IN_arg0, G_TYPE_UINT, IN_arg1, G_TYPE_INVALID, G_TYPE_UINT, OUT_arg2, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_start_service_by_name_reply) (DBusGProxy *proxy, guint OUT_arg2, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_start_service_by_name_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ guint OUT_arg2; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_UINT, &OUT_arg2, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_start_service_by_name_reply)data->cb) (proxy, OUT_arg2, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_start_service_by_name_async (DBusGProxy *proxy, const char * IN_arg0, const guint IN_arg1, org_freedesktop_DBus_start_service_by_name_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "StartServiceByName", org_freedesktop_DBus_start_service_by_name_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_arg0, G_TYPE_UINT, IN_arg1, G_TYPE_INVALID); ++} ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_hello (DBusGProxy *proxy, char ** OUT_arg0, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "Hello", error, G_TYPE_INVALID, G_TYPE_STRING, OUT_arg0, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_hello_reply) (DBusGProxy *proxy, char * OUT_arg0, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_hello_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ char * OUT_arg0; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRING, &OUT_arg0, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_hello_reply)data->cb) (proxy, OUT_arg0, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_hello_async (DBusGProxy *proxy, org_freedesktop_DBus_hello_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "Hello", org_freedesktop_DBus_hello_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVALID); ++} ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_name_has_owner (DBusGProxy *proxy, const char * IN_arg0, gboolean* OUT_arg1, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "NameHasOwner", error, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID, G_TYPE_BOOLEAN, OUT_arg1, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_name_has_owner_reply) (DBusGProxy *proxy, gboolean OUT_arg1, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_name_has_owner_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ gboolean OUT_arg1; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_BOOLEAN, &OUT_arg1, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_name_has_owner_reply)data->cb) (proxy, OUT_arg1, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_name_has_owner_async (DBusGProxy *proxy, const char * IN_arg0, org_freedesktop_DBus_name_has_owner_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "NameHasOwner", org_freedesktop_DBus_name_has_owner_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID); ++} ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_list_names (DBusGProxy *proxy, char *** OUT_arg0, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "ListNames", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_arg0, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_list_names_reply) (DBusGProxy *proxy, char * *OUT_arg0, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_list_names_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ char ** OUT_arg0; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_arg0, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_list_names_reply)data->cb) (proxy, OUT_arg0, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_list_names_async (DBusGProxy *proxy, org_freedesktop_DBus_list_names_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "ListNames", org_freedesktop_DBus_list_names_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVALID); ++} ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_list_activatable_names (DBusGProxy *proxy, char *** OUT_arg0, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "ListActivatableNames", error, G_TYPE_INVALID, G_TYPE_STRV, OUT_arg0, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_list_activatable_names_reply) (DBusGProxy *proxy, char * *OUT_arg0, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_list_activatable_names_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ char ** OUT_arg0; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_arg0, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_list_activatable_names_reply)data->cb) (proxy, OUT_arg0, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_list_activatable_names_async (DBusGProxy *proxy, org_freedesktop_DBus_list_activatable_names_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "ListActivatableNames", org_freedesktop_DBus_list_activatable_names_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVALID); ++} ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_add_match (DBusGProxy *proxy, const char * IN_arg0, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "AddMatch", error, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_add_match_reply) (DBusGProxy *proxy, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_add_match_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_add_match_reply)data->cb) (proxy, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_add_match_async (DBusGProxy *proxy, const char * IN_arg0, org_freedesktop_DBus_add_match_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "AddMatch", org_freedesktop_DBus_add_match_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID); ++} ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_remove_match (DBusGProxy *proxy, const char * IN_arg0, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "RemoveMatch", error, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_remove_match_reply) (DBusGProxy *proxy, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_remove_match_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_remove_match_reply)data->cb) (proxy, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_remove_match_async (DBusGProxy *proxy, const char * IN_arg0, org_freedesktop_DBus_remove_match_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "RemoveMatch", org_freedesktop_DBus_remove_match_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID); ++} ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_get_name_owner (DBusGProxy *proxy, const char * IN_arg0, char ** OUT_arg1, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "GetNameOwner", error, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID, G_TYPE_STRING, OUT_arg1, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_get_name_owner_reply) (DBusGProxy *proxy, char * OUT_arg1, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_get_name_owner_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ char * OUT_arg1; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRING, &OUT_arg1, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_get_name_owner_reply)data->cb) (proxy, OUT_arg1, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_get_name_owner_async (DBusGProxy *proxy, const char * IN_arg0, org_freedesktop_DBus_get_name_owner_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "GetNameOwner", org_freedesktop_DBus_get_name_owner_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID); ++} ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_list_queued_owners (DBusGProxy *proxy, const char * IN_arg0, char *** OUT_arg1, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "ListQueuedOwners", error, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID, G_TYPE_STRV, OUT_arg1, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_list_queued_owners_reply) (DBusGProxy *proxy, char * *OUT_arg1, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_list_queued_owners_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ char ** OUT_arg1; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_arg1, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_list_queued_owners_reply)data->cb) (proxy, OUT_arg1, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_list_queued_owners_async (DBusGProxy *proxy, const char * IN_arg0, org_freedesktop_DBus_list_queued_owners_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "ListQueuedOwners", org_freedesktop_DBus_list_queued_owners_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID); ++} ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_get_connection_unix_user (DBusGProxy *proxy, const char * IN_arg0, guint* OUT_arg1, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "GetConnectionUnixUser", error, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID, G_TYPE_UINT, OUT_arg1, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_get_connection_unix_user_reply) (DBusGProxy *proxy, guint OUT_arg1, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_get_connection_unix_user_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ guint OUT_arg1; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_UINT, &OUT_arg1, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_get_connection_unix_user_reply)data->cb) (proxy, OUT_arg1, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_get_connection_unix_user_async (DBusGProxy *proxy, const char * IN_arg0, org_freedesktop_DBus_get_connection_unix_user_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "GetConnectionUnixUser", org_freedesktop_DBus_get_connection_unix_user_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID); ++} ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_get_connection_unix_process_id (DBusGProxy *proxy, const char * IN_arg0, guint* OUT_arg1, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "GetConnectionUnixProcessID", error, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID, G_TYPE_UINT, OUT_arg1, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_get_connection_unix_process_id_reply) (DBusGProxy *proxy, guint OUT_arg1, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_get_connection_unix_process_id_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ guint OUT_arg1; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_UINT, &OUT_arg1, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_get_connection_unix_process_id_reply)data->cb) (proxy, OUT_arg1, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_get_connection_unix_process_id_async (DBusGProxy *proxy, const char * IN_arg0, org_freedesktop_DBus_get_connection_unix_process_id_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "GetConnectionUnixProcessID", org_freedesktop_DBus_get_connection_unix_process_id_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID); ++} ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_get_connection_se_linux_security_context (DBusGProxy *proxy, const char * IN_arg0, GArray** OUT_arg1, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "GetConnectionSELinuxSecurityContext", error, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID, dbus_g_type_get_collection ("GArray", G_TYPE_UCHAR), OUT_arg1, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_get_connection_se_linux_security_context_reply) (DBusGProxy *proxy, GArray *OUT_arg1, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_get_connection_se_linux_security_context_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ GArray* OUT_arg1; ++ dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_collection ("GArray", G_TYPE_UCHAR), &OUT_arg1, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_get_connection_se_linux_security_context_reply)data->cb) (proxy, OUT_arg1, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_get_connection_se_linux_security_context_async (DBusGProxy *proxy, const char * IN_arg0, org_freedesktop_DBus_get_connection_se_linux_security_context_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "GetConnectionSELinuxSecurityContext", org_freedesktop_DBus_get_connection_se_linux_security_context_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_STRING, IN_arg0, G_TYPE_INVALID); ++} ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++gboolean ++org_freedesktop_DBus_reload_config (DBusGProxy *proxy, GError **error) ++ ++{ ++ return dbus_g_proxy_call (proxy, "ReloadConfig", error, G_TYPE_INVALID, G_TYPE_INVALID); ++} ++ ++typedef void (*org_freedesktop_DBus_reload_config_reply) (DBusGProxy *proxy, GError *error, gpointer userdata); ++ ++static void ++org_freedesktop_DBus_reload_config_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) ++{ ++ DBusGAsyncData *data = (DBusGAsyncData*) user_data; ++ GError *error = NULL; ++ dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID); ++ (*(org_freedesktop_DBus_reload_config_reply)data->cb) (proxy, error, data->userdata); ++ return; ++} ++ ++static ++#ifdef G_HAVE_INLINE ++inline ++#endif ++DBusGProxyCall* ++org_freedesktop_DBus_reload_config_async (DBusGProxy *proxy, org_freedesktop_DBus_reload_config_reply callback, gpointer userdata) ++ ++{ ++ DBusGAsyncData *stuff; ++ stuff = g_slice_new (DBusGAsyncData); ++ stuff->cb = G_CALLBACK (callback); ++ stuff->userdata = userdata; ++ return dbus_g_proxy_begin_call (proxy, "ReloadConfig", org_freedesktop_DBus_reload_config_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVALID); ++} ++#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_DBus */ ++ ++G_END_DECLS +Index: dbus-glib-0.94/tools/Makefile.am +=================================================================== +--- dbus-glib-0.94.orig/tools/Makefile.am ++++ dbus-glib-0.94/tools/Makefile.am +@@ -2,6 +2,8 @@ INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) + + libdbus_glibdir = $(includedir)/dbus-1.0/dbus + ++libdbus_glib_HEADERS = dbus-glib-bindings.h ++ + BUILT_SOURCES = + + EXTRA_DIST = run-with-tmp-session-bus.sh session.conf diff --git a/feeds/packages/libs/dbus-glib/patches/003-disable-tests-docs-examples.patch b/feeds/packages/libs/dbus-glib/patches/003-disable-tests-docs-examples.patch deleted file mode 100644 index e6945d9..0000000 --- a/feeds/packages/libs/dbus-glib/patches/003-disable-tests-docs-examples.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -815,18 +815,7 @@ AC_DEFINE_UNQUOTED(DBUS_TEST_SOCKET_DIR, - AC_OUTPUT([ - Makefile - m4/Makefile --doc/Makefile --doc/reference/Makefile --doc/reference/version.xml - dbus/Makefile --dbus/examples/Makefile --dbus/examples/statemachine/Makefile --test/Makefile --test/core/Makefile --test/interfaces/Makefile --test/data/valid-service-files/debug-glib.service --test/data/valid-service-files/debug-echo.service --test/data/valid-service-files/interfaces-test.service - tools/Makefile - dbus-glib-1.pc - dbus-glib-1-uninstalled.pc ---- a/dbus/Makefile.am -+++ b/dbus/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = . examples -+SUBDIRS = . - - INCLUDES = \ - -I$(top_srcdir) \