← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~ken-vandine/libindicate/gir-vapigen-hack into lp:libindicate

 

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

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)


Hack to work around the vapigen incompatibility with gir
-- 
https://code.launchpad.net/~ken-vandine/libindicate/gir-vapigen-hack/+merge/26630
Your team ayatana-commits is subscribed to branch lp:libindicate.
=== modified file 'libindicate/Makefile.am'
--- libindicate/Makefile.am	2010-05-21 17:46:44 +0000
+++ libindicate/Makefile.am	2010-06-02 19:21:23 +0000
@@ -153,11 +153,16 @@
 vapi_DATA = Indicate-0.2.vapi
 
 Indicate-0.2.vapi: Indicate-0.2.gir Makefile.am
+	mv Indicate-0.2.gir Indicate-0.2.gir.generated && \
+	sed -e "s|<array name=|<type name=|" \
+		-e "s|</array|</type|" \
+		$< Indicate-0.2.gir.generated > Indicate-0.2.gir &&\
 	$(VALA_API_GEN) --library=Indicate-0.2 \
 		--pkg glib-2.0 \
 		--pkg Dbusmenu-Glib-0.2 \
 		--vapidir=$(top_builddir)/src \
-		$<
+		$< && \
+	mv Indicate-0.2.gir.generated Indicate-0.2.gir 
 
 CLEANFILES += $(vapi_DATA)