From bbc516cf436aaa81c185c4d994c817bebccc0ed5 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 16 Feb 2020 13:25:26 +0400
Subject: [PATCH] Move TDESKTOP_DISABLE_DBUS_INTEGRATION to cmake_helpers

---
 .github/workflows/linux.yml           | 3 ++-
 Telegram/CMakeLists.txt               | 2 +-
 Telegram/cmake/telegram_options.cmake | 3 +--
 docs/building-cmake.md                | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index b102fbd9d0..1f8e4abd00 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -31,7 +31,7 @@ jobs:
       CMAKE_VER: "3.16.3"
       UPLOAD_ARTIFACT: "false"
       ONLY_CACHE: "false"
-      MANUAL_CACHING: "4"
+      MANUAL_CACHING: "5"
       DOC_PATH: "docs/building-cmake.md"
 
     steps:
@@ -382,6 +382,7 @@ jobs:
           -no-opengl \
           -no-gtk \
           -static \
+          -dbus-runtime \
           -openssl-linked \
           -I "$OPENSSL_PREFIX/include" OPENSSL_LIBS="$OPENSSL_PREFIX/lib/libssl.a $OPENSSL_PREFIX/lib/libcrypto.a -ldl -lpthread" \
           -nomake examples \
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 5a9ee4bcc3..2ed1ee430c 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -77,7 +77,7 @@ if (DESKTOP_APP_USE_PACKAGED)
     )
 endif()
 
-if (LINUX AND NOT TDESKTOP_DISABLE_DBUS_INTEGRATION)
+if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
     target_link_libraries(Telegram
     PRIVATE
         desktop-app::external_statusnotifieritem
diff --git a/Telegram/cmake/telegram_options.cmake b/Telegram/cmake/telegram_options.cmake
index 6bac7e658a..9bc19e5ae7 100644
--- a/Telegram/cmake/telegram_options.cmake
+++ b/Telegram/cmake/telegram_options.cmake
@@ -9,7 +9,6 @@ option(TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME "Disable automatic 'tg://' URL sc
 option(TDESKTOP_DISABLE_NETWORK_PROXY "Disable all code for working through Socks5 or MTProxy." OFF)
 option(TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION "Disable automatic '.desktop' file generation (Linux only)." ${DESKTOP_APP_USE_PACKAGED})
 option(TDESKTOP_DISABLE_GTK_INTEGRATION "Disable all code for GTK integration (Linux only)." ON)
-option(TDESKTOP_DISABLE_DBUS_INTEGRATION "Disable all code for D-Bus integration (Linux only)." OFF)
 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)
 set(TDESKTOP_API_ID "0" CACHE STRING "Provide 'api_id' for the Telegram API access.")
@@ -86,7 +85,7 @@ if (TDESKTOP_DISABLE_GTK_INTEGRATION)
     target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_GTK_INTEGRATION)
 endif()
 
-if (TDESKTOP_DISABLE_DBUS_INTEGRATION)
+if (DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
     target_compile_definitions(Telegram PRIVATE TDESKTOP_DISABLE_DBUS_INTEGRATION)
 endif()
 
diff --git a/docs/building-cmake.md b/docs/building-cmake.md
index ff07868359..32661ef664 100644
--- a/docs/building-cmake.md
+++ b/docs/building-cmake.md
@@ -257,6 +257,7 @@ Go to ***BuildPath*** and run
     -no-opengl \
     -no-gtk \
     -static \
+    -dbus-runtime \
     -openssl-linked \
     -I "$OPENSSL_DIR/include" OPENSSL_LIBS="$OPENSSL_DIR/lib/libssl.a $OPENSSL_DIR/lib/libcrypto.a -ldl -lpthread" \
     -nomake examples \