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
1=== modified file 'docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt'
2--- docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt 2012-04-03 19:49:21 +0000
3+++ docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt 2014-03-18 18:37:31 +0000
4@@ -16,7 +16,6 @@
5 DBUSMENU_CLIENT_TYPES_SEPARATOR
6 DBUSMENU_CLIENT_TYPES_IMAGE
7 DbusmenuClient
8-DbusmenuClientClass
9 DbusmenuClientTypeHandler
10 dbusmenu_client_new
11 dbusmenu_client_get_icon_paths
12@@ -26,6 +25,7 @@
13 dbusmenu_client_add_type_handler
14 dbusmenu_client_add_type_handler_full
15 <SUBSECTION Standard>
16+DbusmenuClientClass
17 DBUSMENU_CLIENT
18 DBUSMENU_IS_CLIENT
19 DBUSMENU_TYPE_CLIENT
20@@ -147,7 +147,6 @@
21 DBUSMENU_SERVER_PROP_TEXT_DIRECTION
22 DBUSMENU_SERVER_PROP_VERSION
23 DbusmenuServer
24-DbusmenuServerClass
25 dbusmenu_server_new
26 dbusmenu_server_get_status
27 dbusmenu_server_get_text_direction
28@@ -155,6 +154,7 @@
29 dbusmenu_server_set_status
30 dbusmenu_server_set_text_direction
31 <SUBSECTION Standard>
32+DbusmenuServerClass
33 DBUSMENU_SERVER
34 DBUSMENU_IS_SERVER
35 DBUSMENU_TYPE_SERVER
36@@ -172,10 +172,10 @@
37 <FILE>menuitem-proxy</FILE>
38 <TITLE>DbusmenuMenuitemProxy</TITLE>
39 DbusmenuMenuitemProxy
40-DbusmenuMenuitemProxyClass
41 dbusmenu_menuitem_proxy_new
42 dbusmenu_menuitem_proxy_get_wrapped
43 <SUBSECTION Standard>
44+DbusmenuMenuitemProxyClass
45 DBUSMENU_MENUITEM_PROXY
46 DBUSMENU_IS_MENUITEM_PROXY
47 DBUSMENU_TYPE_MENUITEM_PROXY
48
49=== modified file 'libdbusmenu-glib/client.h'
50--- libdbusmenu-glib/client.h 2012-04-04 20:04:54 +0000
51+++ libdbusmenu-glib/client.h 2014-03-18 18:37:31 +0000
52@@ -183,6 +183,7 @@
53 */
54 typedef struct _DbusmenuClient DbusmenuClient;
55 struct _DbusmenuClient {
56+ /*< private >*/
57 GObject parent;
58
59 /*< Private >*/
60
61=== modified file 'libdbusmenu-glib/menuitem-proxy.h'
62--- libdbusmenu-glib/menuitem-proxy.h 2011-02-21 20:07:39 +0000
63+++ libdbusmenu-glib/menuitem-proxy.h 2014-03-18 18:37:31 +0000
64@@ -72,6 +72,7 @@
65 Public instance data for a #DbusmenuMenuitemProxy.
66 */
67 struct _DbusmenuMenuitemProxy {
68+ /*< private >*/
69 DbusmenuMenuitem parent;
70
71 /*< Private >*/
72
73=== modified file 'libdbusmenu-glib/server.h'
74--- libdbusmenu-glib/server.h 2012-02-10 14:24:45 +0000
75+++ libdbusmenu-glib/server.h 2014-03-18 18:37:31 +0000
76@@ -151,6 +151,7 @@
77 */
78 typedef struct _DbusmenuServer DbusmenuServer;
79 struct _DbusmenuServer {
80+ /*< private >*/
81 GObject parent;
82
83 /*< Private >*/
84
85=== modified file 'libdbusmenu-gtk/client.h'
86--- libdbusmenu-gtk/client.h 2011-02-21 20:36:22 +0000
87+++ libdbusmenu-gtk/client.h 2014-03-18 18:37:31 +0000
88@@ -87,6 +87,7 @@
89 */
90 typedef struct _DbusmenuGtkClient DbusmenuGtkClient;
91 struct _DbusmenuGtkClient {
92+ /*< private >*/
93 DbusmenuClient parent;
94
95 /*< Private >*/
96
97=== modified file 'tests/Makefile.am'
98--- tests/Makefile.am 2013-06-24 20:25:59 +0000
99+++ tests/Makefile.am 2014-03-18 18:37:31 +0000
100@@ -551,13 +551,13 @@
101 test_libdbusmenu_glib_gtkdoc:
102 @echo "#!/bin/bash" > $@
103 @echo cd $(abs_top_builddir)/docs/libdbusmenu-glib/reference >> $@
104- @echo gtester --verbose -k $(GTKDOC_CHECK) >> $@
105+ @echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@
106 @chmod +x $@
107
108 test_libdbusmenu_gtk_gtkdoc:
109 @echo "#!/bin/bash" > $@
110 @echo cd $(abs_top_builddir)/docs/libdbusmenu-gtk/reference >> $@
111- @echo gtester --verbose -k $(GTKDOC_CHECK) >> $@
112+ @echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@
113 @chmod +x $@
114
115 examplesdir = $(docdir)/examples/

Subscribers

People subscribed via source and target branches

to all changes: