diff --git a/net-im/telegram-desktop/patches/telegram_desktop-2.1.11.patchset b/net-im/telegram-desktop/patches/telegram_desktop-2.1.12.patchset similarity index 93% rename from net-im/telegram-desktop/patches/telegram_desktop-2.1.11.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-2.1.12.patchset index 0952eab44..e9c4de74f 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-2.1.11.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-2.1.12.patchset @@ -1,6 +1,6 @@ -From ca93c9a0ddd33e8a7efb416531cd5c93818b07a9 Mon Sep 17 00:00:00 2001 +From 8acce006d96940362f8eaa3e980ec340f48a1448 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sat, 6 Jun 2020 13:36:40 +1000 +Date: Thu, 18 Jun 2020 21:39:15 +1000 Subject: Add Haiku support @@ -40,7 +40,7 @@ index 645d886..3a0a0e9 100644 add_subdirectory(cmake) add_subdirectory(Telegram) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt -index 385c9e9..a933789 100644 +index 9dfcd61..007f744 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -120,7 +120,7 @@ PRIVATE @@ -71,15 +71,6 @@ index 385c9e9..a933789 100644 platform/platform_audio.h platform/platform_file_utilities.h platform/platform_launcher.h -@@ -1209,7 +1221,7 @@ endif() - - set_target_properties(Telegram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder}) - --if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR NOT LINUX) AND NOT build_macstore AND NOT build_winstore) -+if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR NOT LINUX OR NOT HAIKU) AND NOT build_macstore AND NOT build_winstore) - add_executable(Updater WIN32) - init_target(Updater) - diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp index 5119097..5720d73 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp @@ -92,20 +83,45 @@ index 5119097..5720d73 100644 #include "calls/calls_call.h" #include "main/main_session.h" +diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp +index fb79b73..cb01f64 100644 +--- a/Telegram/SourceFiles/core/application.cpp ++++ b/Telegram/SourceFiles/core/application.cpp +@@ -773,7 +773,7 @@ void Application::notifyFileDialogShown(bool shown) { + } + + QWidget *Application::getModalParent() { +-#if defined Q_OS_UNIX && !defined Q_OS_MAC ++#if defined Q_OS_UNIX && !defined Q_OS_MAC && !defined Q_OS_HAIKU + return Platform::IsWayland() + ? App::wnd() + : nullptr; +diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp +index b15a25c..df1ffef 100644 +--- a/Telegram/SourceFiles/core/launcher.cpp ++++ b/Telegram/SourceFiles/core/launcher.cpp +@@ -291,7 +291,7 @@ void Launcher::init() { + + QApplication::setApplicationName(qsl("TelegramDesktop")); + +-#if defined Q_OS_UNIX && !defined Q_OS_MAC && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) ++#if defined Q_OS_UNIX && !defined Q_OS_MAC && !defined Q_OS_HAIKU && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) + QApplication::setDesktopFileName(Platform::GetLauncherFilename()); + #endif + diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp -index 588bf05..3f6a103 100644 +index 644cb9e..4c20915 100644 --- a/Telegram/SourceFiles/core/update_checker.cpp +++ b/Telegram/SourceFiles/core/update_checker.cpp -@@ -1512,6 +1512,9 @@ bool checkReadyUpdate() { - #elif defined Q_OS_LINUX // Q_OS_MAC - QString curUpdater = (cExeDir() + qsl("Updater")); - QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater")); -+#elif defined Q_OS_HAIKU // Q_OS_MAC || Q_OS_WIN -+ QString curUpdater = (cExeDir() + qsl("Updater")); -+ QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater")); - #endif // Q_OS_LINUX - if (!updater.exists()) { - QFileInfo current(curUpdater); +@@ -1546,7 +1546,7 @@ bool checkReadyUpdate() { + ClearAll(); + return false; + } +-#elif defined Q_OS_UNIX // Q_OS_MAC ++#elif defined Q_OS_UNIX && !defined Q_OS_HAIKU // Q_OS_MAC + if (!linuxMoveFile(QFile::encodeName(updater.absoluteFilePath()).constData(), QFile::encodeName(curUpdater).constData())) { + ClearAll(); + return false; diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp index 2d0af62..7f1a5fe 100644 --- a/Telegram/SourceFiles/data/data_session.cpp @@ -151,7 +167,7 @@ index 17a2561..27b5de5 100644 ? tr::lng_disable_notifications_from_tray(tr::now) : tr::lng_enable_notifications_from_tray(tr::now); diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp -index 9aaf144..7e698c1 100644 +index e6ecdb2..262f4a9 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp @@ -365,7 +365,7 @@ OverlayWidget::OverlayWidget() @@ -1607,10 +1623,10 @@ index 0000000..c36d7c3 +} diff --git a/Telegram/SourceFiles/platform/haiku/specific_haiku.h b/Telegram/SourceFiles/platform/haiku/specific_haiku.h new file mode 100644 -index 0000000..ef5d0f2 +index 0000000..7fa4003 --- /dev/null +++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.h -@@ -0,0 +1,122 @@ +@@ -0,0 +1,126 @@ +/* +This file is part of Telegram Desktop for Haiku, + @@ -1661,6 +1677,10 @@ index 0000000..ef5d0f2 +inline void FallbackFontConfigCheckEnd() { +} + ++inline QImage GetImageFromClipboard() { ++ return {}; ++} ++ +} // namespace Platform + +inline QString psServerPrefix() { @@ -1733,128 +1753,71 @@ index 0000000..ef5d0f2 +//ool linuxMoveFile(const char *from, const char *to); + +bool psLaunchMaps(const Data::LocationPoint &point); -diff --git a/Telegram/SourceFiles/platform/platform_audio.h b/Telegram/SourceFiles/platform/platform_audio.h -index 7705b2e..b65a843 100644 ---- a/Telegram/SourceFiles/platform/platform_audio.h -+++ b/Telegram/SourceFiles/platform/platform_audio.h -@@ -19,7 +19,7 @@ void DeInit(); - - // Platform dependent implementations. - --#if defined Q_OS_MAC || defined Q_OS_LINUX -+#if defined Q_OS_MAC || defined Q_OS_LINUX || defined Q_OS_HAIKU - namespace Platform { - namespace Audio { - diff --git a/Telegram/SourceFiles/platform/platform_file_utilities.h b/Telegram/SourceFiles/platform/platform_file_utilities.h -index b78adf5..0aaff3d 100644 +index cd70b78..ac7bbe6 100644 --- a/Telegram/SourceFiles/platform/platform_file_utilities.h +++ b/Telegram/SourceFiles/platform/platform_file_utilities.h -@@ -46,8 +46,10 @@ bool Get( +@@ -46,6 +46,8 @@ bool Get( #ifdef Q_OS_MAC #include "platform/mac/file_utilities_mac.h" --#elif defined Q_OS_LINUX // Q_OS_MAC -+#elif defined Q_OS_HAIKU // Q_OS_MAC ++#elif defined Q_OS_HAIKU +#include "platform/haiku/file_utilities_haiku.h" -+#elif defined Q_OS_LINUX // Q_OS_MAC || Q_OS_HAIKU + #elif defined Q_OS_UNIX // Q_OS_MAC #include "platform/linux/file_utilities_linux.h" --#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX -+#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_HAIKU - #include "platform/win/file_utilities_win.h" --#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN -+#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN || Q_OS_HAIKU + #elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX diff --git a/Telegram/SourceFiles/platform/platform_launcher.h b/Telegram/SourceFiles/platform/platform_launcher.h -index 27180d0..d82bda6 100644 +index d79aea6..53a1b91 100644 --- a/Telegram/SourceFiles/platform/platform_launcher.h +++ b/Telegram/SourceFiles/platform/platform_launcher.h -@@ -23,8 +23,10 @@ namespace Platform { +@@ -23,6 +23,8 @@ namespace Platform { #ifdef Q_OS_MAC #include "platform/mac/launcher_mac.h" --#elif defined Q_OS_LINUX // Q_OS_MAC -+#elif defined Q_OS_HAIKU // Q_OS_MAC ++#elif defined Q_OS_HAIKU +#include "platform/haiku/launcher_haiku.h" -+#elif defined Q_OS_LINUX // Q_OS_MAC || Q_OS_HAIKU + #elif defined Q_OS_UNIX // Q_OS_MAC #include "platform/linux/launcher_linux.h" --#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX -+#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_HAIKU - #include "platform/win/launcher_win.h" --#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN -+#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN || Q_OS_HAIKU + #elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX diff --git a/Telegram/SourceFiles/platform/platform_main_window.h b/Telegram/SourceFiles/platform/platform_main_window.h -index 33277c9..2d6ba7d 100644 +index 4bdb939..88bfaf6 100644 --- a/Telegram/SourceFiles/platform/platform_main_window.h +++ b/Telegram/SourceFiles/platform/platform_main_window.h -@@ -19,8 +19,10 @@ class MainWindow; +@@ -19,6 +19,8 @@ class MainWindow; #ifdef Q_OS_MAC #include "platform/mac/main_window_mac.h" --#elif defined Q_OS_LINUX // Q_OS_MAC -+#elif defined Q_OS_HAIKU // Q_OS_MAC ++#elif defined Q_OS_HAIKU +#include "platform/haiku/main_window_haiku.h" -+#elif defined Q_OS_LINUX // Q_OS_MAC || Q_OS_HAIKU + #elif defined Q_OS_UNIX // Q_OS_MAC #include "platform/linux/main_window_linux.h" --#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX -+#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_HAIKU - #include "platform/win/main_window_win.h" --#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN -+#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN || Q_OS_HAIKU + #elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX diff --git a/Telegram/SourceFiles/platform/platform_notifications_manager.h b/Telegram/SourceFiles/platform/platform_notifications_manager.h -index f0cdb15..b66690f 100644 +index 4afeadf..7e4398a 100644 --- a/Telegram/SourceFiles/platform/platform_notifications_manager.h +++ b/Telegram/SourceFiles/platform/platform_notifications_manager.h -@@ -27,8 +27,10 @@ namespace Notifications { +@@ -27,6 +27,8 @@ namespace Notifications { #ifdef Q_OS_MAC #include "platform/mac/notifications_manager_mac.h" --#elif defined Q_OS_LINUX // Q_OS_MAC -+#elif defined Q_OS_HAIKU // Q_OS_MAC ++#elif defined Q_OS_HAIKU +#include "platform/haiku/notifications_manager_haiku.h" -+#elif defined Q_OS_LINUX // Q_OS_MAC || Q_OS_LINUX + #elif defined Q_OS_UNIX // Q_OS_MAC #include "platform/linux/notifications_manager_linux.h" --#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX -+#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_LINUX - #include "platform/win/notifications_manager_win.h" --#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN -+#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN || Q_OS_LINUX + #elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h -index db963f5..c283af8 100644 +index c05e717..c486176 100644 --- a/Telegram/SourceFiles/platform/platform_specific.h +++ b/Telegram/SourceFiles/platform/platform_specific.h -@@ -52,8 +52,10 @@ void finish(); +@@ -55,6 +55,8 @@ void finish(); #ifdef Q_OS_MAC #include "platform/mac/specific_mac.h" --#elif defined Q_OS_LINUX // Q_OS_MAC -+#elif defined Q_OS_HAIKU // Q_OS_MAC ++#elif defined Q_OS_HAIKU +#include "platform/haiku/specific_haiku.h" -+#elif defined Q_OS_LINUX // Q_OS_MAC || Q_OS_HAIKU + #elif defined Q_OS_UNIX // Q_OS_MAC #include "platform/linux/specific_linux.h" --#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX -+#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_HAIKU - #include "platform/win/specific_win.h" --#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN -+#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN || Q_OS_HAIKU -diff --git a/Telegram/SourceFiles/platform/platform_window_title.h b/Telegram/SourceFiles/platform/platform_window_title.h -index 6aea663..a5c46ef 100644 ---- a/Telegram/SourceFiles/platform/platform_window_title.h -+++ b/Telegram/SourceFiles/platform/platform_window_title.h -@@ -26,7 +26,7 @@ void PreviewWindowFramePaint(QImage &preview, const style::palette &palette, QRe - #include "platform/mac/window_title_mac.h" - #elif defined Q_OS_WIN // Q_OS_MAC - #include "platform/win/window_title_win.h" --#elif defined Q_OS_WINRT || defined Q_OS_LINUX // Q_OS_MAC || Q_OS_WIN -+#elif defined Q_OS_WINRT || defined Q_OS_LINUX || defined(Q_OS_HAIKU) // Q_OS_MAC || Q_OS_WIN - - namespace Platform { - -@@ -44,4 +44,4 @@ inline void PreviewWindowFramePaint(QImage &preview, const style::palette &palet - - } // namespace Platform - --#endif // Q_OS_MAC || Q_OS_WIN || Q_OS_WINRT || Q_OS_LINUX -+#endif // Q_OS_MAC || Q_OS_WIN || Q_OS_WINRT || Q_OS_LINUX || Q_OS_HAIKU + #elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX diff --git a/Telegram/SourceFiles/settings/settings_calls.cpp b/Telegram/SourceFiles/settings/settings_calls.cpp index 56acbb9..ef16c47 100644 --- a/Telegram/SourceFiles/settings/settings_calls.cpp @@ -1882,31 +1845,20 @@ index 56acbb9..ef16c47 100644 #ifdef NEED_TO_RESTORE_SLOTS diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp -index 38e1662..b4dc3f8 100644 +index 59996f7..e974216 100644 --- a/Telegram/SourceFiles/settings/settings_notifications.cpp +++ b/Telegram/SourceFiles/settings/settings_notifications.cpp -@@ -633,7 +633,7 @@ void SetupNotificationsContent( +@@ -633,8 +633,8 @@ void SetupNotificationsContent( return QString(); } else if (Platform::IsWindows()) { return tr::lng_settings_use_windows(tr::now); - } else if (Platform::IsLinux()) { +-#if defined Q_OS_UNIX && !defined Q_OS_MAC + } else if (Platform::IsLinux() || Platform::IsHaiku()) { - return tr::lng_settings_use_native_notifications(tr::now); - } - return QString(); -diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp -index 88ffe6e..7e26c59 100644 ---- a/Telegram/SourceFiles/window/main_window.cpp -+++ b/Telegram/SourceFiles/window/main_window.cpp -@@ -117,7 +117,7 @@ QIcon CreateOfficialIcon(Main::Account *account) { - - QIcon CreateIcon(Main::Account *account) { - auto result = CreateOfficialIcon(account); --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_HAIKU) - return QIcon::fromTheme(Platform::GetIconName(), result); - #endif - return result; ++#if defined Q_OS_UNIX && !defined Q_OS_MAC && !defined Q_OS_HAIKU + if (Platform::IsWayland()) { + return QString(); + } diff --git a/Telegram/ThirdParty/libtgvoip/VoIPController.cpp b/Telegram/ThirdParty/libtgvoip/VoIPController.cpp index b1a513f..faebc2f 100644 --- a/Telegram/ThirdParty/libtgvoip/VoIPController.cpp @@ -2858,7 +2810,7 @@ index e4ea6be..a728127 100644 desktop-app::external_ranges desktop-app::external_gsl diff --git a/Telegram/lib_base/base/crash_report_writer.cpp b/Telegram/lib_base/base/crash_report_writer.cpp -index 963a720..d67d6c3 100644 +index dff7624..c20bb20 100644 --- a/Telegram/lib_base/base/crash_report_writer.cpp +++ b/Telegram/lib_base/base/crash_report_writer.cpp @@ -107,6 +107,8 @@ const char *PlatformString() { @@ -2880,25 +2832,20 @@ index 963a720..d67d6c3 100644 #ifdef USE_BREAKPAD diff --git a/Telegram/lib_base/base/platform/base_platform_file_utilities.h b/Telegram/lib_base/base/platform/base_platform_file_utilities.h -index 83841a0..4a300b1 100644 +index 1b63b2a..00a9900 100644 --- a/Telegram/lib_base/base/platform/base_platform_file_utilities.h +++ b/Telegram/lib_base/base/platform/base_platform_file_utilities.h -@@ -26,8 +26,10 @@ void FlushFileData(QFile &file); +@@ -26,6 +26,8 @@ void FlushFileData(QFile &file); #ifdef Q_OS_MAC #include "base/platform/mac/base_file_utilities_mac.h" --#elif defined Q_OS_LINUX // Q_OS_MAC -+#elif defined Q_OS_HAIKU // Q_OS_MAC ++#elif defined Q_OS_HAIKU +#include "base/platform/haiku/base_file_utilities_haiku.h" -+#elif defined Q_OS_LINUX // Q_OS_MAC || Q_OS_LINUX + #elif defined Q_OS_UNIX // Q_OS_MAC #include "base/platform/linux/base_file_utilities_linux.h" --#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX -+#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_HAIKU - #include "base/platform/win/base_file_utilities_win.h" --#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN -+#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN || Q_OS_HAIKU + #elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX diff --git a/Telegram/lib_base/base/platform/base_platform_info.h b/Telegram/lib_base/base/platform/base_platform_info.h -index b70a3ed..839533e 100644 +index 1691f02..e9998e1 100644 --- a/Telegram/lib_base/base/platform/base_platform_info.h +++ b/Telegram/lib_base/base/platform/base_platform_info.h @@ -53,6 +53,8 @@ enum class OutdateReason { @@ -2910,20 +2857,15 @@ index b70a3ed..839533e 100644 void Start(QJsonObject settings); void Finish(); -@@ -60,8 +62,10 @@ void Finish(); +@@ -60,6 +62,8 @@ void Finish(); #ifdef Q_OS_MAC #include "base/platform/mac/base_info_mac.h" --#elif defined Q_OS_LINUX // Q_OS_MAC -+#elif defined Q_OS_HAIKU // Q_OS_MAC ++#elif defined Q_OS_HAIKU +#include "base/platform/haiku/base_info_haiku.h" -+#elif defined Q_OS_LINUX // Q_OS_MAC || Q_OS_LINUX + #elif defined Q_OS_UNIX // Q_OS_MAC #include "base/platform/linux/base_info_linux.h" --#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX -+#elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_HAIKU - #include "base/platform/win/base_info_win.h" --#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN -+#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN || Q_OS_HAIKU + #elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX diff --git a/Telegram/lib_base/base/platform/haiku/base_file_utilities_haiku.cpp b/Telegram/lib_base/base/platform/haiku/base_file_utilities_haiku.cpp new file mode 100644 index 0000000..0facb49 @@ -3616,23 +3558,33 @@ index 0000000..ecb1277 + +#include "ui/platform/ui_platform_window.h" diff --git a/Telegram/lib_ui/ui/platform/ui_platform_utility.h b/Telegram/lib_ui/ui/platform/ui_platform_utility.h -index 4398ed7..0b03e4e 100644 +index 0e23059..e37e977 100644 --- a/Telegram/lib_ui/ui/platform/ui_platform_utility.h +++ b/Telegram/lib_ui/ui/platform/ui_platform_utility.h -@@ -37,8 +37,10 @@ void DrainMainQueue(); // Needed only if UseMainQueueGeneric() is false. +@@ -37,6 +37,8 @@ void DrainMainQueue(); // Needed only if UseMainQueueGeneric() is false. #ifdef Q_OS_MAC #include "ui/platform/mac/ui_utility_mac.h" --#elif defined Q_OS_LINUX // Q_OS_MAC -+#elif defined Q_OS_HAIKU // Q_OS_MAC ++#elif defined Q_OS_HAIKU +#include "ui/platform/haiku/ui_utility_haiku.h" -+#elif defined Q_OS_LINUX // Q_OS_MAC || Q_OS_HAIKU + #elif defined Q_OS_UNIX // Q_OS_MAC #include "ui/platform/linux/ui_utility_linux.h" --#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX -+#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX || Q_OS_HAIKU - #include "ui/platform/win/ui_utility_win.h" --#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN -+#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN || Q_OS_HAIKU + #elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX +diff --git a/Telegram/lib_ui/ui/style/style_core_custom_font.cpp b/Telegram/lib_ui/ui/style/style_core_custom_font.cpp +index 570d169..8644d20 100644 +--- a/Telegram/lib_ui/ui/style/style_core_custom_font.cpp ++++ b/Telegram/lib_ui/ui/style/style_core_custom_font.cpp +@@ -44,7 +44,10 @@ QFont ResolveFont(uint32 flags, int size) { + const auto point = good.isEmpty() ? size : good.front(); + result = Database.font(custom.family, custom.style, point); + } else { ++// Don't override fonts for Haiku ++#ifndef __HAIKU__ + result.setFamily(GetFontOverride(flags)); ++#endif + if (bold) { + #ifdef DESKTOP_APP_USE_PACKAGED_FONTS + result.setWeight(QFont::DemiBold); diff --git a/cmake/external.cmake b/cmake/external.cmake new file mode 100644 index 0000000..a6c28f1 @@ -3923,28 +3875,3 @@ index 17bb351..f02e702 100644 -- 2.26.0 - -From f3d682717f89b0e1734a4c41e8b2421d84d35b92 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 17 Jun 2020 15:45:27 +1000 -Subject: Don't override fonts for Haiku - - -diff --git a/Telegram/lib_ui/ui/style/style_core_custom_font.cpp b/Telegram/lib_ui/ui/style/style_core_custom_font.cpp -index 570d169..8644d20 100644 ---- a/Telegram/lib_ui/ui/style/style_core_custom_font.cpp -+++ b/Telegram/lib_ui/ui/style/style_core_custom_font.cpp -@@ -44,7 +44,10 @@ QFont ResolveFont(uint32 flags, int size) { - const auto point = good.isEmpty() ? size : good.front(); - result = Database.font(custom.family, custom.style, point); - } else { -+// Don't override fonts for Haiku -+#ifndef __HAIKU__ - result.setFamily(GetFontOverride(flags)); -+#endif - if (bold) { - #ifdef DESKTOP_APP_USE_PACKAGED_FONTS - result.setWeight(QFont::DemiBold); --- -2.26.0 - diff --git a/net-im/telegram-desktop/telegram_desktop-2.1.11.recipe b/net-im/telegram-desktop/telegram_desktop-2.1.12.recipe similarity index 97% rename from net-im/telegram-desktop/telegram_desktop-2.1.11.recipe rename to net-im/telegram-desktop/telegram_desktop-2.1.12.recipe index fd1aea3a9..390b95079 100644 --- a/net-im/telegram-desktop/telegram_desktop-2.1.11.recipe +++ b/net-im/telegram-desktop/telegram_desktop-2.1.12.recipe @@ -3,10 +3,10 @@ DESCRIPTION="Unofficial build of the original Telegram client for Haiku." HOMEPAGE="https://www.telegram.org/" COPYRIGHT="2013-2020 Telegram" LICENSE="GNU GPL v3" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz" -CHECKSUM_SHA256="b550c98fff17e38cbbbb6099bebc9dd4a12f8943dff26dbdc1f7952759b6a6e9" +CHECKSUM_SHA256="a89ad7e91b7ecbd20fa9c9735b069d5cb319456878b52fb8754cf696567c33ad" SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz" SOURCE_DIR="tdesktop-$portVersion-full" srcGitRev_2="0663103551379b958b2e79c51d51d163ec484300" @@ -118,6 +118,7 @@ BUILD() -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \ -DTDESKTOP_API_TEST=OFF \ -DTDESKTOP_DISABLE_GTK_INTEGRATION=ON \ + -DDESKTOP_APP_DISABLE_AUTOUPDATE=ON \ -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=ON \ -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \ -DDESKTOP_APP_USE_PACKAGED_GSL=OFF \