From 997d1fbc8035e9f7abf1b04b35e247962413999f Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 12 Nov 2018 17:34:47 +0400 Subject: [PATCH] Move custom fonts.conf to resources. --- Telegram/Resources/qrc/telegram_linux.qrc | 3 + .../platform/linux/specific_linux.cpp | 64 +------------------ 2 files changed, 5 insertions(+), 62 deletions(-) diff --git a/Telegram/Resources/qrc/telegram_linux.qrc b/Telegram/Resources/qrc/telegram_linux.qrc index 0554fa179..164e8d4f2 100644 --- a/Telegram/Resources/qrc/telegram_linux.qrc +++ b/Telegram/Resources/qrc/telegram_linux.qrc @@ -2,4 +2,7 @@ ../etc/qt_linux.conf + + ../fc-custom.conf + diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index bc5def7fe..9708c6e1b 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -83,71 +83,11 @@ void FallbackFontConfig() { const auto minor = match.capturedRef(2).toInt(); LOG(("Fontconfig version: %1.%2").arg(major).arg(minor)); if (major <= 2 && (major != 2 || minor <= 12)) { - if (qgetenv("TDESKTOP_FORCE_CUSTOM_FONCONFIG").isEmpty()) { + if (qgetenv("TDESKTOP_FORCE_CUSTOM_FONTCONFIG").isEmpty()) { return; } } - QFile file(custom); - if (!file.open(QIODevice::WriteOnly)) { - return; - } - file.write(R"CONF( - - - /usr/share/fonts - /usr/local/share/fonts - ~/.fonts - ~/.local/share/fonts - /usr/X11R6/lib/X11/fonts - fonts - - - mono - - - monospace - - - - - sans serif - - - sans-serif - - - - - sans - - - sans-serif - - - /var/cache/fontconfig_11 - fontconfig_11 - ~/.fontconfig_11 - - - true - - - false - - - true - - - hintslight - - - lcddefault - - - rgb - - -)CONF"); + QFile(":/fc/fc-custom.conf").copy(custom); #endif // TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION }