diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.16-libtgvoip.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.3.17-libtgvoip.patchset similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.16-libtgvoip.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.3.17-libtgvoip.patchset diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.16-systemqt.patch b/net-im/telegram-desktop/patches/telegram_desktop-1.3.17-systemqt.patch similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.16-systemqt.patch rename to net-im/telegram-desktop/patches/telegram_desktop-1.3.17-systemqt.patch diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.16.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.3.17.patchset similarity index 98% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.16.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.3.17.patchset index e2b1bc6b5..a0e566017 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.3.16.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.3.17.patchset @@ -1,6 +1,6 @@ -From 9ead81be3d11cff9ae7a7e5e818d3d4706b4444d Mon Sep 17 00:00:00 2001 +From 5e85126e91e7fa202902941c52b0e96c0636d9cf Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 24 Sep 2018 00:18:28 +1000 +Date: Fri, 28 Sep 2018 19:42:05 +1000 Subject: Add Haiku support @@ -182,10 +182,10 @@ index 8a420c7..0ba85bd 100644 gPlatformString = qsl("Linux64bit"); break; diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp -index 92fc35d..cf29c3a 100644 +index 1abe33b..554655a 100644 --- a/Telegram/SourceFiles/core/update_checker.cpp +++ b/Telegram/SourceFiles/core/update_checker.cpp -@@ -633,6 +633,7 @@ bool ParseCommonMap( +@@ -636,6 +636,7 @@ bool ParseCommonMap( case dbipWindows: return "win"; case dbipMac: return "mac"; case dbipMacOld: return "mac32"; @@ -193,7 +193,7 @@ index 92fc35d..cf29c3a 100644 case dbipLinux64: return "linux"; case dbipLinux32: return "linux32"; } -@@ -2068,6 +2069,9 @@ bool checkReadyUpdate() { +@@ -2071,6 +2072,9 @@ bool checkReadyUpdate() { #elif defined Q_OS_LINUX // Q_OS_MAC QString curUpdater = (cExeDir() + qsl("Updater")); QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater")); @@ -216,10 +216,10 @@ index 0cd4059..1047a5f 100644 enum DBIPeerReportSpamStatus { diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp -index 5f2e3aa..a3cf2c6 100644 +index 5479891..b48fe00 100644 --- a/Telegram/SourceFiles/export/data/export_data_types.cpp +++ b/Telegram/SourceFiles/export/data/export_data_types.cpp -@@ -212,6 +212,8 @@ Image ParseMaxImage( +@@ -225,6 +225,8 @@ Image ParseMaxImage( const MTPVector &data, const QString &suggestedPath) { auto result = Image(); @@ -228,7 +228,7 @@ index 5f2e3aa..a3cf2c6 100644 result.file.suggestedPath = suggestedPath; auto maxArea = int64(0); -@@ -234,6 +236,7 @@ Image ParseMaxImage( +@@ -247,6 +249,7 @@ Image ParseMaxImage( } }); } @@ -236,15 +236,15 @@ index 5f2e3aa..a3cf2c6 100644 return result; } -@@ -388,6 +391,7 @@ Document ParseDocument( - const MTPDocument &data, - const QString &suggestedFolder) { +@@ -406,6 +409,7 @@ Document ParseDocument( + const QString &suggestedFolder, + TimeId date) { auto result = Document(); +#ifndef __HAIKU__ data.match([&](const MTPDdocument &data) { result.id = data.vid.v; result.date = data.vdate.v; -@@ -424,6 +428,7 @@ Document ParseDocument( +@@ -442,6 +446,7 @@ Document ParseDocument( }, [&](const MTPDdocumentEmpty &data) { result.id = data.vid.v; }); @@ -252,7 +252,7 @@ index 5f2e3aa..a3cf2c6 100644 return result; } -@@ -1017,6 +1022,7 @@ Message ParseMessage( +@@ -1043,6 +1048,7 @@ Message ParseMessage( const MTPMessage &data, const QString &mediaFolder) { auto result = Message(); @@ -260,7 +260,7 @@ index 5f2e3aa..a3cf2c6 100644 data.match([&](const auto &data) { result.id = data.vid.v; if constexpr (!MTPDmessageEmpty::Is()) { -@@ -1103,6 +1109,7 @@ Message ParseMessage( +@@ -1131,6 +1137,7 @@ Message ParseMessage( }, [&](const MTPDmessageEmpty &data) { result.id = data.vid.v; }); @@ -269,7 +269,7 @@ index 5f2e3aa..a3cf2c6 100644 } diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp -index c882ba8..a1ebad4 100644 +index dee4a09..efb0ab2 100644 --- a/Telegram/SourceFiles/export/export_api_wrap.cpp +++ b/Telegram/SourceFiles/export/export_api_wrap.cpp @@ -719,6 +719,8 @@ void ApiWrap::requestUserpics( @@ -308,11 +308,11 @@ index c882ba8..a1ebad4 100644 void ApiWrap::requestChatMessages( diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp -index 74edb3e..bcf4875 100644 +index 3236788..822d906 100644 --- a/Telegram/SourceFiles/logs.cpp +++ b/Telegram/SourceFiles/logs.cpp @@ -333,7 +333,7 @@ void start(not_null launcher) { - if (cBetaVersion()) { + if (cAlphaVersion()) { SetDebugEnabled(true); workingDirChosen = true; -#if defined Q_OS_MAC || defined Q_OS_LINUX @@ -2098,7 +2098,7 @@ index 9c697fc..36ddf56 100644 #include #include diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp -index 680f347..cb0d5a3 100644 +index 48c947d..a3784de 100644 --- a/Telegram/SourceFiles/settings.cpp +++ b/Telegram/SourceFiles/settings.cpp @@ -77,6 +77,8 @@ DBIPlatform gPlatform = dbipWindows; @@ -2110,19 +2110,19 @@ index 680f347..cb0d5a3 100644 #elif defined Q_OS_LINUX64 DBIPlatform gPlatform = dbipLinux64; #elif defined Q_OS_LINUX32 -diff --git a/Telegram/SourceFiles/settings/settings_notifications_widget.cpp b/Telegram/SourceFiles/settings/settings_notifications_widget.cpp -index 62bbe64..f0c06f9 100644 ---- a/Telegram/SourceFiles/settings/settings_notifications_widget.cpp -+++ b/Telegram/SourceFiles/settings/settings_notifications_widget.cpp -@@ -69,7 +69,7 @@ void NotificationsWidget::createNotificationsControls() { - if (Platform::Notifications::Supported()) { - #ifdef Q_OS_WIN - nativeNotificationsLabel = lang(lng_settings_use_windows); --#elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 // Q_OS_WIN -+#elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 || defined Q_OS_HAIKU // Q_OS_WIN - nativeNotificationsLabel = lang(lng_settings_use_native_notifications); - #endif // Q_OS_WIN || Q_OS_LINUX64 || Q_OS_LINUX32 - } +diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp +index 9ece38f..0bc6996 100644 +--- a/Telegram/SourceFiles/settings/settings_notifications.cpp ++++ b/Telegram/SourceFiles/settings/settings_notifications.cpp +@@ -66,6 +66,8 @@ void SetupNotificationsContent(not_null container) { + return LangKey(); + } else if (cPlatform() == dbipWindows) { + return lng_settings_use_windows; ++ } else if (cPlatform() == dbipHaiku) { ++ return lng_settings_use_native_notifications; + } else if (cPlatform() == dbipLinux32 + || cPlatform() == dbipLinux64) { + return lng_settings_use_native_notifications; 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 @@ -2378,7 +2378,7 @@ index 1129a95..fd1e3bd 100644 '-no-compress', '<(RULE_INPUT_PATH)', diff --git a/Telegram/gyp/refresh.sh b/Telegram/gyp/refresh.sh -index b14a916..0d1e0cc 100755 +index c42c10f..e2483e9 100755 --- a/Telegram/gyp/refresh.sh +++ b/Telegram/gyp/refresh.sh @@ -23,6 +23,14 @@ if [ "$MySystem" == "Linux" ]; then @@ -2592,10 +2592,10 @@ index 77b126d..6c27563 100644 'variables': { 'qrc_files': [ diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index 22cf886..fb0c0fa 100644 +index 0f24af7..9858cef 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -475,6 +475,18 @@ +@@ -477,6 +477,18 @@ <(src_loc)/platform/linux/notifications_manager_linux.h <(src_loc)/platform/linux/specific_linux.cpp <(src_loc)/platform/linux/specific_linux.h diff --git a/net-im/telegram-desktop/telegram_desktop-1.3.16.recipe b/net-im/telegram-desktop/telegram_desktop-1.3.17.recipe similarity index 98% rename from net-im/telegram-desktop/telegram_desktop-1.3.16.recipe rename to net-im/telegram-desktop/telegram_desktop-1.3.17.recipe index d59abf414..e51895c12 100644 --- a/net-im/telegram-desktop/telegram_desktop-1.3.16.recipe +++ b/net-im/telegram-desktop/telegram_desktop-1.3.17.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2013-2018 Telegram" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="0ebb775dc6535eb3fef290d292b528073e02b4777068425c31f735091902d966" +CHECKSUM_SHA256="28c81ae5faeeb06c5ea70a08cc9e78aea62db080f3fec89f685a3a733f50701e" SOURCE_FILENAME="tdesktop-$portVersion.tar.gz" SOURCE_DIR="tdesktop-$portVersion" srcGitRev_2="697eea96aa90205db4fc368df4127eef56b2a5c6"