Pull in latest dbus-glib from upstream (0.100)
CQ-DEPEND=Ie0d896df00b9765176c586d1fb86b84a048b20a4
BUG=chromium-os:39783
TEST=arm-generic-full trybot
TEST=./build_packages --board daisy
TEST=./build_packages --board x86-mario
Change-Id: I1faa46f5f7bd1657539144a00d1066713a6fcb58
Reviewed-on: https://gerrit.chromium.org/gerrit/44989
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
Commit-Queue: Chris Masone <cmasone@chromium.org>
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
new file mode 100644
index 0000000..23ae336
--- /dev/null
+++ b/dev-libs/dbus-glib/Manifest
@@ -0,0 +1 @@
+DIST dbus-glib-0.100.tar.gz 730875 RMD160 01f474d021fb2a3c8eec86f590a5cd5a0ef3bf82 SHA1 dc58ec3466fc08cd1ec7c5ccc0d45c7881fb0610 SHA256 80ddf7584a659590103817798dd95d7e451d666f385e5e95a83abf85c46d4605
diff --git a/dev-libs/dbus-glib/dbus-glib-0.100.ebuild b/dev-libs/dbus-glib/dbus-glib-0.100.ebuild
new file mode 100644
index 0000000..adf9d7e
--- /dev/null
+++ b/dev-libs/dbus-glib/dbus-glib-0.100.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.100.ebuild,v 1.6 2012/10/14 14:58:21 armin76 Exp $
+
+EAPI=4
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="D-Bus bindings for glib"
+HOMEPAGE="http://dbus.freedesktop.org/"
+SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="debug doc static-libs test"
+
+RDEPEND=">=dev-libs/expat-2
+ >=dev-libs/glib-2.26
+ >=sys-apps/dbus-1.6.2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( dev-util/gtk-doc )"
+
+# out of sources build directory
+BD=${WORKDIR}/${P}-build
+# out of sources build dir for make check
+TBD=${WORKDIR}/${P}-tests-build
+
+src_configure() {
+ local myconf=(
+ --localstatedir="${EPREFIX}"/var
+ --enable-bash-completion
+ $(use_enable debug verbose-mode)
+ $(use_enable debug asserts)
+ $(use_enable static-libs static)
+ $(use_enable doc gtk-doc)
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ mkdir "${BD}"
+ cd "${BD}"
+ einfo "Running configure in ${BD}"
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+ if use test; then
+ mkdir "${TBD}"
+ cd "${TBD}"
+ einfo "Running configure in ${TBD}"
+ ECONF_SOURCE="${S}" econf \
+ "${myconf[@]}" \
+ $(use_enable test checks) \
+ $(use_enable test tests) \
+ $(use_enable test asserts) \
+ $(use_with test test-socket-dir "${T}"/dbus-test-socket)
+ fi
+}
+
+src_compile() {
+ cd "${BD}"
+ einfo "Running make in ${BD}"
+ emake
+
+ if use test; then
+ cd "${TBD}"
+ einfo "Running make in ${TBD}"
+ emake
+ fi
+}
+
+src_test() {
+ cd "${TBD}"
+ emake check
+}
+
+src_install() {
+ # NEWS file is obsolete
+ dodoc AUTHORS ChangeLog HACKING README
+
+ cd "${BD}"
+ emake DESTDIR="${D}" install
+
+ newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus
+ rm -rf "${ED}"/etc/bash_completion.d || die
+
+ prune_libtool_files
+}
diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.100-dbus-glib-sections.txt b/dev-libs/dbus-glib/files/dbus-glib-0.100-dbus-glib-sections.txt
new file mode 100644
index 0000000..90015c3
--- /dev/null
+++ b/dev-libs/dbus-glib/files/dbus-glib-0.100-dbus-glib-sections.txt
@@ -0,0 +1,200 @@
+<SECTION>
+<FILE>dbus-gconnection</FILE>
+<TITLE>DBusGConnection</TITLE>
+<INCLUDE>dbus/dbus-glib.h</INCLUDE>
+DBusGConnection
+DBUS_TYPE_G_CONNECTION
+dbus_g_bus_get
+dbus_g_bus_get_private
+dbus_g_thread_init
+dbus_g_connection_open
+dbus_g_connection_ref
+dbus_g_connection_unref
+dbus_g_connection_flush
+dbus_g_connection_get_connection
+dbus_g_connection_register_g_object
+dbus_g_connection_unregister_g_object
+dbus_g_connection_lookup_g_object
+<SUBSECTION Standard>
+dbus_g_connection_get_g_type
+</SECTION>
+
+<SECTION>
+<FILE>dbus-gobject</FILE>
+<TITLE>DBus GObject related functions</TITLE>
+<INCLUDE>dbus/dbus-glib.h</INCLUDE>
+DBusGObjectInfo
+dbus_g_object_type_install_info
+dbus_g_object_type_register_shadow_property
+dbus_g_object_path_get_g_type
+dbus_g_object_register_marshaller
+dbus_g_object_register_marshaller_array
+dbus_glib_global_set_disable_legacy_property_access
+</SECTION>
+
+<SECTION>
+<FILE>dbus-gmessage</FILE>
+<TITLE>DBusGMessage</TITLE>
+<INCLUDE>dbus/dbus-glib.h</INCLUDE>
+DBusGMessage
+DBUS_TYPE_G_MESSAGE
+dbus_g_message_ref
+dbus_g_message_unref
+dbus_g_message_get_message
+<SUBSECTION Standard>
+dbus_g_message_get_g_type
+</SECTION>
+
+<SECTION>
+<FILE>dbus-gmethod</FILE>
+<TITLE>DBusGMethod</TITLE>
+<INCLUDE>dbus/dbus-glib.h</INCLUDE>
+DBusGMethodInfo
+DBusGMethodInvocation
+dbus_g_method_get_sender
+dbus_g_method_get_reply
+dbus_g_method_send_reply
+dbus_g_method_return
+dbus_g_method_return_error
+</SECTION>
+
+<SECTION>
+<FILE>dbus-gerror</FILE>
+<TITLE>DBusGError</TITLE>
+<INCLUDE>dbus/dbus-glib.h</INCLUDE>
+DBusGError
+dbus_g_error_has_name
+dbus_g_error_get_name
+dbus_g_error_domain_register
+DBUS_GERROR
+<SUBSECTION Standard>
+dbus_g_error_quark
+</SECTION>
+
+<SECTION>
+<FILE>dbus-gproxy</FILE>
+<TITLE>DBusGProxy</TITLE>
+<INCLUDE>dbus/dbus-glib.h</INCLUDE>
+DBusGProxy
+DBusGProxyCall
+DBusGProxyCallNotify
+dbus_g_proxy_new_for_name
+dbus_g_proxy_new_for_name_owner
+dbus_g_proxy_new_from_proxy
+dbus_g_proxy_new_for_peer
+dbus_g_proxy_set_interface
+dbus_g_proxy_get_path
+dbus_g_proxy_get_bus_name
+dbus_g_proxy_get_interface
+dbus_g_proxy_add_signal
+dbus_g_proxy_connect_signal
+dbus_g_proxy_disconnect_signal
+dbus_g_proxy_send
+dbus_g_proxy_call
+dbus_g_proxy_call_with_timeout
+dbus_g_proxy_call_no_reply
+dbus_g_proxy_begin_call
+dbus_g_proxy_begin_call_with_timeout
+dbus_g_proxy_end_call
+dbus_g_proxy_cancel_call
+dbus_g_proxy_set_default_timeout
+<SUBSECTION Standard>
+DBUS_G_PROXY
+DBUS_IS_G_PROXY
+DBUS_TYPE_G_PROXY
+dbus_g_proxy_get_type
+DBUS_G_PROXY_CLASS
+DBUS_IS_G_PROXY_CLASS
+DBUS_G_PROXY_GET_CLASS
+<SUBSECTION Private>
+DBusGAsyncData
+</SECTION>
+
+<SECTION>
+<FILE>dbus-glib-lowlevel</FILE>
+<TITLE>DBus GLib low level</TITLE>
+<INCLUDE>dbus/dbus-glib-lowlevel.h</INCLUDE>
+dbus_set_g_error
+dbus_connection_setup_with_g_main
+dbus_connection_get_g_connection
+dbus_server_setup_with_g_main
+DBUS_TYPE_CONNECTION
+DBUS_TYPE_MESSAGE
+<SUBSECTION Standard>
+dbus_connection_get_g_type
+dbus_message_get_g_type
+<SUBSECTION Private>
+DBUS_INSIDE_DBUS_GLIB_H
+</SECTION>
+
+<SECTION>
+<FILE>dbus-gtype-specialized</FILE>
+<TITLE>Specializable GType System</TITLE>
+<INCLUDE>dbus/dbus-glib.h</INCLUDE>
+DBusGTypeSpecializedCollectionIterator
+DBusGTypeSpecializedMapIterator
+DBusGTypeSpecializedAppendContext
+DBusGTypeSpecializedConstructor
+DBusGTypeSpecializedFreeFunc
+DBusGTypeSpecializedCopyFunc
+DBusGTypeSpecializedVtable
+DBusGTypeSpecializedCollectionFixedAccessorFunc
+DBusGTypeSpecializedCollectionIteratorFunc
+DBusGTypeSpecializedCollectionAppendFunc
+DBusGTypeSpecializedCollectionEndAppendFunc
+DBusGTypeSpecializedCollectionVtable
+DBusGTypeSpecializedMapIteratorFunc
+DBusGTypeSpecializedMapAppendFunc
+DBusGTypeSpecializedMapVtable
+DBusGTypeSpecializedStructGetMember
+DBusGTypeSpecializedStructSetMember
+DBusGTypeSpecializedStructVtable
+dbus_g_type_get_collection
+dbus_g_type_get_map
+dbus_g_type_get_structv
+dbus_g_type_get_struct
+dbus_g_type_is_collection
+dbus_g_type_is_map
+dbus_g_type_is_struct
+dbus_g_type_get_collection_specialization
+dbus_g_type_get_map_key_specialization
+dbus_g_type_get_map_value_specialization
+dbus_g_type_get_struct_member_type
+dbus_g_type_get_struct_size
+dbus_g_type_specialized_construct
+dbus_g_type_specialized_init_append
+dbus_g_type_specialized_collection_append
+dbus_g_type_specialized_collection_end_append
+dbus_g_type_specialized_map_append
+dbus_g_type_collection_get_fixed
+dbus_g_type_collection_value_iterate
+dbus_g_type_map_value_iterate
+dbus_g_type_struct_get_member
+dbus_g_type_struct_set_member
+dbus_g_type_struct_get
+dbus_g_type_struct_set
+dbus_g_type_specialized_init
+dbus_g_type_register_collection
+dbus_g_type_register_map
+dbus_g_type_map_peek_vtable
+dbus_g_type_collection_peek_vtable
+dbus_g_type_struct_peek_vtable
+dbus_g_type_register_struct
+dbus_g_value_build_g_variant
+dbus_g_value_parse_g_variant
+DBUS_TYPE_G_BOOLEAN_ARRAY
+DBUS_TYPE_G_UCHAR_ARRAY
+DBUS_TYPE_G_UINT_ARRAY
+DBUS_TYPE_G_INT_ARRAY
+DBUS_TYPE_G_UINT64_ARRAY
+DBUS_TYPE_G_INT64_ARRAY
+DBUS_TYPE_G_OBJECT_ARRAY
+DBUS_TYPE_G_STRING_STRING_HASHTABLE
+DBusGSignature
+DBUS_TYPE_G_SIGNATURE
+DBusGObjectPath
+DBUS_TYPE_G_OBJECT_PATH
+<SUBSECTION Private>
+dbus_g_object_path_get_g_type
+dbus_g_signature_get_g_type
+</SECTION>
diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.100-fix-tests.patch b/dev-libs/dbus-glib/files/dbus-glib-0.100-fix-tests.patch
new file mode 100644
index 0000000..3d4ac1d
--- /dev/null
+++ b/dev-libs/dbus-glib/files/dbus-glib-0.100-fix-tests.patch
@@ -0,0 +1,45 @@
+commit 1a61c71e4037ebea5db7dc2f0fdceae764e47e17
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: Thu Jun 28 12:54:02 2012 +0100
+
+ my_object_unsafe_disable_legacy_property_access: have the right signature
+
+ I'm amazed this ever worked.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=51511
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Colin Walters <walters@verbum.org>
+
+diff --git a/test/core/my-object.c b/test/core/my-object.c
+index 82b6322..e31dca3 100644
+--- a/test/core/my-object.c
++++ b/test/core/my-object.c
+@@ -859,10 +859,12 @@ my_object_async_throw_error (MyObject *obj, DBusGMethodInvocation *context)
+ g_idle_add ((GSourceFunc) do_async_error, data);
+ }
+
+-void
+-my_object_unsafe_disable_legacy_property_access (MyObject *obj)
++gboolean
++my_object_unsafe_disable_legacy_property_access (MyObject *obj,
++ GError **error)
+ {
+ dbus_glib_global_set_disable_legacy_property_access ();
++ return TRUE;
+ }
+
+ extern GMainLoop *loop;
+diff --git a/test/core/my-object.h b/test/core/my-object.h
+index d50d0b4..779efac 100644
+--- a/test/core/my-object.h
++++ b/test/core/my-object.h
+@@ -116,7 +116,8 @@ void my_object_async_increment (MyObject *obj, gint32 x, DBusGMethodInvocation *
+
+ void my_object_async_throw_error (MyObject *obj, DBusGMethodInvocation *context);
+
+-void my_object_unsafe_disable_legacy_property_access (MyObject *obj);
++gboolean my_object_unsafe_disable_legacy_property_access (MyObject *obj,
++ GError **error);
+
+ void my_object_emit_objectified (MyObject *obj, GObject *other);
+
diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.98-glib-2.31.patch b/dev-libs/dbus-glib/files/dbus-glib-0.98-glib-2.31.patch
new file mode 100644
index 0000000..767860a
--- /dev/null
+++ b/dev-libs/dbus-glib/files/dbus-glib-0.98-glib-2.31.patch
@@ -0,0 +1,21 @@
+From 51222609f1af2eda0c223881dda3985435c3ad3f Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Sun, 08 Jan 2012 16:29:33 +0000
+Subject: test-service-glib: Fix build with GLib 2.30
+
+Only <glib.h> can be included directly.
+---
+diff --git a/test/core/test-service-glib.c b/test/core/test-service-glib.c
+index 3355890..0568e40 100644
+--- a/test/core/test-service-glib.c
++++ b/test/core/test-service-glib.c
+@@ -11,7 +11,6 @@
+ #include <string.h>
+ #include <glib/gi18n.h>
+ #include <glib-object.h>
+-#include <glib/gquark.h>
+
+ #include "my-object.h"
+ #include "my-object-subclass.h"
+--
+cgit v0.9.0.2-2-gbebe
