Merge lp:~alan-griffiths/mir/sync-fix-from-0.28.1-release into lp:mir

[Alan Griffiths]

[miral-shell] Try to find default font at runtime, not build time (as builders may not have fonts installed)

[miral-shell] Try to find default font at runtime, not build time (as builders may not have fonts installed)

Fixes a problem seen while testing 0.28.1

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

PASSED: Continuous integration, rev:4306
https://mir-jenkins.ubuntu.com/job/mir-ci/3763/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5185
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5422
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5409
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5409
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5409
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5228
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5228/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5228
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5228/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5228
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5228/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5228
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5228/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5228
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5228/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/5228
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5228/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/5228
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5228/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5228
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5228/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Please resubmit on GitHub: https://github.com/MirServer/mir/tree/sync-fix-from-0.28.1-release

review: Needs Resubmitting

Unmerged revisions

4306. By Alan Griffiths on 2017-10-27

Try to find default font at runtime, not build time

=== modified file 'examples/miral-shell/CMakeLists.txt'
--- examples/miral-shell/CMakeLists.txt	2017-10-20 13:39:42 +0000
+++ examples/miral-shell/CMakeLists.txt	2017-10-27 17:40:44 +0000
@@ -53,16 +53,6 @@
     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-10-19 12:00:16 +0000
+++ examples/miral-shell/titlebar_config.cpp	2017-10-27 17:40:44 +0000
@@ -17,12 +17,30 @@
  */
 
 #include "titlebar_config.h"
+#include <unistd.h>
 #include <mutex>
 
 namespace
 {
+auto default_font() -> std::string
+{
+    for (std::string const file : { "Ubuntu-B.ttf", "FreeSansBold.ttf" })
+    {
+        for (auto const path : { "/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
+        {
+            auto const full_path = path + file;
+            if (access(full_path.c_str(), R_OK) == 0)
+                return full_path;
+        }
+    }
+
+    return "/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf";
+}
+
 std::mutex mutex;
-std::string font_file{MIRAL_DEFAULT_FONT_FILE};
+std::string font_file{default_font()};
 }
 
 void titlebar::font_file(std::string const& font_file)