ayatana-commits team mailing list archive

[Ken VanDine <ken.vandine@xxxxxxxxxxxxx>]

Ken VanDine has proposed merging lp:~ken-vandine/dbusmenu/gir-vapigen-hack into lp:dbusmenu.

Requested reviews:
  DBus Menu Team (dbusmenu-team)


Hack to work around the vapigen incompatibility with gir
-- 
https://code.launchpad.net/~ken-vandine/dbusmenu/gir-vapigen-hack/+merge/26631
Your team ayatana-commits is subscribed to branch lp:dbusmenu.

=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am	2010-05-21 18:37:36 +0000
+++ libdbusmenu-glib/Makefile.am	2010-06-02 19:21:24 +0000
@@ -139,7 +139,12 @@
 vapi_DATA = Dbusmenu-Glib-0.2.vapi
 
 Dbusmenu-Glib-0.2.vapi: Dbusmenu-Glib-0.2.gir
-	$(VALA_API_GEN) --library=Dbusmenu-Glib-0.2 $<
+	mv Dbusmenu-Glib-0.2.gir Dbusmenu-Glib-0.2.gir.generated && \
+	sed -e "s|<array name=|<type name=|" \
+		-e "s|</array|</type|" \
+		$< Dbusmenu-Glib-0.2.gir.generated > Dbusmenu-Glib-0.2.gir && \
+	$(VALA_API_GEN) --library=Dbusmenu-Glib-0.2 $< && \
+        mv Dbusmenu-Glib-0.2.gir.generated Dbusmenu-Glib-0.2.gir
 
 CLEANFILES += $(vapi_DATA)