pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libdbusmenu-glib: fix Clang build, add Vala dependency.



Module Name:	pkgsrc-wip
Committed By:	youri <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Thu Apr 7 15:25:24 2016 +0200
Changeset:	a510785861baf21ccc9880bee863014331e51d55

Modified Files:
	libdbusmenu-glib/Makefile
Added Files:
	libdbusmenu-glib/patches/patch_libdbusmenu-glib_menuitem.c
	libdbusmenu-glib/patches/patch_libdbusmenu-glib_server.c

Log Message:
libdbusmenu-glib: fix Clang build, add Vala dependency.

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

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

diffstat:
 libdbusmenu-glib/Makefile                          |  1 +
 .../patches/patch_libdbusmenu-glib_menuitem.c      | 24 ++++++++++++++++++++++
 .../patches/patch_libdbusmenu-glib_server.c        | 19 +++++++++++++++++
 3 files changed, 44 insertions(+)

diffs:
diff --git a/libdbusmenu-glib/Makefile b/libdbusmenu-glib/Makefile
index 8ffec7f..b609328 100644
--- a/libdbusmenu-glib/Makefile
+++ b/libdbusmenu-glib/Makefile
@@ -18,4 +18,5 @@ INSTALL_DIRS=	libdbusmenu-glib docs
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.gobject-introspection+=	build
 .include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../lang/vala/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
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..10a63ed
--- /dev/null
+++ b/libdbusmenu-glib/patches/patch_libdbusmenu-glib_menuitem.c
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Fix Clang build.
+
+--- libdbusmenu-12.10.2/libdbusmenu-glib/menuitem.c.orig	2012-10-03 15:54:22.000000000 +0000
++++ libdbusmenu-12.10.2/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..fcbc05c
--- /dev/null
+++ b/libdbusmenu-glib/patches/patch_libdbusmenu-glib_server.c
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Fix Clang build.
+
+--- libdbusmenu-12.10.2/libdbusmenu-glib/server.c.orig	2012-10-03 15:54:22.000000000 +0000
++++ libdbusmenu-12.10.2/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];
+ 


Home | Main Index | Thread Index | Old Index