Merge lp:~ted/ido/lp1382020-ftbfs into lp:ido/15.04

Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 188
Merged at revision: 185
Proposed branch: lp:~ted/ido/lp1382020-ftbfs
Merge into: lp:ido/15.04
Diff against target: 90 lines (+13/-10)
5 files modified
m4/gcov.m4 (+1/-1)
src/Makefile.am (+4/-3)
src/idomessagedialog.c (+2/-2)
src/idoprogressmenuitem.c (+1/-1)
tests/Makefile.am (+5/-3)
To merge this branch: bzr merge lp:~ted/ido/lp1382020-ftbfs
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+240463@code.launchpad.net

Commit message

Update tags for newer GObject Introsepction Scanner and disable xorg-gtest tests

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~ted/ido/lp1382020-ftbfs updated
188. By Ted Gould on 2014-11-03

Filter out symbols in the library

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'm4/gcov.m4'
--- m4/gcov.m4 2013-12-18 22:41:21 +0000
+++ m4/gcov.m4 2014-11-03 16:42:54 +0000
@@ -30,7 +30,7 @@
30 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])30 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
31 fi31 fi
3232
33 lcov_version_list="1.6 1.7 1.8 1.9 1.10"33 lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11"
34 AC_CHECK_PROG(LCOV, lcov, lcov)34 AC_CHECK_PROG(LCOV, lcov, lcov)
35 AC_CHECK_PROG(GENHTML, genhtml, genhtml)35 AC_CHECK_PROG(GENHTML, genhtml, genhtml)
3636
3737
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2014-03-26 16:07:21 +0000
+++ src/Makefile.am 2014-11-03 16:42:54 +0000
@@ -113,11 +113,12 @@
113libido_0_1_la_LIBADD = $(GTK_LIBS) $(LIBM)113libido_0_1_la_LIBADD = $(GTK_LIBS) $(LIBM)
114libido_0_1_la_LDFLAGS = \114libido_0_1_la_LDFLAGS = \
115 $(GTK_LT_LDFLAGS) \115 $(GTK_LT_LDFLAGS) \
116 $(COVERAGE_LDFLAGS)116 $(COVERAGE_LDFLAGS) \
117 -no-undefined \
118 -export-symbols-regex "^[^_].*"
117libido3_0_1_la_LIBADD = $(libido_0_1_la_LIBADD)119libido3_0_1_la_LIBADD = $(libido_0_1_la_LIBADD)
118libido3_0_1_la_LDFLAGS = \120libido3_0_1_la_LDFLAGS = \
119 $(libido_0_1_la_LDFLAGS) \121 $(libido_0_1_la_LDFLAGS)
120 $(COVERAGE_LDFLAGS)
121122
122DISTCLEANFILES = \123DISTCLEANFILES = \
123 stamp-idotypebuiltins.h \124 stamp-idotypebuiltins.h \
124125
=== modified file 'src/idomessagedialog.c'
--- src/idomessagedialog.c 2012-12-13 20:58:39 +0000
+++ src/idomessagedialog.c 2014-11-03 16:42:54 +0000
@@ -248,7 +248,7 @@
248 * @type: type of message248 * @type: type of message
249 * @buttons: a set of buttons to use249 * @buttons: a set of buttons to use
250 * @message_format: printf()-style format string, or %NULL250 * @message_format: printf()-style format string, or %NULL
251 * @Varargs: arguments for @message_format251 * @...: arguments for @message_format
252 *252 *
253 * Creates a new message dialog, which is based upon253 * Creates a new message dialog, which is based upon
254 * GtkMessageDialog so it shares API and functionality254 * GtkMessageDialog so it shares API and functionality
@@ -312,7 +312,7 @@
312 * @type: type of message312 * @type: type of message
313 * @buttons: a set of buttons to use313 * @buttons: a set of buttons to use
314 * @message_format: printf()-style format string, or %NULL314 * @message_format: printf()-style format string, or %NULL
315 * @Varargs: arguments for @message_format. They will be escaped to allow valid XML.315 * @...: arguments for @message_format. They will be escaped to allow valid XML.
316 *316 *
317 * Creates a new message dialog, which is based upon317 * Creates a new message dialog, which is based upon
318 * GtkMessageDialog so it shares API and functionality318 * GtkMessageDialog so it shares API and functionality
319319
=== modified file 'src/idoprogressmenuitem.c'
--- src/idoprogressmenuitem.c 2014-03-26 16:07:21 +0000
+++ src/idoprogressmenuitem.c 2014-11-03 16:42:54 +0000
@@ -1,4 +1,4 @@
1/**1/*
2 * Copyright 2013 Canonical Ltd.2 * Copyright 2013 Canonical Ltd.
3 *3 *
4 * Authors:4 * Authors:
55
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am 2013-06-23 22:43:19 +0000
+++ tests/Makefile.am 2014-11-03 16:42:54 +0000
@@ -1,7 +1,8 @@
1VER=31VER=3
2IDOLIB = $(top_builddir)/src/libido3-0.1.la2IDOLIB = $(top_builddir)/src/libido3-0.1.la
33
4check_LIBRARIES = libgtest.a4# xorg-gtest isn't buildable https://bugs.launchpad.net/ubuntu/+source/xorg-gtest/+bug/1388892
5# check_LIBRARIES = libgtest.a
5check_PROGRAMS = 6check_PROGRAMS =
6TESTS =7TESTS =
78
@@ -28,8 +29,9 @@
28# Menuitem tests29# Menuitem tests
29#############################30#############################
3031
31TESTS += gtest-menuitems32# xorg-gtest isn't buildable https://bugs.launchpad.net/ubuntu/+source/xorg-gtest/+bug/1388892
32check_PROGRAMS += gtest-menuitems33# TESTS += gtest-menuitems
34# check_PROGRAMS += gtest-menuitems
3335
34gtest_menuitems_SOURCES = \36gtest_menuitems_SOURCES = \
35 gtest-menuitems.cpp37 gtest-menuitems.cpp

Subscribers

People subscribed via source and target branches