Merge lp://staging/~charlesk/libdbusmenu/lp-1294165-ftbfs into lp://staging/libdbusmenu/14.04

Proposed by Charles Kerr
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 471
Merged at revision: 469
Proposed branch: lp://staging/~charlesk/libdbusmenu/lp-1294165-ftbfs
Merge into: lp://staging/libdbusmenu/14.04
Diff against target: 115 lines (+9/-5)
6 files modified
docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt (+3/-3)
libdbusmenu-glib/client.h (+1/-0)
libdbusmenu-glib/menuitem-proxy.h (+1/-0)
libdbusmenu-glib/server.h (+1/-0)
libdbusmenu-gtk/client.h (+1/-0)
tests/Makefile.am (+2/-2)
To merge this branch: bzr merge lp://staging/~charlesk/libdbusmenu/lp-1294165-ftbfs
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Mathieu Trudel-Lapierre Approve
Review via email: mp+211603@code.staging.launchpad.net

Commit message

Fix FTBFS caused by failing gtk-doc coverage test

 * when generating the script that runs gtester, use ${GTKDOC_CHECK_PATH} instead of ${GTKDOC_CHECK} to work with upstream changes https://bugzilla.gnome.org/show_bug.cgi?id=701638

 * add gtk-doc markup to subclass structs' parent fields so that gtk-doc won't mark them as undocumented.

Description of the change

Fix FTBFS caused by failing gtk-doc coverage test

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: