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
1=== modified file 'm4/gcov.m4'
2--- m4/gcov.m4 2013-12-18 22:41:21 +0000
3+++ m4/gcov.m4 2014-11-03 16:42:54 +0000
4@@ -30,7 +30,7 @@
5 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
6 fi
7
8- lcov_version_list="1.6 1.7 1.8 1.9 1.10"
9+ lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11"
10 AC_CHECK_PROG(LCOV, lcov, lcov)
11 AC_CHECK_PROG(GENHTML, genhtml, genhtml)
12
13
14=== modified file 'src/Makefile.am'
15--- src/Makefile.am 2014-03-26 16:07:21 +0000
16+++ src/Makefile.am 2014-11-03 16:42:54 +0000
17@@ -113,11 +113,12 @@
18 libido_0_1_la_LIBADD = $(GTK_LIBS) $(LIBM)
19 libido_0_1_la_LDFLAGS = \
20 $(GTK_LT_LDFLAGS) \
21- $(COVERAGE_LDFLAGS)
22+ $(COVERAGE_LDFLAGS) \
23+ -no-undefined \
24+ -export-symbols-regex "^[^_].*"
25 libido3_0_1_la_LIBADD = $(libido_0_1_la_LIBADD)
26 libido3_0_1_la_LDFLAGS = \
27- $(libido_0_1_la_LDFLAGS) \
28- $(COVERAGE_LDFLAGS)
29+ $(libido_0_1_la_LDFLAGS)
30
31 DISTCLEANFILES = \
32 stamp-idotypebuiltins.h \
33
34=== modified file 'src/idomessagedialog.c'
35--- src/idomessagedialog.c 2012-12-13 20:58:39 +0000
36+++ src/idomessagedialog.c 2014-11-03 16:42:54 +0000
37@@ -248,7 +248,7 @@
38 * @type: type of message
39 * @buttons: a set of buttons to use
40 * @message_format: printf()-style format string, or %NULL
41- * @Varargs: arguments for @message_format
42+ * @...: arguments for @message_format
43 *
44 * Creates a new message dialog, which is based upon
45 * GtkMessageDialog so it shares API and functionality
46@@ -312,7 +312,7 @@
47 * @type: type of message
48 * @buttons: a set of buttons to use
49 * @message_format: printf()-style format string, or %NULL
50- * @Varargs: arguments for @message_format. They will be escaped to allow valid XML.
51+ * @...: arguments for @message_format. They will be escaped to allow valid XML.
52 *
53 * Creates a new message dialog, which is based upon
54 * GtkMessageDialog so it shares API and functionality
55
56=== modified file 'src/idoprogressmenuitem.c'
57--- src/idoprogressmenuitem.c 2014-03-26 16:07:21 +0000
58+++ src/idoprogressmenuitem.c 2014-11-03 16:42:54 +0000
59@@ -1,4 +1,4 @@
60-/**
61+/*
62 * Copyright 2013 Canonical Ltd.
63 *
64 * Authors:
65
66=== modified file 'tests/Makefile.am'
67--- tests/Makefile.am 2013-06-23 22:43:19 +0000
68+++ tests/Makefile.am 2014-11-03 16:42:54 +0000
69@@ -1,7 +1,8 @@
70 VER=3
71 IDOLIB = $(top_builddir)/src/libido3-0.1.la
72
73-check_LIBRARIES = libgtest.a
74+# xorg-gtest isn't buildable https://bugs.launchpad.net/ubuntu/+source/xorg-gtest/+bug/1388892
75+# check_LIBRARIES = libgtest.a
76 check_PROGRAMS =
77 TESTS =
78
79@@ -28,8 +29,9 @@
80 # Menuitem tests
81 #############################
82
83-TESTS += gtest-menuitems
84-check_PROGRAMS += gtest-menuitems
85+# xorg-gtest isn't buildable https://bugs.launchpad.net/ubuntu/+source/xorg-gtest/+bug/1388892
86+# TESTS += gtest-menuitems
87+# check_PROGRAMS += gtest-menuitems
88
89 gtest_menuitems_SOURCES = \
90 gtest-menuitems.cpp

Subscribers

People subscribed via source and target branches