libdbusmenu-glib: fix clang build

[youri <youri%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	youri <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Thu Apr 7 18:26:43 2016 +0200
Changeset:	f1a29b8813fa243f1ec71001fde0cde62059e845

Modified Files:
	libdbusmenu-glib/buildlink3.mk
Added Files:
	libdbusmenu-glib/distinfo
	libdbusmenu-glib/patches/patch-libdbusmenu-glib_menuitem.c
	libdbusmenu-glib/patches/patch-libdbusmenu-glib_server.c

Log Message:
libdbusmenu-glib: fix clang build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f1a29b8813fa243f1ec71001fde0cde62059e845

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libdbusmenu-glib/buildlink3.mk                     |  2 +-
 libdbusmenu-glib/distinfo                          |  8 ++++++++
 .../patches/patch-libdbusmenu-glib_menuitem.c      | 24 ++++++++++++++++++++++
 .../patches/patch-libdbusmenu-glib_server.c        | 19 +++++++++++++++++
 4 files changed, 52 insertions(+), 1 deletion(-)

diffs:
diff --git a/libdbusmenu-glib/buildlink3.mk b/libdbusmenu-glib/buildlink3.mk
index 68671ff..0ae10cd 100644
--- a/libdbusmenu-glib/buildlink3.mk
+++ b/libdbusmenu-glib/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	libdbusmenu-glib
 .if !defined(LIBDBUSMENU_GLIB_BUILDLINK3_MK)
 LIBDBUSMENU_GLIB_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libdbusmenu-glib+=	libdbusmenu-glib>=12.10.2
+BUILDLINK_API_DEPENDS.libdbusmenu-glib+=libdbusmenu-glib>=12.10.2
 BUILDLINK_PKGSRCDIR.libdbusmenu-glib?=	../../wip/libdbusmenu-glib
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/libdbusmenu-glib/distinfo b/libdbusmenu-glib/distinfo
new file mode 100644
index 0000000..a879a68
--- /dev/null
+++ b/libdbusmenu-glib/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+SHA1 (libdbusmenu-12.10.2.tar.gz) = 067b77564f90633aa58494e54b99d733a21f3142
+RMD160 (libdbusmenu-12.10.2.tar.gz) = bf424925750549d44d6fc2563caf37e73f21db3d
+SHA512 (libdbusmenu-12.10.2.tar.gz) = cf2e50dc3adbf35d0a4ccdd62a3efd9fae2d079b8d06e6522b70f077f89ac2cf72188e380f476e38d184b69549e90b801bf1e32174fa94bbe612dd52aec94496
+Size (libdbusmenu-12.10.2.tar.gz) = 735730 bytes
+SHA1 (patch-libdbusmenu-glib_menuitem.c) = 8ed0cffeb2c5133bb2e287a4ebe1a839f9cb7554
+SHA1 (patch-libdbusmenu-glib_server.c) = 8a59c93a012c925c5ed47c1879b1c47026a6e875
diff --git a/libdbusmenu-glib/patches/patch-libdbusmenu-glib_menuitem.c b/libdbusmenu-glib/patches/patch-libdbusmenu-glib_menuitem.c
new file mode 100644
index 0000000..47bd414
--- /dev/null
+++ b/libdbusmenu-glib/patches/patch-libdbusmenu-glib_menuitem.c
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Fix clang build.
+
+--- libdbusmenu-glib/menuitem.c.orig	2012-10-03 15:54:22.000000000 +0000
++++ libdbusmenu-glib/menuitem.c
+@@ -974,7 +974,7 @@ dbusmenu_menuitem_find_id (DbusmenuMenui
+ 		}
+ 		return mi;
+ 	}
+-	find_id_t find_id = {mi: NULL, id: id};
++	find_id_t find_id = {.mi = NULL, .id = id};
+ 	find_id_helper(mi, &find_id);
+ 	return find_id.mi;
+ }
+@@ -1712,7 +1712,7 @@ dbusmenu_menuitem_foreach (DbusmenuMenui
+ 
+ 	func(mi, data);
+ 	GList * children = dbusmenu_menuitem_get_children(mi);
+-	foreach_struct_t foreach_data = {func: func, data: data};
++	foreach_struct_t foreach_data = {.func = func, .data = data};
+ 	g_list_foreach(children, foreach_helper, &foreach_data);
+ 	return;
+ }
diff --git a/libdbusmenu-glib/patches/patch-libdbusmenu-glib_server.c b/libdbusmenu-glib/patches/patch-libdbusmenu-glib_server.c
new file mode 100644
index 0000000..47a488e
--- /dev/null
+++ b/libdbusmenu-glib/patches/patch-libdbusmenu-glib_server.c
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Fix clang build.
+
+--- libdbusmenu-glib/server.c.orig	2012-10-03 15:54:22.000000000 +0000
++++ libdbusmenu-glib/server.c
+@@ -215,9 +215,9 @@ static gboolean   layout_update_idle    
+ static GDBusNodeInfo *            dbusmenu_node_info = NULL;
+ static GDBusInterfaceInfo *       dbusmenu_interface_info = NULL;
+ static const GDBusInterfaceVTable dbusmenu_interface_table = {
+-	method_call:    bus_method_call,
+-	get_property:   bus_get_prop,
+-	set_property:   NULL /* No properties that can be set */
++	.method_call =    bus_method_call,
++	.get_property =   bus_get_prop,
++	.set_property =   NULL /* No properties that can be set */
+ };
+ static method_table_t             dbusmenu_method_table[METHOD_COUNT];
+