DBus Menu

Merge lp:~charlesk/libdbusmenu/lp-978687 into lp:libdbusmenu/0.6

  1. lp-978687
  2. Merge into trunk.0.6
Proposed by Charles Kerr
Status: Merged
Approved by: Charles Kerr
Approved revision: 414
Merged at revision: 417
Proposed branch: lp:~charlesk/libdbusmenu/lp-978687
Merge into: lp:libdbusmenu/0.6
Diff against target: 39 lines (+7/-7)
2 files modified
libdbusmenu-glib/Makefile.am (+3/-3)
libdbusmenu-gtk/Makefile.am (+4/-4)
To merge this branch: bzr merge lp:~charlesk/libdbusmenu/lp-978687
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+101656@code.launchpad.net

Description of the change

This branch applies Evan Nemerson's patch to make the Vala bindings use pkg-config names, rather than GIR names, so that valac can automatically pick up the relevant libraries and flags.

To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) wrote :

Looks to be the sensible way forward. Once this ships, we will need to change the name of the vapi that is referenced in the makefile.am for i-sound so as the vala dbus hookup continues to work.

review: Approve
Revision history for this message
Ted Gould (ted) wrote :

Makes sense, but we should probably do that early in the 12.10 cycle instead of 12.04 at this point as packages would have to change and adjust to it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am 2012-04-04 02:33:03 +0000
+++ libdbusmenu-glib/Makefile.am 2012-04-11 22:48:22 +0000
@@ -216,10 +216,10 @@
216if HAVE_INTROSPECTION216if HAVE_INTROSPECTION
217217
218vapidir = $(datadir)/vala/vapi218vapidir = $(datadir)/vala/vapi
219vapi_DATA = Dbusmenu-0.4.vapi219vapi_DATA = dbusmenu-glib-0.4.vapi
220220
221Dbusmenu-0.4.vapi: Dbusmenu-0.4.gir221dbusmenu-glib-0.4.vapi: Dbusmenu-0.4.gir
222 $(VALA_API_GEN) --library=Dbusmenu-0.4 $<222 $(VALA_API_GEN) --library=dbusmenu-glib-0.4 $<
223223
224CLEANFILES += $(vapi_DATA)224CLEANFILES += $(vapi_DATA)
225225
226226
=== modified file 'libdbusmenu-gtk/Makefile.am'
--- libdbusmenu-gtk/Makefile.am 2012-03-28 04:40:23 +0000
+++ libdbusmenu-gtk/Makefile.am 2012-04-11 22:48:22 +0000
@@ -160,14 +160,14 @@
160if HAVE_INTROSPECTION160if HAVE_INTROSPECTION
161161
162vapidir = $(datadir)/vala/vapi162vapidir = $(datadir)/vala/vapi
163vapi_DATA = DbusmenuGtk$(VER)-0.4.vapi163vapi_DATA = dbusmenu-gtk$(VER)-0.4.vapi
164164
165DbusmenuGtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am165dbusmenu-gtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
166 $(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.4 \166 $(VALA_API_GEN) --library=dbusmenu-gtk$(VER)-0.4 \
167 --pkg gdk-pixbuf-2.0 \167 --pkg gdk-pixbuf-2.0 \
168 --pkg $(GTKVALA) \168 --pkg $(GTKVALA) \
169 --pkg atk \169 --pkg atk \
170 --pkg Dbusmenu-0.4 \170 --pkg dbusmenu-glib-0.4 \
171 --vapidir=$(top_builddir)/libdbusmenu-glib \171 --vapidir=$(top_builddir)/libdbusmenu-glib \
172 $<172 $<
173173

Subscribers

People subscribed via source and target branches

to all changes: