From d0ce27edd8e9a30330c81a69ccca52b02056c286 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Tue, 14 Feb 2017 15:01:25 -0800 Subject: Revert part of eb49009d023e6e3b5d59a97b8fb5fed5eee83296 (#5230) This reverts the removal of Droid Sans as fallback font. The license for this font used to be GPL2. I've updated the font files to Liberation 2.00, which are SIL, and do not require us to ship source code. I've attempted to fix all the attribution and license strings, and used the strings as provided by redhat for attribution to make sure they're correct. Last, I've removed a bunch of executable bits on files that do not need them. Fixes #5231 --- src/defaultsettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 4e4c2f92c..b333ff087 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -218,7 +218,7 @@ void set_default_settings(Settings *settings) settings->setDefault("font_shadow", "1"); settings->setDefault("font_shadow_alpha", "127"); settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "Cousine-Regular.ttf")); - settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "Tinos-Regular.ttf")); + settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallbackFull.ttf")); settings->setDefault("fallback_font_shadow", "1"); settings->setDefault("fallback_font_shadow_alpha", "128"); -- cgit v1.2.3