1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2017-10-19 16:26:00 +0000
3
+++ CMakeLists.txt	2017-10-20 15:08:07 +0000
4
@@ -300,7 +300,9 @@
5
300
300
6
301
add_subdirectory(benchmarks/)
301
add_subdirectory(benchmarks/)
7
302
add_subdirectory(examples/)
302
add_subdirectory(examples/)
9
303
add_subdirectory(playground/)
303
if (MIR_EGL_SUPPORTED)
10
304
  add_subdirectory(playground/)
11
305
endif()
12
304
add_subdirectory(guides/)
306
add_subdirectory(guides/)
13
305
add_subdirectory(cmake/)
307
add_subdirectory(cmake/)
14
306
308
15
307
309
16
=== modified file 'examples/miral-shell/CMakeLists.txt'
17
--- examples/miral-shell/CMakeLists.txt	2017-08-31 17:28:38 +0000
18
+++ examples/miral-shell/CMakeLists.txt	2017-10-20 15:08:07 +0000
19
@@ -53,6 +53,16 @@
20
53
    titlebar_config.cpp         titlebar_config.h
53
    titlebar_config.cpp         titlebar_config.h
21
54
)
54
)
22
55
55
23
56
find_file(MIRAL_DEFAULT_FONT_FILE
24
57
    NAMES Ubuntu-B.ttf FreeSansBold.ttf
25
58
    DOC "Font to be used in titlebars by miral-shell"
26
59
    PATHS /usr/share/fonts/truetype/ubuntu-font-family # Ubuntu Ubuntu-B.ttf
27
60
          /usr/share/fonts/truetype/freefont           # Debian FreeSansBold.ttf
28
61
          /usr/share/fonts/gnu-free)                   # Fedora FreeSansBold.ttf
29
62
30
63
set_source_files_properties(titlebar_config.cpp PROPERTIES
31
64
    COMPILE_DEFINITIONS MIRAL_DEFAULT_FONT_FILE="${MIRAL_DEFAULT_FONT_FILE}")
32
65
33
56
pkg_check_modules(FREETYPE freetype2 REQUIRED)
66
pkg_check_modules(FREETYPE freetype2 REQUIRED)
34
57
target_include_directories(miral-shell-lib PRIVATE ${FREETYPE_INCLUDE_DIRS})
67
target_include_directories(miral-shell-lib PRIVATE ${FREETYPE_INCLUDE_DIRS})
35
58
target_compile_definitions(miral-shell-lib PRIVATE -DTYPO_SUPPORTS_FREETYPE)
68
target_compile_definitions(miral-shell-lib PRIVATE -DTYPO_SUPPORTS_FREETYPE)
36
59
69
37
=== modified file 'examples/miral-shell/titlebar_config.cpp'
38
--- examples/miral-shell/titlebar_config.cpp	2017-08-21 15:58:34 +0000
39
+++ examples/miral-shell/titlebar_config.cpp	2017-10-20 15:08:07 +0000
40
@@ -22,7 +22,7 @@
41
22
namespace
22
namespace
42
23
{
23
{
43
24
std::mutex mutex;
24
std::mutex mutex;
45
25
std::string font_file{"/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf"};
25
std::string font_file{MIRAL_DEFAULT_FONT_FILE};
46
26
}
26
}
47
27
27
48
28
void titlebar::font_file(std::string const& font_file)
28
void titlebar::font_file(std::string const& font_file)
49
29
29
50
=== modified file 'include/server/mir/shell/persistent_surface_store.h'
51
--- include/server/mir/shell/persistent_surface_store.h	2017-07-28 17:00:43 +0000
52
+++ include/server/mir/shell/persistent_surface_store.h	2017-10-20 15:08:07 +0000
53
@@ -22,7 +22,7 @@
54
22
#include <memory>
22
#include <memory>
55
23
#include <vector>
23
#include <vector>
56
24
#include <array>
24
#include <array>
58
25
#include <uuid/uuid.h>
25
#include <uuid.h>
59
26
26
60
27
27
61
28
namespace mir
28
namespace mir
62
29
29
63
=== modified file 'src/CMakeLists.txt'
64
--- src/CMakeLists.txt	2017-09-08 13:26:03 +0000
65
+++ src/CMakeLists.txt	2017-10-20 15:08:07 +0000
66
@@ -18,7 +18,6 @@
67
18
# Add the core and platform implementations before exposing any private APIs
18
# Add the core and platform implementations before exposing any private APIs
68
19
add_subdirectory(core)
19
add_subdirectory(core)
69
20
add_subdirectory(platforms/)
20
add_subdirectory(platforms/)
70
21
add_subdirectory(miral/)
71
22
21
72
23
# the src/include/... directories should be private to the implementation
22
# the src/include/... directories should be private to the implementation
73
24
include_directories(${PROJECT_SOURCE_DIR}/src/include/common)
23
include_directories(${PROJECT_SOURCE_DIR}/src/include/common)
74
@@ -31,6 +30,7 @@
75
31
30
76
32
add_subdirectory(platform/)
31
add_subdirectory(platform/)
77
33
add_subdirectory(server/)
32
add_subdirectory(server/)
78
33
add_subdirectory(miral/)
79
34
add_subdirectory(client/)
34
add_subdirectory(client/)
80
35
add_subdirectory(utils/)
35
add_subdirectory(utils/)
81
36
add_subdirectory(renderer/)
36
add_subdirectory(renderer/)
82
@@ -54,6 +54,7 @@
83
54
set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)
54
set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)
84
55
set(MIR_CLIENT_PLATFORM_PATH ${MIR_CLIENT_PLATFORM_PATH} PARENT_SCOPE)
55
set(MIR_CLIENT_PLATFORM_PATH ${MIR_CLIENT_PLATFORM_PATH} PARENT_SCOPE)
85
56
set(MIR_SERVER_PLATFORM_PATH ${MIR_SERVER_PLATFORM_PATH} PARENT_SCOPE)
56
set(MIR_SERVER_PLATFORM_PATH ${MIR_SERVER_PLATFORM_PATH} PARENT_SCOPE)
86
57
set(MIRSERVER_INCLUDE_DIRS ${MIRSERVER_INCLUDE_DIRS} PARENT_SCOPE)
87
57
58
88
58
# We need the ABI versions in the tests
59
# We need the ABI versions in the tests
89
59
set(MIR_SERVER_GRAPHICS_PLATFORM_ABI ${MIR_SERVER_GRAPHICS_PLATFORM_ABI} PARENT_SCOPE)
60
set(MIR_SERVER_GRAPHICS_PLATFORM_ABI ${MIR_SERVER_GRAPHICS_PLATFORM_ABI} PARENT_SCOPE)
90
60
61
91
=== modified file 'src/capnproto/CMakeLists.txt'
92
--- src/capnproto/CMakeLists.txt	2017-07-28 17:00:43 +0000
93
+++ src/capnproto/CMakeLists.txt	2017-10-20 15:08:07 +0000
94
@@ -20,7 +20,12 @@
95
20
capnp_generate_cpp(CAPNPROTO_INPUT_CONFIG_SRC CAPNPROTO_INPUT_CONFIG_HDRS mir_input_config.capnp)
20
capnp_generate_cpp(CAPNPROTO_INPUT_CONFIG_SRC CAPNPROTO_INPUT_CONFIG_HDRS mir_input_config.capnp)
96
21
21
97
22
add_library(mircapnproto STATIC ${CAPNPROTO_EVENT_SRC} ${CAPNPROTO_INPUT_CONFIG_SRC})
22
add_library(mircapnproto STATIC ${CAPNPROTO_EVENT_SRC} ${CAPNPROTO_INPUT_CONFIG_SRC})
99
23
target_link_libraries(mircapnproto ${CAPNP_LIBRARIES_LITE})
23
100
24
if (DEFINED CAPNP_LIBRARIES_LITE)
101
25
  target_link_libraries(mircapnproto ${CAPNP_LIBRARIES_LITE})
102
26
else()
103
27
  target_link_libraries(mircapnproto $<TARGET_FILE:CapnProto::capnp> $<TARGET_FILE:CapnProto::kj>)
104
28
endif()
105
24
29
106
25
list(APPEND MIR_GENERATED_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})
30
list(APPEND MIR_GENERATED_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})
107
26
31
108
27
32
109
=== modified file 'src/miral/CMakeLists.txt'
110
--- src/miral/CMakeLists.txt	2017-10-17 10:48:56 +0000
111
+++ src/miral/CMakeLists.txt	2017-10-20 15:08:07 +0000
112
@@ -96,16 +96,17 @@
113
96
96
114
97
# clang generates slightly different symbols (but we don't care)
97
# clang generates slightly different symbols (but we don't care)
115
98
if (CMAKE_COMPILER_IS_GNUCXX)
98
if (CMAKE_COMPILER_IS_GNUCXX)
126
99
    execute_process(COMMAND which dpkg-gensymbols RESULT_VARIABLE MIR_HAS_DPKG_GENSYMBOLS)
99
    # Using dpkg-gensymbols only makes sense on Debian based distros
127
100
100
    if (EXISTS /etc/debian_version)
128
101
    if (MIR_HAS_DPKG_GENSYMBOLS EQUAL 0)
101
        find_program(MIR_DPKG_GENSYMBOLS dpkg-gensymbols)
129
102
        add_custom_target(check-miral-symbols ALL
102
        if (MIR_DPKG_GENSYMBOLS)
130
103
            DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols
103
            add_custom_target(check-miral-symbols ALL
131
104
            COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
104
                DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols
132
105
            COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -v${MIRAL_VERSION} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
105
                COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
133
106
            WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
106
                COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -v${MIRAL_VERSION} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
134
107
            VERBATIM
107
                WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
135
108
    )
108
                VERBATIM)
136
109
        endif()
137
109
    endif()
110
    endif()
138
110
endif()
111
endif()
139
111
112
140
112
113
141
=== modified file 'src/protobuf/symbols.map'
142
--- src/protobuf/symbols.map	2017-05-25 08:58:03 +0000
143
+++ src/protobuf/symbols.map	2017-10-20 15:08:07 +0000
144
@@ -1158,3 +1158,27 @@
145
1158
    vtable?for?mir::protobuf::RequestWithAuthority;
1158
    vtable?for?mir::protobuf::RequestWithAuthority;
146
1159
  };
1159
  };
147
1160
} MIR_PROTOBUF_0.26;
1160
} MIR_PROTOBUF_0.26;
148
1161
149
1162
# When building with the Fedora 26 toolchain these are needed
150
1163
MIR_PROTOBUF_FEDORA {
151
1164
 global:
152
1165
  extern "C++" {
153
1166
    mir::protobuf::_Buffer_default_instance_;
154
1167
    mir::protobuf::_BufferRequest_default_instance_;
155
1168
    mir::protobuf::_BufferStream_default_instance_;
156
1169
    mir::protobuf::_BufferStreamId_default_instance_;
157
1170
    mir::protobuf::_Cookie_default_instance_;
158
1171
    mir::protobuf::_DisplayConfiguration_default_instance_;
159
1172
    mir::protobuf::_LifecycleEvent_default_instance_;
160
1173
    mir::protobuf::_ModuleProperties_default_instance_;
161
1174
    mir::protobuf::_PersistentSurfaceId_default_instance_;
162
1175
    mir::protobuf::_PingEvent_default_instance_;
163
1176
    mir::protobuf::_Platform_default_instance_;
164
1177
    mir::protobuf::_ScreencastId_default_instance_;
165
1178
    mir::protobuf::_StructuredError_default_instance_;
166
1179
    mir::protobuf::_SurfaceAspectRatio_default_instance_;
167
1180
    mir::protobuf::_SurfaceId_default_instance_;
168
1181
    mir::protobuf::_SurfaceSpecification_default_instance_;
169
1182
    mir::protobuf::_Rectangle_default_instance_;
170
1183
  };
171
1184
} MIR_PROTOBUF_0.27;
172
1161
1185
173
=== modified file 'src/server/CMakeLists.txt'
174
--- src/server/CMakeLists.txt	2017-09-25 22:34:08 +0000
175
+++ src/server/CMakeLists.txt	2017-10-20 15:08:07 +0000
176
@@ -125,6 +125,13 @@
177
125
  atomic
125
  atomic
178
126
)
126
)
179
127
127
180
128
target_include_directories(mirshell
181
129
  PUBLIC
182
130
    ${UUID_INCLUDE_DIRS}
183
131
)
184
132
185
133
set(MIRSERVER_INCLUDE_DIRS ${UUID_INCLUDE_DIRS} PARENT_SCOPE)
186
134
187
128
install(TARGETS mirserver
135
install(TARGETS mirserver
188
129
  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
136
  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
189
130
)
137
)
190
131
138
191
=== modified file 'src/server/shell/default_persistent_surface_store.cpp'
192
--- src/server/shell/default_persistent_surface_store.cpp	2017-08-14 02:48:54 +0000
193
+++ src/server/shell/default_persistent_surface_store.cpp	2017-10-20 15:08:07 +0000
194
@@ -17,7 +17,7 @@
195
17
 */
17
 */
196
18
18
197
19
#include "default_persistent_surface_store.h"
19
#include "default_persistent_surface_store.h"
199
20
#include <uuid/uuid.h>
20
#include <uuid.h>
200
21
#include <algorithm>
21
#include <algorithm>
201
22
#include <unordered_map>
22
#include <unordered_map>
202
23
#include <boost/throw_exception.hpp>
23
#include <boost/throw_exception.hpp>
203
24
24
204
=== modified file 'tests/CMakeLists.txt'
205
--- tests/CMakeLists.txt	2017-10-13 19:01:00 +0000
206
+++ tests/CMakeLists.txt	2017-10-20 15:08:07 +0000
207
@@ -45,6 +45,7 @@
208
45
  ${PROJECT_SOURCE_DIR}/include/platform
45
  ${PROJECT_SOURCE_DIR}/include/platform
209
46
  ${PROJECT_SOURCE_DIR}/include/miral
46
  ${PROJECT_SOURCE_DIR}/include/miral
210
47
  ${PROJECT_SOURCE_DIR}/include/server
47
  ${PROJECT_SOURCE_DIR}/include/server
211
48
  ${MIRSERVER_INCLUDE_DIRS}
212
48
  ${PROJECT_SOURCE_DIR}/include/client
49
  ${PROJECT_SOURCE_DIR}/include/client
213
49
  ${PROJECT_SOURCE_DIR}/include/common
50
  ${PROJECT_SOURCE_DIR}/include/common
214
50
  ${PROJECT_SOURCE_DIR}/include/test
51
  ${PROJECT_SOURCE_DIR}/include/test
215
51
52
216
=== modified file 'tests/mir_test_framework/canonical_window_manager.cpp'
217
--- tests/mir_test_framework/canonical_window_manager.cpp	2017-08-30 11:59:08 +0000
218
+++ tests/mir_test_framework/canonical_window_manager.cpp	2017-10-20 15:08:07 +0000
219
@@ -24,7 +24,7 @@
220
24
#include "mir/shell/surface_ready_observer.h"
24
#include "mir/shell/surface_ready_observer.h"
221
25
#include "mir/shell/display_layout.h"
25
#include "mir/shell/display_layout.h"
222
26
26
224
27
#include <uuid/uuid.h>
27
#include <uuid.h>
225
28
#include <linux/input.h>
28
#include <linux/input.h>
226
29
#include <csignal>
29
#include <csignal>
227
30
30
228
31
31
229
=== modified file 'tests/miral/drag_and_drop.cpp'
230
--- tests/miral/drag_and_drop.cpp	2017-08-23 16:15:03 +0000
231
+++ tests/miral/drag_and_drop.cpp	2017-10-20 15:08:07 +0000
232
@@ -41,7 +41,7 @@
233
41
#include <gtest/gtest.h>
41
#include <gtest/gtest.h>
234
42
42
235
43
#include <linux/input.h>
43
#include <linux/input.h>
237
44
#include <uuid/uuid.h>
44
#include <uuid.h>
238
45
45
239
46
#include <boost/throw_exception.hpp>
46
#include <boost/throw_exception.hpp>
240
47
#include <atomic>
47
#include <atomic>
Status:	Merged
Merged at revision:	4298
Proposed branch:	lp:~alan-griffiths/mir/fedora
Merge into:	lp:mir
Prerequisite:	lp:~alan-griffiths/mir/do-not-assume-ubuntu
Diff against target:	240 lines (+69/-18) 13 files modified CMakeLists.txt (+3/-1) examples/miral-shell/CMakeLists.txt (+10/-0) examples/miral-shell/titlebar_config.cpp (+1/-1) include/server/mir/shell/persistent_surface_store.h (+1/-1) src/CMakeLists.txt (+2/-1) src/capnproto/CMakeLists.txt (+6/-1) src/miral/CMakeLists.txt (+11/-10) src/protobuf/symbols.map (+24/-0) src/server/CMakeLists.txt (+7/-0) src/server/shell/default_persistent_surface_store.cpp (+1/-1) tests/CMakeLists.txt (+1/-0) tests/mir_test_framework/canonical_window_manager.cpp (+1/-1) tests/miral/drag_and_drop.cpp (+1/-1)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/fedora
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2017-10-23
Chris Halse Rogers			Approve on 2017-10-23
Alberto Aguirre (community)		2017-10-19	Approve on 2017-10-19
Review via email: mp+332494@code.launchpad.net
1	=== modified file 'CMakeLists.txt'
2	--- CMakeLists.txt 2017-10-19 16:26:00 +0000
3	+++ CMakeLists.txt 2017-10-20 15:08:07 +0000
4	@@ -300,7 +300,9 @@
5	300		300
6	301	add_subdirectory(benchmarks/)	301	add_subdirectory(benchmarks/)
7	302	add_subdirectory(examples/)	302	add_subdirectory(examples/)
9	303	add_subdirectory(playground/)	303	if (MIR_EGL_SUPPORTED)
10			304	add_subdirectory(playground/)
11			305	endif()
12	304	add_subdirectory(guides/)	306	add_subdirectory(guides/)
13	305	add_subdirectory(cmake/)	307	add_subdirectory(cmake/)
14	306		308
15	307		309
16	=== modified file 'examples/miral-shell/CMakeLists.txt'
17	--- examples/miral-shell/CMakeLists.txt 2017-08-31 17:28:38 +0000
18	+++ examples/miral-shell/CMakeLists.txt 2017-10-20 15:08:07 +0000
19	@@ -53,6 +53,16 @@
20	53	titlebar_config.cpp titlebar_config.h	53	titlebar_config.cpp titlebar_config.h
21	54	)	54	)
22	55		55
23			56	find_file(MIRAL_DEFAULT_FONT_FILE
24			57	NAMES Ubuntu-B.ttf FreeSansBold.ttf
25			58	DOC "Font to be used in titlebars by miral-shell"
26			59	PATHS /usr/share/fonts/truetype/ubuntu-font-family # Ubuntu Ubuntu-B.ttf
27			60	/usr/share/fonts/truetype/freefont # Debian FreeSansBold.ttf
28			61	/usr/share/fonts/gnu-free) # Fedora FreeSansBold.ttf
29			62
30			63	set_source_files_properties(titlebar_config.cpp PROPERTIES
31			64	COMPILE_DEFINITIONS MIRAL_DEFAULT_FONT_FILE="${MIRAL_DEFAULT_FONT_FILE}")
32			65
33	56	pkg_check_modules(FREETYPE freetype2 REQUIRED)	66	pkg_check_modules(FREETYPE freetype2 REQUIRED)
34	57	target_include_directories(miral-shell-lib PRIVATE ${FREETYPE_INCLUDE_DIRS})	67	target_include_directories(miral-shell-lib PRIVATE ${FREETYPE_INCLUDE_DIRS})
35	58	target_compile_definitions(miral-shell-lib PRIVATE -DTYPO_SUPPORTS_FREETYPE)	68	target_compile_definitions(miral-shell-lib PRIVATE -DTYPO_SUPPORTS_FREETYPE)
36	59		69
37	=== modified file 'examples/miral-shell/titlebar_config.cpp'
38	--- examples/miral-shell/titlebar_config.cpp 2017-08-21 15:58:34 +0000
39	+++ examples/miral-shell/titlebar_config.cpp 2017-10-20 15:08:07 +0000
40	@@ -22,7 +22,7 @@
41	22	namespace	22	namespace
42	23	{	23	{
43	24	std::mutex mutex;	24	std::mutex mutex;
45	25	std::string font_file{"/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf"};	25	std::string font_file{MIRAL_DEFAULT_FONT_FILE};
46	26	}	26	}
47	27		27
48	28	void titlebar::font_file(std::string const& font_file)	28	void titlebar::font_file(std::string const& font_file)
49	29		29
50	=== modified file 'include/server/mir/shell/persistent_surface_store.h'
51	--- include/server/mir/shell/persistent_surface_store.h 2017-07-28 17:00:43 +0000
52	+++ include/server/mir/shell/persistent_surface_store.h 2017-10-20 15:08:07 +0000
53	@@ -22,7 +22,7 @@
54	22	#include <memory>	22	#include <memory>
55	23	#include <vector>	23	#include <vector>
56	24	#include <array>	24	#include <array>
58	25	#include <uuid/uuid.h>	25	#include <uuid.h>
59	26		26
60	27		27
61	28	namespace mir	28	namespace mir
62	29		29
63	=== modified file 'src/CMakeLists.txt'
64	--- src/CMakeLists.txt 2017-09-08 13:26:03 +0000
65	+++ src/CMakeLists.txt 2017-10-20 15:08:07 +0000
66	@@ -18,7 +18,6 @@
67	18	# Add the core and platform implementations before exposing any private APIs	18	# Add the core and platform implementations before exposing any private APIs
68	19	add_subdirectory(core)	19	add_subdirectory(core)
69	20	add_subdirectory(platforms/)	20	add_subdirectory(platforms/)
70	21	add_subdirectory(miral/)
71	22		21
72	23	# the src/include/... directories should be private to the implementation	22	# the src/include/... directories should be private to the implementation
73	24	include_directories(${PROJECT_SOURCE_DIR}/src/include/common)	23	include_directories(${PROJECT_SOURCE_DIR}/src/include/common)
74	@@ -31,6 +30,7 @@
75	31		30
76	32	add_subdirectory(platform/)	31	add_subdirectory(platform/)
77	33	add_subdirectory(server/)	32	add_subdirectory(server/)
78			33	add_subdirectory(miral/)
79	34	add_subdirectory(client/)	34	add_subdirectory(client/)
80	35	add_subdirectory(utils/)	35	add_subdirectory(utils/)
81	36	add_subdirectory(renderer/)	36	add_subdirectory(renderer/)
82	@@ -54,6 +54,7 @@
83	54	set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)	54	set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)
84	55	set(MIR_CLIENT_PLATFORM_PATH ${MIR_CLIENT_PLATFORM_PATH} PARENT_SCOPE)	55	set(MIR_CLIENT_PLATFORM_PATH ${MIR_CLIENT_PLATFORM_PATH} PARENT_SCOPE)
85	56	set(MIR_SERVER_PLATFORM_PATH ${MIR_SERVER_PLATFORM_PATH} PARENT_SCOPE)	56	set(MIR_SERVER_PLATFORM_PATH ${MIR_SERVER_PLATFORM_PATH} PARENT_SCOPE)
86			57	set(MIRSERVER_INCLUDE_DIRS ${MIRSERVER_INCLUDE_DIRS} PARENT_SCOPE)
87	57		58
88	58	# We need the ABI versions in the tests	59	# We need the ABI versions in the tests
89	59	set(MIR_SERVER_GRAPHICS_PLATFORM_ABI ${MIR_SERVER_GRAPHICS_PLATFORM_ABI} PARENT_SCOPE)	60	set(MIR_SERVER_GRAPHICS_PLATFORM_ABI ${MIR_SERVER_GRAPHICS_PLATFORM_ABI} PARENT_SCOPE)
90	60		61
91	=== modified file 'src/capnproto/CMakeLists.txt'
92	--- src/capnproto/CMakeLists.txt 2017-07-28 17:00:43 +0000
93	+++ src/capnproto/CMakeLists.txt 2017-10-20 15:08:07 +0000
94	@@ -20,7 +20,12 @@
95	20	capnp_generate_cpp(CAPNPROTO_INPUT_CONFIG_SRC CAPNPROTO_INPUT_CONFIG_HDRS mir_input_config.capnp)	20	capnp_generate_cpp(CAPNPROTO_INPUT_CONFIG_SRC CAPNPROTO_INPUT_CONFIG_HDRS mir_input_config.capnp)
96	21		21
97	22	add_library(mircapnproto STATIC ${CAPNPROTO_EVENT_SRC} ${CAPNPROTO_INPUT_CONFIG_SRC})	22	add_library(mircapnproto STATIC ${CAPNPROTO_EVENT_SRC} ${CAPNPROTO_INPUT_CONFIG_SRC})
99	23	target_link_libraries(mircapnproto ${CAPNP_LIBRARIES_LITE})	23
100			24	if (DEFINED CAPNP_LIBRARIES_LITE)
101			25	target_link_libraries(mircapnproto ${CAPNP_LIBRARIES_LITE})
102			26	else()
103			27	target_link_libraries(mircapnproto $<TARGET_FILE:CapnProto::capnp> $<TARGET_FILE:CapnProto::kj>)
104			28	endif()
105	24		29
106	25	list(APPEND MIR_GENERATED_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})	30	list(APPEND MIR_GENERATED_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})
107	26		31
108	27		32
109	=== modified file 'src/miral/CMakeLists.txt'
110	--- src/miral/CMakeLists.txt 2017-10-17 10:48:56 +0000
111	+++ src/miral/CMakeLists.txt 2017-10-20 15:08:07 +0000
112	@@ -96,16 +96,17 @@
113	96		96
114	97	# clang generates slightly different symbols (but we don't care)	97	# clang generates slightly different symbols (but we don't care)
115	98	if (CMAKE_COMPILER_IS_GNUCXX)	98	if (CMAKE_COMPILER_IS_GNUCXX)
126	99	execute_process(COMMAND which dpkg-gensymbols RESULT_VARIABLE MIR_HAS_DPKG_GENSYMBOLS)	99	# Using dpkg-gensymbols only makes sense on Debian based distros
127	100		100	if (EXISTS /etc/debian_version)
128	101	if (MIR_HAS_DPKG_GENSYMBOLS EQUAL 0)	101	find_program(MIR_DPKG_GENSYMBOLS dpkg-gensymbols)
129	102	add_custom_target(check-miral-symbols ALL	102	if (MIR_DPKG_GENSYMBOLS)
130	103	DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols	103	add_custom_target(check-miral-symbols ALL
131	104	COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols	104	DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols
132	105	COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -v${MIRAL_VERSION} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols	105	COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
133	106	WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"	106	COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -v${MIRAL_VERSION} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
134	107	VERBATIM	107	WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
135	108	)	108	VERBATIM)
136			109	endif()
137	109	endif()	110	endif()
138	110	endif()	111	endif()
139	111		112
140	112		113
141	=== modified file 'src/protobuf/symbols.map'
142	--- src/protobuf/symbols.map 2017-05-25 08:58:03 +0000
143	+++ src/protobuf/symbols.map 2017-10-20 15:08:07 +0000
144	@@ -1158,3 +1158,27 @@
145	1158	vtable?for?mir::protobuf::RequestWithAuthority;	1158	vtable?for?mir::protobuf::RequestWithAuthority;
146	1159	};	1159	};
147	1160	} MIR_PROTOBUF_0.26;	1160	} MIR_PROTOBUF_0.26;
148			1161
149			1162	# When building with the Fedora 26 toolchain these are needed
150			1163	MIR_PROTOBUF_FEDORA {
151			1164	global:
152			1165	extern "C++" {
153			1166	mir::protobuf::_Buffer_default_instance_;
154			1167	mir::protobuf::_BufferRequest_default_instance_;
155			1168	mir::protobuf::_BufferStream_default_instance_;
156			1169	mir::protobuf::_BufferStreamId_default_instance_;
157			1170	mir::protobuf::_Cookie_default_instance_;
158			1171	mir::protobuf::_DisplayConfiguration_default_instance_;
159			1172	mir::protobuf::_LifecycleEvent_default_instance_;
160			1173	mir::protobuf::_ModuleProperties_default_instance_;
161			1174	mir::protobuf::_PersistentSurfaceId_default_instance_;
162			1175	mir::protobuf::_PingEvent_default_instance_;
163			1176	mir::protobuf::_Platform_default_instance_;
164			1177	mir::protobuf::_ScreencastId_default_instance_;
165			1178	mir::protobuf::_StructuredError_default_instance_;
166			1179	mir::protobuf::_SurfaceAspectRatio_default_instance_;
167			1180	mir::protobuf::_SurfaceId_default_instance_;
168			1181	mir::protobuf::_SurfaceSpecification_default_instance_;
169			1182	mir::protobuf::_Rectangle_default_instance_;
170			1183	};
171			1184	} MIR_PROTOBUF_0.27;
172	1161		1185
173	=== modified file 'src/server/CMakeLists.txt'
174	--- src/server/CMakeLists.txt 2017-09-25 22:34:08 +0000
175	+++ src/server/CMakeLists.txt 2017-10-20 15:08:07 +0000
176	@@ -125,6 +125,13 @@
177	125	atomic	125	atomic
178	126	)	126	)
179	127		127
180			128	target_include_directories(mirshell
181			129	PUBLIC
182			130	${UUID_INCLUDE_DIRS}
183			131	)
184			132
185			133	set(MIRSERVER_INCLUDE_DIRS ${UUID_INCLUDE_DIRS} PARENT_SCOPE)
186			134
187	128	install(TARGETS mirserver	135	install(TARGETS mirserver
188	129	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}	136	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
189	130	)	137	)
190	131		138
191	=== modified file 'src/server/shell/default_persistent_surface_store.cpp'
192	--- src/server/shell/default_persistent_surface_store.cpp 2017-08-14 02:48:54 +0000
193	+++ src/server/shell/default_persistent_surface_store.cpp 2017-10-20 15:08:07 +0000
194	@@ -17,7 +17,7 @@
195	17	*/	17	*/
196	18		18
197	19	#include "default_persistent_surface_store.h"	19	#include "default_persistent_surface_store.h"
199	20	#include <uuid/uuid.h>	20	#include <uuid.h>
200	21	#include <algorithm>	21	#include <algorithm>
201	22	#include <unordered_map>	22	#include <unordered_map>
202	23	#include <boost/throw_exception.hpp>	23	#include <boost/throw_exception.hpp>
203	24		24
204	=== modified file 'tests/CMakeLists.txt'
205	--- tests/CMakeLists.txt 2017-10-13 19:01:00 +0000
206	+++ tests/CMakeLists.txt 2017-10-20 15:08:07 +0000
207	@@ -45,6 +45,7 @@
208	45	${PROJECT_SOURCE_DIR}/include/platform	45	${PROJECT_SOURCE_DIR}/include/platform
209	46	${PROJECT_SOURCE_DIR}/include/miral	46	${PROJECT_SOURCE_DIR}/include/miral
210	47	${PROJECT_SOURCE_DIR}/include/server	47	${PROJECT_SOURCE_DIR}/include/server
211			48	${MIRSERVER_INCLUDE_DIRS}
212	48	${PROJECT_SOURCE_DIR}/include/client	49	${PROJECT_SOURCE_DIR}/include/client
213	49	${PROJECT_SOURCE_DIR}/include/common	50	${PROJECT_SOURCE_DIR}/include/common
214	50	${PROJECT_SOURCE_DIR}/include/test	51	${PROJECT_SOURCE_DIR}/include/test
215	51		52
216	=== modified file 'tests/mir_test_framework/canonical_window_manager.cpp'
217	--- tests/mir_test_framework/canonical_window_manager.cpp 2017-08-30 11:59:08 +0000
218	+++ tests/mir_test_framework/canonical_window_manager.cpp 2017-10-20 15:08:07 +0000
219	@@ -24,7 +24,7 @@
220	24	#include "mir/shell/surface_ready_observer.h"	24	#include "mir/shell/surface_ready_observer.h"
221	25	#include "mir/shell/display_layout.h"	25	#include "mir/shell/display_layout.h"
222	26		26
224	27	#include <uuid/uuid.h>	27	#include <uuid.h>
225	28	#include <linux/input.h>	28	#include <linux/input.h>
226	29	#include <csignal>	29	#include <csignal>
227	30		30
228	31		31
229	=== modified file 'tests/miral/drag_and_drop.cpp'
230	--- tests/miral/drag_and_drop.cpp 2017-08-23 16:15:03 +0000
231	+++ tests/miral/drag_and_drop.cpp 2017-10-20 15:08:07 +0000
232	@@ -41,7 +41,7 @@
233	41	#include <gtest/gtest.h>	41	#include <gtest/gtest.h>
234	42		42
235	43	#include <linux/input.h>	43	#include <linux/input.h>
237	44	#include <uuid/uuid.h>	44	#include <uuid.h>
238	45		45
239	46	#include <boost/throw_exception.hpp>	46	#include <boost/throw_exception.hpp>
240	47	#include <atomic>	47	#include <atomic>