libappindicator

Merge lp:~ted/libappindicator/ppc-fixes into lp:libappindicator/14.04

  1. ppc-fixes
  2. Merge into trunk.14.04
Proposed by Ted Gould
Status: Merged
Approved by: Ted Gould
Approved revision: 271
Merged at revision: 270
Proposed branch: lp:~ted/libappindicator/ppc-fixes
Merge into: lp:libappindicator/14.04
Diff against target: 179 lines (+27/-17)
7 files modified
Makefile.am (+3/-1)
debian/changelog (+8/-0)
debian/control (+5/-5)
debian/rules (+1/-1)
m4/gcov.m4 (+1/-1)
src/Makefile.am (+1/-1)
tests/Makefile.am (+8/-8)
To merge this branch: bzr merge lp:~ted/libappindicator/ppc-fixes
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Charles Kerr (community) Approve
Review via email: mp+199668@code.launchpad.net

Commit message

Fix build failures on trusty

Description of the change

Fix from Doko

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:270
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/18/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-trusty-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-trusty-armhf-ci/1/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) :
review: Approve
lp:~ted/libappindicator/ppc-fixes updated
271. By Ted Gould

Adding gcov 1.10

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:271
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-trusty-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/libappindicator-trusty-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libappindicator-ci/19/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 'Makefile.am'
2--- Makefile.am 2012-03-27 21:54:01 +0000
3+++ Makefile.am 2013-12-19 16:33:45 +0000
4@@ -3,9 +3,11 @@
5 SUBDIRS = \
6 src \
7 bindings \
8- example \
9 docs
10
11+# FIXME: Disabled, vala error
12+# example
13+
14 if WANT_TESTS
15 SUBDIRS += tests
16 endif
17
18=== modified file 'debian/changelog'
19--- debian/changelog 2013-10-17 19:34:39 +0000
20+++ debian/changelog 2013-12-19 16:33:45 +0000
21@@ -1,3 +1,11 @@
22+libappindicator (12.10.1+13.10.20130920-0ubuntu3) trusty; urgency=medium
23+
24+ * Build with -Wno-error=deprecated-declarations.
25+ * Don't build the mono bindings on ppc64el, not available.
26+ * Disable building the example, vala build error.
27+
28+ -- Matthias Klose <doko@ubuntu.com> Thu, 19 Dec 2013 13:50:03 +0100
29+
30 libappindicator (12.10.1+13.10.20130920-0ubuntu2) saucy; urgency=low
31
32 * Don't build the mono bindings on AArch64, not available.
33
34=== modified file 'debian/control'
35--- debian/control 2013-10-14 00:10:28 +0000
36+++ debian/control 2013-12-19 16:33:45 +0000
37@@ -7,22 +7,22 @@
38 dh-autoreconf,
39 python-all-dev,
40 at-spi2-core,
41- cli-common-dev (>= 0.5.7) [!arm64],
42+ cli-common-dev (>= 0.5.7) [!arm64 !ppc64el],
43 gobject-introspection,
44 intltool,
45 gtk-doc-tools,
46 libxml2-utils,
47- libnunit-cil-dev [!arm64],
48+ libnunit-cil-dev [!arm64 !ppc64el],
49 dbus-test-runner,
50 xvfb,
51 valac,
52- mono-devel (>= 2.4.3) [!arm64],
53+ mono-devel (>= 2.4.3) [!arm64 !ppc64el],
54 libglib2.0-dev (>= 2.35.4),
55 libgtk-3-dev (>= 2.91.3),
56 libgtk2.0-dev (>= 2.12.0),
57 python-gtk2-dev,
58- gtk-sharp2-gapi [!arm64],
59- libgtk2.0-cil-dev [!arm64],
60+ gtk-sharp2-gapi [!arm64 !ppc64el],
61+ libgtk2.0-cil-dev [!arm64 !ppc64el],
62 libdbus-glib-1-dev (>= 0.82),
63 libindicator-dev (>= 0.3.90),
64 libindicator3-dev (>= 0.3.90),
65
66=== modified file 'debian/rules'
67--- debian/rules 2013-10-14 00:10:28 +0000
68+++ debian/rules 2013-12-19 16:33:45 +0000
69@@ -7,7 +7,7 @@
70 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
71
72 CONFIGURE_COMMON_FLAGS = --disable-scrollkeeper --enable-introspection
73-ifneq (,$(filter $(DEB_HOST_ARCH),arm64))
74+ifneq (,$(filter $(DEB_HOST_ARCH),arm64 ppc64el))
75 CONFIGURE_COMMON_FLAGS += --disable-mono-test
76 else
77 dh_extra_args = ,cli
78
79=== modified file 'm4/gcov.m4'
80--- m4/gcov.m4 2012-03-27 21:54:01 +0000
81+++ m4/gcov.m4 2013-12-19 16:33:45 +0000
82@@ -30,7 +30,7 @@
83 AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
84 fi
85
86- lcov_version_list="1.6 1.7 1.8 1.9"
87+ lcov_version_list="1.6 1.7 1.8 1.9 1.10"
88 AC_CHECK_PROG(LCOV, lcov, lcov)
89 AC_CHECK_PROG(GENHTML, genhtml, genhtml)
90
91
92=== modified file 'src/Makefile.am'
93--- src/Makefile.am 2012-07-11 19:19:21 +0000
94+++ src/Makefile.am 2013-12-19 16:33:45 +0000
95@@ -76,7 +76,7 @@
96 libappindicator_la_CFLAGS = \
97 $(LIBRARY_CFLAGS) \
98 $(COVERAGE_CFLAGS) \
99- -Wall -Werror \
100+ -Wall -Werror -Wno-error=deprecated-declarations \
101 -DG_LOG_DOMAIN=\"libappindicator\"
102
103 libappindicator_la_LIBADD = \
104
105=== modified file 'tests/Makefile.am'
106--- tests/Makefile.am 2013-02-04 14:51:07 +0000
107+++ tests/Makefile.am 2013-12-19 16:33:45 +0000
108@@ -32,7 +32,7 @@
109 test_libappindicator_CFLAGS = \
110 $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
111 -DSRCDIR="\"$(srcdir)\"" \
112- -Wall -Werror \
113+ -Wall -Werror -Wno-error=deprecated-declarations \
114 -I$(top_srcdir)/src
115
116 test_libappindicator_LDADD = \
117@@ -49,7 +49,7 @@
118
119 test_libappindicator_dbus_client_CFLAGS = \
120 $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
121- -Wall -Werror \
122+ -Wall -Werror -Wno-error=deprecated-declarations \
123 -I$(top_srcdir)/src
124
125 test_libappindicator_dbus_client_LDADD = \
126@@ -66,7 +66,7 @@
127
128 test_libappindicator_dbus_server_CFLAGS = \
129 $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
130- -Wall -Werror \
131+ -Wall -Werror -Wno-error=deprecated-declarations \
132 -I$(top_srcdir)/src
133
134 test_libappindicator_dbus_server_LDADD = \
135@@ -83,7 +83,7 @@
136
137 test_libappindicator_status_client_CFLAGS = \
138 $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
139- -Wall -Werror \
140+ -Wall -Werror -Wno-error=deprecated-declarations \
141 -I$(top_srcdir)/src
142
143 test_libappindicator_status_client_LDADD = \
144@@ -100,7 +100,7 @@
145
146 test_libappindicator_status_server_CFLAGS = \
147 $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
148- -Wall -Werror \
149+ -Wall -Werror -Wno-error=deprecated-declarations \
150 -I$(top_srcdir)/src
151
152 test_libappindicator_status_server_LDADD = \
153@@ -116,7 +116,7 @@
154
155 test_libappindicator_fallback_watcher_CFLAGS = \
156 $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
157- -Wall -Werror \
158+ -Wall -Werror -Wno-error=deprecated-declarations \
159 -I$(top_srcdir)/src
160
161 test_libappindicator_fallback_watcher_LDADD = \
162@@ -128,7 +128,7 @@
163
164 test_libappindicator_fallback_item_CFLAGS = \
165 $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
166- -Wall -Werror \
167+ -Wall -Werror -Wno-error=deprecated-declarations \
168 -I$(top_srcdir)/src
169
170 test_libappindicator_fallback_item_LDADD = \
171@@ -198,7 +198,7 @@
172
173 test_simple_app_CFLAGS = \
174 $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \
175- -Wall -Werror \
176+ -Wall -Werror -Wno-error=deprecated-declarations \
177 -I$(top_srcdir)/src
178
179 test_simple_app_LDADD = \

Subscribers

People subscribed via source and target branches