Application Indicators

Merge lp:~seb128/indicator-application/dont-werror-on-deprecations into lp:indicator-application/14.04

  1. dont-werror-on-deprecations
  2. Merge into trunk.14.04
Proposed by Sebastien Bacher on 2014-01-16
Status: Merged
Approved by: Lars Karlitski on 2014-01-17
Approved revision: 245
Merged at revision: 244
Proposed branch: lp:~seb128/indicator-application/dont-werror-on-deprecations
Merge into: lp:indicator-application/14.04
Diff against target: 34 lines (+3/-3)
2 files modified
m4/gcov.m4 (+1/-1)
src/Makefile.am (+2/-2)
To merge this branch: bzr merge lp:~seb128/indicator-application/dont-werror-on-deprecations
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2014-01-17
Lars Karlitski (community) 2014-01-16 Approve on 2014-01-17
Review via email: mp+201988@code.launchpad.net

Commit Message

don't error out on deprecated declarations

Description of the Change

don't error out on deprecated declarations

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

Note that the current version fails to build with GTK 3.10, we might as well want to clean the deprecations (or not if we consider the component deprecated in unity8)

"indicator-application.c:477:2: error: 'gtk_widget_get_style' is deprecated (declared at /usr/include/gtk-3.0/gtk/deprecated/gtkstyle.h:672): Use 'gtk_widget_get_style_context' instead [-Werror=deprecated-declarations]
  GtkStyle * style = gtk_widget_get_style(GTK_WIDGET(app->entry.label));
  ^
cc1: all warnings being treated as errors"

In any case the -Wno-error=deprecated-declarations makes sense since we agreed to not stop build on those

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Lars Karlitski (larsu) wrote :

Thanks Seb!

review: Approve
lp:~seb128/indicator-application/dont-werror-on-deprecations updated on 2014-01-17
245. By Sebastien Bacher on 2014-01-17

include new lcov version

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

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 2012-03-27 21:08:10 +0000
3+++ m4/gcov.m4 2014-01-17 10:59:49 +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"
9+ lcov_version_list="1.6 1.7 1.8 1.9 1.10"
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 2012-12-18 19:08:50 +0000
16+++ src/Makefile.am 2014-01-17 10:59:49 +0000
17@@ -21,7 +21,7 @@
18 -Wl,-Bsymbolic-functions \
19 -Wl,-z,defs \
20 -Wl,--as-needed \
21- -Werror \
22+ -Werror -Wno-error=deprecated-declarations \
23 -DG_LOG_DOMAIN=\"Indicator-Application\"
24 libapplication_la_LIBADD = $(INDICATOR_LIBS)
25 libapplication_la_LDFLAGS = $(COVERAGE_LDFLAGS) \
26@@ -55,7 +55,7 @@
27 $(APPINDICATOR_CFLAGS) \
28 $(COVERAGE_CFLAGS) \
29 -DDATADIR="\"$(pkgdatadir)\"" \
30- -Wall -Werror \
31+ -Wall -Werror -Wno-error=deprecated-declarations \
32 -DG_LOG_DOMAIN=\"indicator-application-service\"
33
34 indicator_application_service_LDADD = \

Subscribers

People subscribed via source and target branches