Merge lp:~alan-griffiths/mir/fedora into lp:mir

[Alan Griffiths]

Initial round of fixes for building on Fedora

Initial round of fixes for building & running on Fedora

$ cmake -DMIR_ENABLE_TESTS=off ..
$ make

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4300
https://mir-jenkins.ubuntu.com/job/mir-ci/3743/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5145
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5383
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5370
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5370
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5370
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5189
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5189/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5189
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5189/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5189
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5189/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5189
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5189/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5189
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5189/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5189
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5189/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5189
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5189/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5189
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5189/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3743/rebuild

review: Approve (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4301
https://mir-jenkins.ubuntu.com/job/mir-ci/3744/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5147
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5385
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5372
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5372
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5372
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5191
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5191/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5191
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5191/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5191
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5191/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5191
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5191/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5191
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5191/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5191
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5191/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5191
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5191/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5191
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5191/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3744/rebuild

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

Yes, works on a fedora 26/4.13 install under kvm/virt-manager.

Should the build dependencies for fedora be mentioned somewhere:

I had to install:

dnf install cmake gcc-c++ boost-devel mesa-libEGL-devel mesa-ligGLES-devel glm-devel protobuf-lite-devel protobuf-compiler capnproto-devel capnproto glog-devel gflags-devel systemd-devel glib2-devel wayland-devel mesa-libgbm-devel libepoxy-devel nettle-devel libinput-devel libxml++-devel libuuid-devel libxkbcommon-devel freetype-devel lttng-ust-devel libatomic

Then dnf install qterminal qt5-qtwayland for running, miral-desktop.

review: Approve

[Chris Halse Rogers (raof)]

I think changing our behaviour based on os-release is a mistake. In particular, I'm pretty sure this won't build on anything but Fedora, or Debian-derived distros, but it would be possible to do feature-detection that *would* work everywhere instead.

It looks like:
*) miral-check-symbols should use and be dependent on find_program(DPKG_GENSYMBOLS dpkg-gensymbols)
*) The MIRAL_DEFAULT_FONT_FILE should be something like
find_file(
  MIRAL_DEFAULT_FONT_FILE
  NAMES Ubuntu-B.ttf FreeSansBold.ttf
  DOC "Font to be used in titlebars by miral-shell"
  PATHS /usr/share/fonts/truetype
  PATH_SUFFIXES ubuntu-font-family freefont)

...and the capnproto differences are due to the Debian packages shipping a homebrew CMake integration. Urgh. I'll fix the Ubuntu package, and submit a patch to Debian, and try and work out how to detect the b0rkage.

From the documentation I think the target_link_libraries should be
target_link_libraries(mircapnproto CapnProto::capnp-rpc)

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> I think changing our behaviour based on os-release is a mistake. In
> particular, I'm pretty sure this won't build on anything but Fedora, or
> Debian-derived distros, but it would be possible to do feature-detection that
> *would* work everywhere instead.
>
> It looks like:
> *) miral-check-symbols should use and be dependent on
> find_program(DPKG_GENSYMBOLS dpkg-gensymbols)

The problem with that is that /usr/bin/dpkg-gensymbols exists (at least after my installing random stuff to get the build working) but doesn't actually work.

> *) The MIRAL_DEFAULT_FONT_FILE should be something like
> find_file(
> MIRAL_DEFAULT_FONT_FILE
> NAMES Ubuntu-B.ttf FreeSansBold.ttf
> DOC "Font to be used in titlebars by miral-shell"
> PATHS /usr/share/fonts/truetype
> PATH_SUFFIXES ubuntu-font-family freefont)

That makes sense.

> ...and the capnproto differences are due to the Debian packages shipping a
> homebrew CMake integration. Urgh. I'll fix the Ubuntu package, and submit a
> patch to Debian, and try and work out how to detect the b0rkage.
>
> From the documentation I think the target_link_libraries should be
> target_link_libraries(mircapnproto CapnProto::capnp-rpc)

I *think* the documentation suffers from failing to escape angle brackets.

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:4302
https://mir-jenkins.ubuntu.com/job/mir-ci/3746/
Executed test runs:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3746/rebuild

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4304
https://mir-jenkins.ubuntu.com/job/mir-ci/3749/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5154
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5391
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5378
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5378
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5378
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5197
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5197/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5197
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5197/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5197
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5197/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5197
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5197/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5197
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5197/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5197
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5197/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5197
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5197/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5197
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5197/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3749/rebuild

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

I'm ok with this. I think it'd be nice to know why dpkg-gensymbols doesn't work on Fedora, but this is fine.

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1477/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5158
    FAILURE: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1615/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1616/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5395
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5382
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5382
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5382
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5201
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5201/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5201
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5201/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5201
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5201/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5201
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5201/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5201
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5201/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5201
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5201/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5201
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5201/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5201
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5201/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-10-19 16:26:00 +0000
+++ CMakeLists.txt	2017-10-20 15:08:07 +0000
@@ -300,7 +300,9 @@
 
 add_subdirectory(benchmarks/)
 add_subdirectory(examples/)
-add_subdirectory(playground/)
+if (MIR_EGL_SUPPORTED)
+  add_subdirectory(playground/)
+endif()
 add_subdirectory(guides/)
 add_subdirectory(cmake/)
 

=== modified file 'examples/miral-shell/CMakeLists.txt'
--- examples/miral-shell/CMakeLists.txt	2017-08-31 17:28:38 +0000
+++ examples/miral-shell/CMakeLists.txt	2017-10-20 15:08:07 +0000
@@ -53,6 +53,16 @@
     titlebar_config.cpp         titlebar_config.h
 )
 
+find_file(MIRAL_DEFAULT_FONT_FILE
+    NAMES Ubuntu-B.ttf FreeSansBold.ttf
+    DOC "Font to be used in titlebars by miral-shell"
+    PATHS /usr/share/fonts/truetype/ubuntu-font-family # Ubuntu Ubuntu-B.ttf
+          /usr/share/fonts/truetype/freefont           # Debian FreeSansBold.ttf
+          /usr/share/fonts/gnu-free)                   # Fedora FreeSansBold.ttf
+
+set_source_files_properties(titlebar_config.cpp PROPERTIES
+    COMPILE_DEFINITIONS MIRAL_DEFAULT_FONT_FILE="${MIRAL_DEFAULT_FONT_FILE}")
+
 pkg_check_modules(FREETYPE freetype2 REQUIRED)
 target_include_directories(miral-shell-lib PRIVATE ${FREETYPE_INCLUDE_DIRS})
 target_compile_definitions(miral-shell-lib PRIVATE -DTYPO_SUPPORTS_FREETYPE)

=== modified file 'examples/miral-shell/titlebar_config.cpp'
--- examples/miral-shell/titlebar_config.cpp	2017-08-21 15:58:34 +0000
+++ examples/miral-shell/titlebar_config.cpp	2017-10-20 15:08:07 +0000
@@ -22,7 +22,7 @@
 namespace
 {
 std::mutex mutex;
-std::string font_file{"/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf"};
+std::string font_file{MIRAL_DEFAULT_FONT_FILE};
 }
 
 void titlebar::font_file(std::string const& font_file)

=== modified file 'include/server/mir/shell/persistent_surface_store.h'
--- include/server/mir/shell/persistent_surface_store.h	2017-07-28 17:00:43 +0000
+++ include/server/mir/shell/persistent_surface_store.h	2017-10-20 15:08:07 +0000
@@ -22,7 +22,7 @@
 #include <memory>
 #include <vector>
 #include <array>
-#include <uuid/uuid.h>
+#include <uuid.h>
 
 
 namespace mir

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2017-09-08 13:26:03 +0000
+++ src/CMakeLists.txt	2017-10-20 15:08:07 +0000
@@ -18,7 +18,6 @@
 # Add the core and platform implementations before exposing any private APIs
 add_subdirectory(core)
 add_subdirectory(platforms/)
-add_subdirectory(miral/)
 
 # the src/include/... directories should be private to the implementation
 include_directories(${PROJECT_SOURCE_DIR}/src/include/common)
@@ -31,6 +30,7 @@
 
 add_subdirectory(platform/)
 add_subdirectory(server/)
+add_subdirectory(miral/)
 add_subdirectory(client/)
 add_subdirectory(utils/)
 add_subdirectory(renderer/)
@@ -54,6 +54,7 @@
 set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)
 set(MIR_CLIENT_PLATFORM_PATH ${MIR_CLIENT_PLATFORM_PATH} PARENT_SCOPE)
 set(MIR_SERVER_PLATFORM_PATH ${MIR_SERVER_PLATFORM_PATH} PARENT_SCOPE)
+set(MIRSERVER_INCLUDE_DIRS ${MIRSERVER_INCLUDE_DIRS} PARENT_SCOPE)
 
 # We need the ABI versions in the tests
 set(MIR_SERVER_GRAPHICS_PLATFORM_ABI ${MIR_SERVER_GRAPHICS_PLATFORM_ABI} PARENT_SCOPE)

=== modified file 'src/capnproto/CMakeLists.txt'
--- src/capnproto/CMakeLists.txt	2017-07-28 17:00:43 +0000
+++ src/capnproto/CMakeLists.txt	2017-10-20 15:08:07 +0000
@@ -20,7 +20,12 @@
 capnp_generate_cpp(CAPNPROTO_INPUT_CONFIG_SRC CAPNPROTO_INPUT_CONFIG_HDRS mir_input_config.capnp)
 
 add_library(mircapnproto STATIC ${CAPNPROTO_EVENT_SRC} ${CAPNPROTO_INPUT_CONFIG_SRC})
-target_link_libraries(mircapnproto ${CAPNP_LIBRARIES_LITE})
+
+if (DEFINED CAPNP_LIBRARIES_LITE)
+  target_link_libraries(mircapnproto ${CAPNP_LIBRARIES_LITE})
+else()
+  target_link_libraries(mircapnproto $<TARGET_FILE:CapnProto::capnp> $<TARGET_FILE:CapnProto::kj>)
+endif()
 
 list(APPEND MIR_GENERATED_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})
 

=== modified file 'src/miral/CMakeLists.txt'
--- src/miral/CMakeLists.txt	2017-10-17 10:48:56 +0000
+++ src/miral/CMakeLists.txt	2017-10-20 15:08:07 +0000
@@ -96,16 +96,17 @@
 
 # clang generates slightly different symbols (but we don't care)
 if (CMAKE_COMPILER_IS_GNUCXX)
-    execute_process(COMMAND which dpkg-gensymbols RESULT_VARIABLE MIR_HAS_DPKG_GENSYMBOLS)
-
-    if (MIR_HAS_DPKG_GENSYMBOLS EQUAL 0)
-        add_custom_target(check-miral-symbols ALL
-            DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols
-            COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
-            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
-            WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
-            VERBATIM
-    )
+    # Using dpkg-gensymbols only makes sense on Debian based distros
+    if (EXISTS /etc/debian_version)
+        find_program(MIR_DPKG_GENSYMBOLS dpkg-gensymbols)
+        if (MIR_DPKG_GENSYMBOLS)
+            add_custom_target(check-miral-symbols ALL
+                DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols
+                COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
+                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
+                WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
+                VERBATIM)
+        endif()
     endif()
 endif()
 

=== modified file 'src/protobuf/symbols.map'
--- src/protobuf/symbols.map	2017-05-25 08:58:03 +0000
+++ src/protobuf/symbols.map	2017-10-20 15:08:07 +0000
@@ -1158,3 +1158,27 @@
     vtable?for?mir::protobuf::RequestWithAuthority;
   };
 } MIR_PROTOBUF_0.26;
+
+# When building with the Fedora 26 toolchain these are needed
+MIR_PROTOBUF_FEDORA {
+ global:
+  extern "C++" {
+    mir::protobuf::_Buffer_default_instance_;
+    mir::protobuf::_BufferRequest_default_instance_;
+    mir::protobuf::_BufferStream_default_instance_;
+    mir::protobuf::_BufferStreamId_default_instance_;
+    mir::protobuf::_Cookie_default_instance_;
+    mir::protobuf::_DisplayConfiguration_default_instance_;
+    mir::protobuf::_LifecycleEvent_default_instance_;
+    mir::protobuf::_ModuleProperties_default_instance_;
+    mir::protobuf::_PersistentSurfaceId_default_instance_;
+    mir::protobuf::_PingEvent_default_instance_;
+    mir::protobuf::_Platform_default_instance_;
+    mir::protobuf::_ScreencastId_default_instance_;
+    mir::protobuf::_StructuredError_default_instance_;
+    mir::protobuf::_SurfaceAspectRatio_default_instance_;
+    mir::protobuf::_SurfaceId_default_instance_;
+    mir::protobuf::_SurfaceSpecification_default_instance_;
+    mir::protobuf::_Rectangle_default_instance_;
+  };
+} MIR_PROTOBUF_0.27;

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2017-09-25 22:34:08 +0000
+++ src/server/CMakeLists.txt	2017-10-20 15:08:07 +0000
@@ -125,6 +125,13 @@
   atomic
 )
 
+target_include_directories(mirshell
+  PUBLIC
+    ${UUID_INCLUDE_DIRS}
+)
+
+set(MIRSERVER_INCLUDE_DIRS ${UUID_INCLUDE_DIRS} PARENT_SCOPE)
+
 install(TARGETS mirserver
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )

=== modified file 'src/server/shell/default_persistent_surface_store.cpp'
--- src/server/shell/default_persistent_surface_store.cpp	2017-08-14 02:48:54 +0000
+++ src/server/shell/default_persistent_surface_store.cpp	2017-10-20 15:08:07 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "default_persistent_surface_store.h"
-#include <uuid/uuid.h>
+#include <uuid.h>
 #include <algorithm>
 #include <unordered_map>
 #include <boost/throw_exception.hpp>

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2017-10-13 19:01:00 +0000
+++ tests/CMakeLists.txt	2017-10-20 15:08:07 +0000
@@ -45,6 +45,7 @@
   ${PROJECT_SOURCE_DIR}/include/platform
   ${PROJECT_SOURCE_DIR}/include/miral
   ${PROJECT_SOURCE_DIR}/include/server
+  ${MIRSERVER_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/include/client
   ${PROJECT_SOURCE_DIR}/include/common
   ${PROJECT_SOURCE_DIR}/include/test

=== modified file 'tests/mir_test_framework/canonical_window_manager.cpp'
--- tests/mir_test_framework/canonical_window_manager.cpp	2017-08-30 11:59:08 +0000
+++ tests/mir_test_framework/canonical_window_manager.cpp	2017-10-20 15:08:07 +0000
@@ -24,7 +24,7 @@
 #include "mir/shell/surface_ready_observer.h"
 #include "mir/shell/display_layout.h"
 
-#include <uuid/uuid.h>
+#include <uuid.h>
 #include <linux/input.h>
 #include <csignal>
 

=== modified file 'tests/miral/drag_and_drop.cpp'
--- tests/miral/drag_and_drop.cpp	2017-08-23 16:15:03 +0000
+++ tests/miral/drag_and_drop.cpp	2017-10-20 15:08:07 +0000
@@ -41,7 +41,7 @@
 #include <gtest/gtest.h>
 
 #include <linux/input.h>
-#include <uuid/uuid.h>
+#include <uuid.h>
 
 #include <boost/throw_exception.hpp>
 #include <atomic>