mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-03 08:05:12 +00:00
Code Issues Releases Wiki Activity

Added temporary KTGDESKTOP_APPIMAGE_BUILD for autoupdater key

Browse Source
This commit is contained in:
RadRussianRus
2020-05-15 20:00:38 +03:00
parent 422d06cdde
commit f3277551d0
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/core/update_checker.cpp
View File

@@ -501,13 +501,13 @@ bool ParseCommonMap(
return false; return false;
} }
const auto platforms = document.object(); const auto platforms = document.object();
#ifdef Q_OS_LINUX #if defined Q_OS_LINUX && defined KTGDESKTOP_APPIMAGE_BUILD
const auto platform = Platform::InAppImage() const auto platform = Platform::InAppImage()
? "appimage" ? "appimage"
: Platform::AutoUpdateKey(); : Platform::AutoUpdateKey();
#else // Q_OS_LINUX #else // Q_OS_LINUX && KTGDESKTOP_APPIMAGE_BUILD
const auto platform = Platform::AutoUpdateKey(); const auto platform = Platform::AutoUpdateKey();
#endif // !Q_OS_LINUX #endif // !Q_OS_LINUX || !KTGDESKTOP_APPIMAGE_BUILD
const auto it = platforms.constFind(platform); const auto it = platforms.constFind(platform);
if (it == platforms.constEnd()) { if (it == platforms.constEnd()) {
LOG(("Update Error: MTP platform '%1' not found in response." LOG(("Update Error: MTP platform '%1' not found in response."

5
Telegram/cmake/telegram_options.cmake
View File

@@ -11,6 +11,7 @@ option(TDESKTOP_DISABLE_NETWORK_PROXY "Disable all code for working through Sock
option(TDESKTOP_USE_PACKAGED_TGVOIP "Find libtgvoip using CMake instead of bundled one." ${DESKTOP_APP_USE_PACKAGED}) option(TDESKTOP_USE_PACKAGED_TGVOIP "Find libtgvoip using CMake instead of bundled one." ${DESKTOP_APP_USE_PACKAGED})
option(TDESKTOP_API_TEST "Use test API credentials." OFF) option(TDESKTOP_API_TEST "Use test API credentials." OFF)
option(KTGDESKTOP_ENABLE_PACKER "Enable building update packer on non-special targets." OFF) option(KTGDESKTOP_ENABLE_PACKER "Enable building update packer on non-special targets." OFF)
option(KTGDESKTOP_APPIMAGE_BUILD "Build with 'appimage' updater key." OFF)
set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.") set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.")
set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.") set(TDESKTOP_API_HASH "" CACHE STRING "Provide 'api_hash' for the Telegram API access.")
set(TDESKTOP_LAUNCHER_BASENAME "" CACHE STRING "Desktop file base name (Linux only).") set(TDESKTOP_LAUNCHER_BASENAME "" CACHE STRING "Desktop file base name (Linux only).")
@@ -93,3 +94,7 @@ if (NOT TDESKTOP_LAUNCHER_BASENAME)
set(TDESKTOP_LAUNCHER_BASENAME "kotatogramdesktop") set(TDESKTOP_LAUNCHER_BASENAME "kotatogramdesktop")
endif() endif()
target_compile_definitions(Telegram PRIVATE TDESKTOP_LAUNCHER_BASENAME=${TDESKTOP_LAUNCHER_BASENAME}) target_compile_definitions(Telegram PRIVATE TDESKTOP_LAUNCHER_BASENAME=${TDESKTOP_LAUNCHER_BASENAME})
if (KTGDESKTOP_APPIMAGE_BUILD)
target_compile_definitions(Telegram PRIVATE KTGDESKTOP_APPIMAGE_BUILD)
endif()