DBus Menu

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

  1. lp-1294165-ftbfs
  2. Merge into trunk.14.04
Proposed by Charles Kerr
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 471
Merged at revision: 469
Proposed branch: lp:~charlesk/libdbusmenu/lp-1294165-ftbfs
Merge into: lp: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:~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.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 :

PASSED: Continuous integration, rev:471
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-trusty-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-trusty-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/libdbusmenu-trusty-armhf-ci/9/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libdbusmenu-ci/22/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt'
--- docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt 2012-04-03 19:49:21 +0000
+++ docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt 2014-03-18 18:37:31 +0000
@@ -16,7 +16,6 @@
16DBUSMENU_CLIENT_TYPES_SEPARATOR16DBUSMENU_CLIENT_TYPES_SEPARATOR
17DBUSMENU_CLIENT_TYPES_IMAGE17DBUSMENU_CLIENT_TYPES_IMAGE
18DbusmenuClient18DbusmenuClient
19DbusmenuClientClass
20DbusmenuClientTypeHandler19DbusmenuClientTypeHandler
21dbusmenu_client_new20dbusmenu_client_new
22dbusmenu_client_get_icon_paths21dbusmenu_client_get_icon_paths
@@ -26,6 +25,7 @@
26dbusmenu_client_add_type_handler25dbusmenu_client_add_type_handler
27dbusmenu_client_add_type_handler_full26dbusmenu_client_add_type_handler_full
28<SUBSECTION Standard>27<SUBSECTION Standard>
28DbusmenuClientClass
29DBUSMENU_CLIENT29DBUSMENU_CLIENT
30DBUSMENU_IS_CLIENT30DBUSMENU_IS_CLIENT
31DBUSMENU_TYPE_CLIENT31DBUSMENU_TYPE_CLIENT
@@ -147,7 +147,6 @@
147DBUSMENU_SERVER_PROP_TEXT_DIRECTION147DBUSMENU_SERVER_PROP_TEXT_DIRECTION
148DBUSMENU_SERVER_PROP_VERSION148DBUSMENU_SERVER_PROP_VERSION
149DbusmenuServer149DbusmenuServer
150DbusmenuServerClass
151dbusmenu_server_new150dbusmenu_server_new
152dbusmenu_server_get_status151dbusmenu_server_get_status
153dbusmenu_server_get_text_direction152dbusmenu_server_get_text_direction
@@ -155,6 +154,7 @@
155dbusmenu_server_set_status154dbusmenu_server_set_status
156dbusmenu_server_set_text_direction155dbusmenu_server_set_text_direction
157<SUBSECTION Standard>156<SUBSECTION Standard>
157DbusmenuServerClass
158DBUSMENU_SERVER158DBUSMENU_SERVER
159DBUSMENU_IS_SERVER159DBUSMENU_IS_SERVER
160DBUSMENU_TYPE_SERVER160DBUSMENU_TYPE_SERVER
@@ -172,10 +172,10 @@
172<FILE>menuitem-proxy</FILE>172<FILE>menuitem-proxy</FILE>
173<TITLE>DbusmenuMenuitemProxy</TITLE>173<TITLE>DbusmenuMenuitemProxy</TITLE>
174DbusmenuMenuitemProxy174DbusmenuMenuitemProxy
175DbusmenuMenuitemProxyClass
176dbusmenu_menuitem_proxy_new175dbusmenu_menuitem_proxy_new
177dbusmenu_menuitem_proxy_get_wrapped176dbusmenu_menuitem_proxy_get_wrapped
178<SUBSECTION Standard>177<SUBSECTION Standard>
178DbusmenuMenuitemProxyClass
179DBUSMENU_MENUITEM_PROXY179DBUSMENU_MENUITEM_PROXY
180DBUSMENU_IS_MENUITEM_PROXY180DBUSMENU_IS_MENUITEM_PROXY
181DBUSMENU_TYPE_MENUITEM_PROXY181DBUSMENU_TYPE_MENUITEM_PROXY
182182
=== modified file 'libdbusmenu-glib/client.h'
--- libdbusmenu-glib/client.h 2012-04-04 20:04:54 +0000
+++ libdbusmenu-glib/client.h 2014-03-18 18:37:31 +0000
@@ -183,6 +183,7 @@
183*/183*/
184typedef struct _DbusmenuClient DbusmenuClient;184typedef struct _DbusmenuClient DbusmenuClient;
185struct _DbusmenuClient {185struct _DbusmenuClient {
186 /*< private >*/
186 GObject parent;187 GObject parent;
187188
188 /*< Private >*/189 /*< Private >*/
189190
=== modified file 'libdbusmenu-glib/menuitem-proxy.h'
--- libdbusmenu-glib/menuitem-proxy.h 2011-02-21 20:07:39 +0000
+++ libdbusmenu-glib/menuitem-proxy.h 2014-03-18 18:37:31 +0000
@@ -72,6 +72,7 @@
72 Public instance data for a #DbusmenuMenuitemProxy.72 Public instance data for a #DbusmenuMenuitemProxy.
73*/73*/
74struct _DbusmenuMenuitemProxy {74struct _DbusmenuMenuitemProxy {
75 /*< private >*/
75 DbusmenuMenuitem parent;76 DbusmenuMenuitem parent;
7677
77 /*< Private >*/78 /*< Private >*/
7879
=== modified file 'libdbusmenu-glib/server.h'
--- libdbusmenu-glib/server.h 2012-02-10 14:24:45 +0000
+++ libdbusmenu-glib/server.h 2014-03-18 18:37:31 +0000
@@ -151,6 +151,7 @@
151*/151*/
152typedef struct _DbusmenuServer DbusmenuServer;152typedef struct _DbusmenuServer DbusmenuServer;
153struct _DbusmenuServer {153struct _DbusmenuServer {
154 /*< private >*/
154 GObject parent;155 GObject parent;
155156
156 /*< Private >*/157 /*< Private >*/
157158
=== modified file 'libdbusmenu-gtk/client.h'
--- libdbusmenu-gtk/client.h 2011-02-21 20:36:22 +0000
+++ libdbusmenu-gtk/client.h 2014-03-18 18:37:31 +0000
@@ -87,6 +87,7 @@
87 */87 */
88typedef struct _DbusmenuGtkClient DbusmenuGtkClient;88typedef struct _DbusmenuGtkClient DbusmenuGtkClient;
89struct _DbusmenuGtkClient {89struct _DbusmenuGtkClient {
90 /*< private >*/
90 DbusmenuClient parent;91 DbusmenuClient parent;
9192
92 /*< Private >*/93 /*< Private >*/
9394
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am 2013-06-24 20:25:59 +0000
+++ tests/Makefile.am 2014-03-18 18:37:31 +0000
@@ -551,13 +551,13 @@
551test_libdbusmenu_glib_gtkdoc:551test_libdbusmenu_glib_gtkdoc:
552 @echo "#!/bin/bash" > $@552 @echo "#!/bin/bash" > $@
553 @echo cd $(abs_top_builddir)/docs/libdbusmenu-glib/reference >> $@553 @echo cd $(abs_top_builddir)/docs/libdbusmenu-glib/reference >> $@
554 @echo gtester --verbose -k $(GTKDOC_CHECK) >> $@554 @echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@
555 @chmod +x $@555 @chmod +x $@
556556
557test_libdbusmenu_gtk_gtkdoc:557test_libdbusmenu_gtk_gtkdoc:
558 @echo "#!/bin/bash" > $@558 @echo "#!/bin/bash" > $@
559 @echo cd $(abs_top_builddir)/docs/libdbusmenu-gtk/reference >> $@559 @echo cd $(abs_top_builddir)/docs/libdbusmenu-gtk/reference >> $@
560 @echo gtester --verbose -k $(GTKDOC_CHECK) >> $@560 @echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@
561 @chmod +x $@561 @chmod +x $@
562562
563examplesdir = $(docdir)/examples/563examplesdir = $(docdir)/examples/

Subscribers

People subscribed via source and target branches

to all changes: