From 28a567986d452a334dfe6ba7d9c998ca9b27d514 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 31 Jan 2020 16:31:08 +0300 Subject: [PATCH] Try linking some libs dynamically on Linux. --- Telegram/SourceFiles/platform/linux/specific_linux.cpp | 4 ++-- cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index f079fce8e..e641c98ff 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -83,7 +83,7 @@ bool RunShellCommand(const QByteArray &command) { } void FallbackFontConfig() { -#ifndef DESKTOP_APP_USE_PACKAGED +#ifdef TDESKTOP_USE_FONT_CONFIG_FALLBACK const auto custom = cWorkingDir() + "tdata/fc-custom-1.conf"; const auto finish = gsl::finally([&] { if (QFile(custom).exists()) { @@ -118,7 +118,7 @@ void FallbackFontConfig() { } QFile(":/fc/fc-custom.conf").copy(custom); -#endif // !DESKTOP_APP_USE_PACKAGED +#endif // TDESKTOP_USE_FONT_CONFIG_FALLBACK } bool GenerateDesktopFile(const QString &targetPath, const QString &args) { diff --git a/cmake b/cmake index 6eff82642..22b099429 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 6eff82642be0dd58c5c31b9cf2f0a905d9cac4b9 +Subproject commit 22b099429aa9368fe0339ee48bcf6dbcdd3ac8d5