From 22bd23896024096e267d4a6650116fad9c96d99b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 12 Jun 2019 22:40:02 +1000 Subject: [PATCH] Telegram: bump version --- ...telegram_desktop-1.7.7-libtgvoip.patchset} | 0 ... => telegram_desktop-1.7.7-systemqt.patch} | 0 ...tchset => telegram_desktop-1.7.7.patchset} | 325 ++++++++++++------ ...3.recipe => telegram_desktop-1.7.7.recipe} | 6 +- 4 files changed, 222 insertions(+), 109 deletions(-) rename net-im/telegram-desktop/patches/{telegram_desktop-1.7.3-libtgvoip.patchset => telegram_desktop-1.7.7-libtgvoip.patchset} (100%) rename net-im/telegram-desktop/patches/{telegram_desktop-1.7.3-systemqt.patch => telegram_desktop-1.7.7-systemqt.patch} (100%) rename net-im/telegram-desktop/patches/{telegram_desktop-1.7.3.patchset => telegram_desktop-1.7.7.patchset} (90%) rename net-im/telegram-desktop/{telegram_desktop-1.7.3.recipe => telegram_desktop-1.7.7.recipe} (97%) diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.7.3-libtgvoip.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.7.7-libtgvoip.patchset similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-1.7.3-libtgvoip.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.7.7-libtgvoip.patchset diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.7.3-systemqt.patch b/net-im/telegram-desktop/patches/telegram_desktop-1.7.7-systemqt.patch similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-1.7.3-systemqt.patch rename to net-im/telegram-desktop/patches/telegram_desktop-1.7.7-systemqt.patch diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.7.3.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.7.7.patchset similarity index 90% rename from net-im/telegram-desktop/patches/telegram_desktop-1.7.3.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.7.7.patchset index ce53f55f1..7912eef8c 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.7.3.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.7.7.patchset @@ -1,6 +1,6 @@ -From 07c1320bd65a97c888d695a15bbb94ffa66e0b19 Mon Sep 17 00:00:00 2001 +From 0479cf46645731ebef710dad28d9ada4a54c8bfd Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 10 May 2019 14:06:04 +1000 +Date: Wed, 12 Jun 2019 22:29:33 +1000 Subject: Add Haiku support @@ -133,7 +133,7 @@ index fbdcb56..0eb0e4f 100644 int (*TestForkedMethod)()/* = nullptr*/; diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp -index 1b63208..41a1017 100644 +index 5d550c5..f676909 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp @@ -5,6 +5,7 @@ the official desktop application for the Telegram messaging service. @@ -144,7 +144,7 @@ index 1b63208..41a1017 100644 #include "core/launcher.h" #include "platform/platform_launcher.h" -@@ -15,6 +16,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL +@@ -16,6 +17,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/sandbox.h" #include "base/concurrent_timer.h" @@ -156,7 +156,7 @@ index 1b63208..41a1017 100644 namespace Core { namespace { -@@ -266,6 +272,10 @@ int Launcher::exec() { +@@ -271,6 +277,10 @@ int Launcher::exec() { // I don't know why path is not in QT_PLUGIN_PATH by default QCoreApplication::addLibraryPath("/usr/lib/qt/plugins"); @@ -167,17 +167,7 @@ index 1b63208..41a1017 100644 // without this Telegram doesn't start on Ubuntu 17.04 due GTK errors setenv("QT_STYLE_OVERRIDE", "qwerty", false); // Telegram doesn't start when extraordinary theme is set, see launchpad.net/bugs/1680943 -@@ -367,6 +377,9 @@ void Launcher::prepareSettings() { - case dbipMacOld: - gPlatformString = qsl("MacOSold"); - break; -+ case dbipHaiku: -+ gPlatformString = qsl("HaikuDepot"); -+ break; - case dbipLinux64: - gPlatformString = qsl("Linux64bit"); - break; -@@ -484,7 +497,16 @@ int Launcher::executeApplication() { +@@ -460,7 +470,16 @@ int Launcher::executeApplication() { Sandbox sandbox(this, arguments.count(), arguments.values()); MainQueueProcessor processor; base::ConcurrentTimerEnvironment environment; @@ -195,18 +185,19 @@ index 1b63208..41a1017 100644 } // namespace Core diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp -index 8aefb97..d54c8d1 100644 +index 6916e0b..8fdcb39 100644 --- a/Telegram/SourceFiles/core/update_checker.cpp +++ b/Telegram/SourceFiles/core/update_checker.cpp -@@ -499,6 +499,7 @@ bool ParseCommonMap( - case dbipWindows: return "win"; - case dbipMac: return "mac"; - case dbipMacOld: return "mac32"; -+ case dbipHaiku: return "haiku"; - case dbipLinux64: return "linux"; - case dbipLinux32: return "linux32"; - } -@@ -1508,6 +1509,9 @@ bool checkReadyUpdate() { +@@ -501,6 +501,8 @@ bool ParseCommonMap( + return "mac32"; + } else if (Platform::IsMac()) { + return "mac"; ++ } else if (Platform::IsHaiku()) { ++ return "haiku"; + } else if (Platform::IsLinux32Bit()) { + return "linux32"; + } else if (Platform::IsLinux64Bit()) { +@@ -1513,6 +1515,9 @@ bool checkReadyUpdate() { #elif defined Q_OS_LINUX // Q_OS_MAC QString curUpdater = (cExeDir() + qsl("Updater")); QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater")); @@ -216,18 +207,6 @@ index 8aefb97..d54c8d1 100644 #endif // Q_OS_LINUX if (!updater.exists()) { QFileInfo current(curUpdater); -diff --git a/Telegram/SourceFiles/core/utils.h b/Telegram/SourceFiles/core/utils.h -index 4626702..2ef702b 100644 ---- a/Telegram/SourceFiles/core/utils.h -+++ b/Telegram/SourceFiles/core/utils.h -@@ -347,6 +347,7 @@ enum DBIPlatform { - dbipLinux64 = 2, - dbipLinux32 = 3, - dbipMacOld = 4, -+ dbipHaiku = 5, - }; - - enum DBIPeerReportSpamStatus { diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp index 0ac3579..14dbbc7 100644 --- a/Telegram/SourceFiles/media/audio/media_audio.cpp @@ -573,6 +552,110 @@ index 0000000..248d8a8 + +} // namespace DesktopEnvironment +} // namespace Platform +diff --git a/Telegram/SourceFiles/platform/haiku/info_haiku.cpp b/Telegram/SourceFiles/platform/haiku/info_haiku.cpp +new file mode 100644 +index 0000000..a939825 +--- /dev/null ++++ b/Telegram/SourceFiles/platform/haiku/info_haiku.cpp +@@ -0,0 +1,41 @@ ++/* ++This file is part of Telegram Desktop for Haiku, ++ ++You can redistribute it and/or modify it under the terms of the ++GNU General Public License as published by the Free Software Foundation, ++either version 3 of the License, or (at your option) any later version. ++ ++It is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE ++Copyright (c) 2019 Gerasim Troeglazov, 3dEyes@gmail.com ++*/ ++ ++#include "platform/haiku/info_haiku.h" ++ ++namespace Platform { ++ ++QString DeviceModelPretty() { ++ return "PC"; ++} ++ ++QString SystemVersionPretty() { ++ return "Haiku"; ++} ++ ++QString SystemCountry() { ++ return QString(); ++} ++ ++QString SystemLanguage() { ++ return QString(); ++} ++ ++QDate WhenSystemBecomesOutdated() { ++ return QDate(); ++} ++ ++} // namespace Platform +diff --git a/Telegram/SourceFiles/platform/haiku/info_haiku.h b/Telegram/SourceFiles/platform/haiku/info_haiku.h +new file mode 100644 +index 0000000..32f2da5 +--- /dev/null ++++ b/Telegram/SourceFiles/platform/haiku/info_haiku.h +@@ -0,0 +1,51 @@ ++/* ++This file is part of Telegram Desktop for Haiku, ++ ++You can redistribute it and/or modify it under the terms of the ++GNU General Public License as published by the Free Software Foundation, ++either version 3 of the License, or (at your option) any later version. ++ ++It is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE ++Copyright (c) 2019 Gerasim Troeglazov, 3dEyes@gmail.com ++*/ ++ ++#pragma once ++ ++#include "platform/platform_info.h" ++ ++namespace Platform { ++ ++inline constexpr bool IsHaiku() { ++ return true; ++} ++ ++inline constexpr bool IsWindows() { return false; } ++inline constexpr bool IsWindowsStoreBuild() { return false; } ++inline bool IsWindowsXPOrGreater() { return false; } ++inline bool IsWindowsVistaOrGreater() { return false; } ++inline bool IsWindows7OrGreater() { return false; } ++inline bool IsWindows8OrGreater() { return false; } ++inline bool IsWindows8Point1OrGreater() { return false; } ++inline bool IsWindows10OrGreater() { return false; } ++inline constexpr bool IsMac() { return false; } ++inline constexpr bool IsMacOldBuild() { return false; } ++inline constexpr bool IsMacStoreBuild() { return false; } ++inline bool IsMac10_6OrGreater() { return false; } ++inline bool IsMac10_7OrGreater() { return false; } ++inline bool IsMac10_8OrGreater() { return false; } ++inline bool IsMac10_9OrGreater() { return false; } ++inline bool IsMac10_10OrGreater() { return false; } ++inline bool IsMac10_11OrGreater() { return false; } ++inline bool IsMac10_12OrGreater() { return false; } ++inline bool IsMac10_13OrGreater() { return false; } ++inline bool IsMac10_14OrGreater() { return false; } ++inline constexpr bool IsLinux() { return false; } ++inline constexpr bool IsLinux32Bit() { return false; } ++inline constexpr bool IsLinux64Bit() { return false; } ++ ++} // namespace Platform diff --git a/Telegram/SourceFiles/platform/haiku/launcher_haiku.cpp b/Telegram/SourceFiles/platform/haiku/launcher_haiku.cpp new file mode 100644 index 0000000..7cae4cc @@ -687,10 +770,10 @@ index 0000000..54073f5 +} // namespace Platform diff --git a/Telegram/SourceFiles/platform/haiku/main_window_haiku.cpp b/Telegram/SourceFiles/platform/haiku/main_window_haiku.cpp new file mode 100644 -index 0000000..ae1a9d2 +index 0000000..45def85 --- /dev/null +++ b/Telegram/SourceFiles/platform/haiku/main_window_haiku.cpp -@@ -0,0 +1,128 @@ +@@ -0,0 +1,129 @@ +/* +This file is part of Telegram Desktop for Haiku, + @@ -719,7 +802,8 @@ index 0000000..ae1a9d2 + +namespace Platform { + -+MainWindow::MainWindow() { ++MainWindow::MainWindow(not_null controller) ++: Window::MainWindow(controller) { + connect(&_psCheckStatusIconTimer, SIGNAL(timeout()), this, SLOT(psStatusIconCheck())); + _psCheckStatusIconTimer.setSingleShot(false); + @@ -821,7 +905,7 @@ index 0000000..ae1a9d2 +} // namespace Platform diff --git a/Telegram/SourceFiles/platform/haiku/main_window_haiku.h b/Telegram/SourceFiles/platform/haiku/main_window_haiku.h new file mode 100644 -index 0000000..113ac3a +index 0000000..5d27c4e --- /dev/null +++ b/Telegram/SourceFiles/platform/haiku/main_window_haiku.h @@ -0,0 +1,73 @@ @@ -851,7 +935,7 @@ index 0000000..113ac3a + Q_OBJECT + +public: -+ MainWindow(); ++ explicit MainWindow(not_null controller); + + void psFirstShow(); + void psInitSysMenu(); @@ -1351,10 +1435,10 @@ index 0000000..25c8e26 +} // namespace Platform diff --git a/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp b/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp new file mode 100644 -index 0000000..c71d8b3 +index 0000000..09d6b61 --- /dev/null +++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp -@@ -0,0 +1,419 @@ +@@ -0,0 +1,411 @@ +/* +This file is part of Telegram Desktop for Haiku, + @@ -1678,14 +1762,6 @@ index 0000000..c71d8b3 + qApp->setWindowIcon(icon); +} + -+QString SystemCountry() { -+ return QString(); -+} -+ -+QString SystemLanguage() { -+ return QString(); -+} -+ +void RegisterCustomScheme() { +} + @@ -1900,6 +1976,30 @@ index 0000000..90c58bc +//ool linuxMoveFile(const char *from, const char *to); + +bool psLaunchMaps(const LocationCoords &coords); +diff --git a/Telegram/SourceFiles/platform/linux/info_linux.h b/Telegram/SourceFiles/platform/linux/info_linux.h +index f909003..169e220 100644 +--- a/Telegram/SourceFiles/platform/linux/info_linux.h ++++ b/Telegram/SourceFiles/platform/linux/info_linux.h +@@ -31,6 +31,7 @@ inline constexpr bool IsLinux64Bit() { + #endif // Q_OS_LINUX64 + } + ++inline constexpr bool IsHaiku() { return false; } + inline constexpr bool IsWindows() { return false; } + inline constexpr bool IsWindowsStoreBuild() { return false; } + inline bool IsWindowsXPOrGreater() { return false; } +diff --git a/Telegram/SourceFiles/platform/mac/info_mac.h b/Telegram/SourceFiles/platform/mac/info_mac.h +index befd1b4..d5eb9a0 100644 +--- a/Telegram/SourceFiles/platform/mac/info_mac.h ++++ b/Telegram/SourceFiles/platform/mac/info_mac.h +@@ -31,6 +31,7 @@ inline constexpr bool IsMacStoreBuild() { + #endif // OS_MAC_STORE + } + ++inline constexpr bool IsHaiku() { return false; } + inline constexpr bool IsWindows() { return false; } + inline constexpr bool IsWindowsStoreBuild() { return false; } + inline bool IsWindowsXPOrGreater() { return false; } diff --git a/Telegram/SourceFiles/platform/platform_audio.h b/Telegram/SourceFiles/platform/platform_audio.h index 7705b2e..cfc1fc9 100644 --- a/Telegram/SourceFiles/platform/platform_audio.h @@ -1926,6 +2026,28 @@ index 68b1058..2839790 100644 #elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX #include "platform/win/file_utilities_win.h" #endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_WIN +diff --git a/Telegram/SourceFiles/platform/platform_info.h b/Telegram/SourceFiles/platform/platform_info.h +index c8193c5..3457cfb 100644 +--- a/Telegram/SourceFiles/platform/platform_info.h ++++ b/Telegram/SourceFiles/platform/platform_info.h +@@ -37,6 +37,8 @@ namespace Platform { + [[nodiscard]] bool IsMac10_13OrGreater(); + [[nodiscard]] bool IsMac10_14OrGreater(); + ++[[nodiscard]] constexpr bool IsHaiku(); ++ + [[nodiscard]] constexpr bool IsLinux(); + [[nodiscard]] constexpr bool IsLinux32Bit(); + [[nodiscard]] constexpr bool IsLinux64Bit(); +@@ -47,6 +49,8 @@ namespace Platform { + #include "platform/mac/info_mac.h" + #elif defined Q_OS_LINUX // Q_OS_MAC + #include "platform/linux/info_linux.h" ++#elif defined Q_OS_HAIKU // Q_OS_HAIKU ++#include "platform/haiku/info_haiku.h" + #elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX + #include "platform/win/info_win.h" + #endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN diff --git a/Telegram/SourceFiles/platform/platform_launcher.h b/Telegram/SourceFiles/platform/platform_launcher.h index 27180d0..953b47f 100644 --- a/Telegram/SourceFiles/platform/platform_launcher.h @@ -1967,10 +2089,10 @@ index 692f4b4..a40f830 100644 #include "platform/win/notifications_manager_win.h" #endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h -index 919065a..0fddc51 100644 +index 5700cc9..ad1206b 100644 --- a/Telegram/SourceFiles/platform/platform_specific.h +++ b/Telegram/SourceFiles/platform/platform_specific.h -@@ -60,6 +60,8 @@ void finish(); +@@ -57,6 +57,8 @@ void finish(); #include "platform/mac/specific_mac.h" #elif defined Q_OS_LINUX // Q_OS_MAC #include "platform/linux/specific_linux.h" @@ -1993,6 +2115,18 @@ index 7aed20b..dc0212c 100644 namespace Platform { +diff --git a/Telegram/SourceFiles/platform/win/info_win.h b/Telegram/SourceFiles/platform/win/info_win.h +index a399684..c9df450 100644 +--- a/Telegram/SourceFiles/platform/win/info_win.h ++++ b/Telegram/SourceFiles/platform/win/info_win.h +@@ -23,6 +23,7 @@ inline constexpr bool IsWindowsStoreBuild() { + #endif // OS_WIN_STORE + } + ++inline constexpr bool IsHaiku() { return false; } + inline constexpr bool IsMac() { return false; } + inline constexpr bool IsMacOldBuild() { return false; } + inline constexpr bool IsMacStoreBuild() { return false; } diff --git a/Telegram/SourceFiles/rpl/operators_tests.cpp b/Telegram/SourceFiles/rpl/operators_tests.cpp index 548057f..feee15e 100644 --- a/Telegram/SourceFiles/rpl/operators_tests.cpp @@ -2041,32 +2175,19 @@ index 9c697fc..36ddf56 100644 #include #include -diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp -index dbe104f..86ef116 100644 ---- a/Telegram/SourceFiles/settings.cpp -+++ b/Telegram/SourceFiles/settings.cpp -@@ -73,6 +73,8 @@ DBIPlatform gPlatform = dbipWindows; - DBIPlatform gPlatform = dbipMacOld; - #elif defined Q_OS_MAC - DBIPlatform gPlatform = dbipMac; -+#elif defined Q_OS_HAIKU -+DBIPlatform gPlatform = dbipHaiku; - #elif defined Q_OS_LINUX64 - DBIPlatform gPlatform = dbipLinux64; - #elif defined Q_OS_LINUX32 diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp -index 154cfa9..a42b31e 100644 +index 2db069b..d4c3676 100644 --- a/Telegram/SourceFiles/settings/settings_notifications.cpp +++ b/Telegram/SourceFiles/settings/settings_notifications.cpp -@@ -585,6 +585,8 @@ void SetupNotificationsContent(not_null container) { +@@ -602,7 +602,7 @@ void SetupNotificationsContent(not_null container) { return LangKey(); - } else if (cPlatform() == dbipWindows) { + } else if (Platform::IsWindows()) { return lng_settings_use_windows; -+ } else if (cPlatform() == dbipHaiku) { -+ return lng_settings_use_native_notifications; - } else if (cPlatform() == dbipLinux32 - || cPlatform() == dbipLinux64) { +- } else if (Platform::IsLinux()) { ++ } else if (Platform::IsLinux() || Platform::IsHaiku()) { return lng_settings_use_native_notifications; + } + return LangKey(); diff --git a/Telegram/SourceFiles/storage/storage_encrypted_file_tests.cpp b/Telegram/SourceFiles/storage/storage_encrypted_file_tests.cpp index 4d522a9..1ca7dd0 100644 --- a/Telegram/SourceFiles/storage/storage_encrypted_file_tests.cpp @@ -2101,7 +2222,7 @@ index 7f5c191..649255c 100644 #define FOPEN_FUNC(filename, mode) fopen(filename, mode) #define FTELLO_FUNC(stream) ftello(stream) diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp -index b5263e6..a565cd7 100644 +index 2333bca..ba2675b 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -61,6 +61,7 @@ @@ -2112,7 +2233,7 @@ index b5263e6..a565cd7 100644 'openssl.gypi', 'qt.gypi', 'qt_moc.gypi', -@@ -95,7 +96,7 @@ +@@ -96,7 +97,7 @@ '<(src_loc)', '<(SHARED_INTERMEDIATE_DIR)', '<(emoji_suggestions_loc)', @@ -2184,7 +2305,7 @@ index cf7b447..c21a4b1 100644 gypScript = '../../../Libraries/gyp/gyp' gypFormats.append('cmake') diff --git a/Telegram/gyp/lib_base.gyp b/Telegram/gyp/lib_base.gyp -index 12dee1c..4876839 100644 +index 3ffbf7f..2a2db1b 100644 --- a/Telegram/gyp/lib_base.gyp +++ b/Telegram/gyp/lib_base.gyp @@ -36,7 +36,7 @@ @@ -2209,6 +2330,19 @@ index f73aabd..07c6b35 100644 '<(submodules_loc)/GSL/include', '<(submodules_loc)/variant/include', '<(submodules_loc)/crl/src', +diff --git a/Telegram/gyp/lib_lottie.gyp b/Telegram/gyp/lib_lottie.gyp +index 6ca841f..f797144 100644 +--- a/Telegram/gyp/lib_lottie.gyp ++++ b/Telegram/gyp/lib_lottie.gyp +@@ -43,7 +43,7 @@ + 'include_dirs': [ + '<(src_loc)', + '<(SHARED_INTERMEDIATE_DIR)', +- '<(libs_loc)/range-v3/include', ++ '<(submodules_loc)/range/include', + '<(libs_loc)/zlib', + '<(lottie_loc)', + '<(lottie_loc)/bodymovin', diff --git a/Telegram/gyp/lib_storage.gyp b/Telegram/gyp/lib_storage.gyp index d72f4b5..e8740b9 100644 --- a/Telegram/gyp/lib_storage.gyp @@ -2312,10 +2446,10 @@ index 3f91776..8f3e531 100644 'xcode_settings': { 'OTHER_LDFLAGS': [ diff --git a/Telegram/gyp/qt_moc.gypi b/Telegram/gyp/qt_moc.gypi -index f350da8..f84a2d2 100644 +index 75424d4..436e9b5 100644 --- a/Telegram/gyp/qt_moc.gypi +++ b/Telegram/gyp/qt_moc.gypi -@@ -12,7 +12,7 @@ +@@ -15,7 +15,7 @@ '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp', ], 'action': [ @@ -2528,10 +2662,10 @@ index d9147d6..16c9d3f 100644 'variables': { 'qrc_files': [ diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index 3d20ee0..2109899 100644 +index 40351f7..3bb99bb 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -568,6 +568,18 @@ +@@ -576,6 +576,20 @@ <(src_loc)/platform/linux/notifications_manager_linux.h <(src_loc)/platform/linux/specific_linux.cpp <(src_loc)/platform/linux/specific_linux.h @@ -2547,9 +2681,11 @@ index 3d20ee0..2109899 100644 +<(src_loc)/platform/haiku/main_window_haiku.h +<(src_loc)/platform/haiku/specific_haiku.cpp +<(src_loc)/platform/haiku/specific_haiku.h ++<(src_loc)/platform/haiku/info_haiku.cpp ++<(src_loc)/platform/haiku/info_haiku.h <(src_loc)/platform/mac/file_utilities_mac.mm <(src_loc)/platform/mac/file_utilities_mac.h - <(src_loc)/platform/mac/launcher_mac.mm + <(src_loc)/platform/mac/info_mac.mm diff --git a/Telegram/gyp/utils.gyp b/Telegram/gyp/utils.gyp index 622462e..e3ba800 100644 --- a/Telegram/gyp/utils.gyp @@ -2571,26 +2707,3 @@ index 622462e..e3ba800 100644 -- 2.21.0 - -From 51d1bf639cd379e5aac864fd8f4f1f7be6071723 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sat, 1 Jun 2019 21:36:20 +1000 -Subject: Fix range include path - - -diff --git a/Telegram/gyp/lib_lottie.gyp b/Telegram/gyp/lib_lottie.gyp -index 6ca841f..f797144 100644 ---- a/Telegram/gyp/lib_lottie.gyp -+++ b/Telegram/gyp/lib_lottie.gyp -@@ -43,7 +43,7 @@ - 'include_dirs': [ - '<(src_loc)', - '<(SHARED_INTERMEDIATE_DIR)', -- '<(libs_loc)/range-v3/include', -+ '<(submodules_loc)/range/include', - '<(libs_loc)/zlib', - '<(lottie_loc)', - '<(lottie_loc)/bodymovin', --- -2.21.0 - diff --git a/net-im/telegram-desktop/telegram_desktop-1.7.3.recipe b/net-im/telegram-desktop/telegram_desktop-1.7.7.recipe similarity index 97% rename from net-im/telegram-desktop/telegram_desktop-1.7.3.recipe rename to net-im/telegram-desktop/telegram_desktop-1.7.7.recipe index 7d5c5003e..701991ddf 100644 --- a/net-im/telegram-desktop/telegram_desktop-1.7.3.recipe +++ b/net-im/telegram-desktop/telegram_desktop-1.7.7.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2013-2019 Telegram" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="d973223d95bf3791c3af55c07742d304716ead8f6cc57ad9a16e1812ce127605" +CHECKSUM_SHA256="b3ca072eb4c6e30fd17d34daa129d6211de427fa3953f4020b27a02e65400ef1" SOURCE_FILENAME="tdesktop-$portVersion.tar.gz" SOURCE_DIR="tdesktop-$portVersion" srcGitRev_2="a19a0aff644127d8089f6a4ac18119ec5247dbd0" @@ -36,9 +36,9 @@ srcGitRev_8="7cc9639699f64b750c0b82333dced9ea77e8436e" SOURCE_URI_8="https://github.com/Cyan4973/xxHash/archive/$srcGitRev_8.tar.gz" CHECKSUM_SHA256_8="0d1e2b4ae15f98acc49084e23ba94853dba2b0f654865ecedb1072b3959421bf" SOURCE_FILENAME_8="xxHash-$srcGitRev_8.tar.gz" -srcGitRev_9="ddccffed3c87ce6763dd73a6453b1edfb1389743" +srcGitRev_9="a3fac9db920b167a5f91d678ee7968f100f6fe51" SOURCE_URI_9="https://github.com/telegramdesktop/qtlottie/archive/$srcGitRev_9.tar.gz" -CHECKSUM_SHA256_9="a3efeebad3dafeb49aa76542c451eb79c997b127e17d6fdb61794b60afad0e91" +CHECKSUM_SHA256_9="16d4cda12e340b89007c610070c67130e87f60a85fd1206339ac92b2c71ce848" SOURCE_FILENAME_9="qtlottie-$srcGitRev_9.tar.gz" SOURCE_URI_10="https://salsa.debian.org/debian/telegram-desktop/raw/debian/master/debian/rules#noarchive" CHECKSUM_SHA256_10="86382a56ef7163eedbfae7e4daf491e9d3e7a8811ff2c769e6d7c143def7727f"