Merge lp:~pitti/unity/gdk-api into lp:unity

Proposed by Martin Pitt on 2016-10-26
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2016-10-27
Approved revision: 4195
Merged at revision: 4197
Proposed branch: lp:~pitti/unity/gdk-api
Merge into: lp:unity
Diff against target: 25 lines (+2/-2)
2 files modified
CMakeLists.txt (+1/-1)
services/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~pitti/unity/gdk-api
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2016-10-26 Approve on 2016-10-27
Review via email: mp+309404@code.launchpad.net

Commit Message

Disable fatal deprecation warnings to build with zesty's GTK 3.22 without breaking backportability.

Description of the Change

Disable fatal deprecation warnings

Gtk 3.22 deprecated GdkScreen in favor of GdkMonitor. This is quite
intrusive to port and would prevent being able to build unity on Ubuntu
16.04 or 16.10. (This would involve porting 50 places in the code).

Using deprecated symbols is not an error, so disable build failures due to
them.

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

I agree we can make these warnings not to be fatal anymore.

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-09-01 11:22:22 +0000
3+++ CMakeLists.txt 2016-10-26 21:38:41 +0000
4@@ -209,7 +209,7 @@
5 SET (BOOT_LOGGER_FLAG "-DENABLE_LOGGER")
6 endif (BOOT_LOGGER)
7
8-SET (MAINTAINER_CXXFLAGS "-Werror -Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds")
9+SET (MAINTAINER_CXXFLAGS "-Werror -Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wno-error=deprecated-declarations")
10
11 option (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS "Disable errors when local typedefs are unused" ON)
12 if (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
13
14=== modified file 'services/CMakeLists.txt'
15--- services/CMakeLists.txt 2016-08-31 15:57:01 +0000
16+++ services/CMakeLists.txt 2016-10-26 21:38:41 +0000
17@@ -35,7 +35,7 @@
18 set(CFLAGS
19 ${SERVICE_DEPS_CFLAGS}
20 ${SERVICE_DEPS_CFLAGS_OTHER}
21- "-Werror -Wall"
22+ "-Werror -Wall -Wno-error=deprecated-declarations"
23 )
24
25 string (REPLACE ";" " " CFLAGS "${CFLAGS}")