diff options
| author | Steve Wills <swills@FreeBSD.org> | 2018-10-14 19:35:18 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2018-10-14 19:35:18 +0000 |
| commit | 902f517930c309c534d3c4ca7d04a2856eb18afe (patch) | |
| tree | a8d23249cf7fb4c5d2a3a043c995bb3fb3a8ed7b /net-im/telegram-desktop | |
| parent | 91079fc1de918cfe1a2b17ae6665b8f3f079d47a (diff) | |
| download | ports-902f517930c309c534d3c4ca7d04a2856eb18afe.tar.gz ports-902f517930c309c534d3c4ca7d04a2856eb18afe.zip | |
net-im/telegram-desktop: update to 1.4.2
PR: 232212
Submitted by: Henry Hu <henry.hu.sh@gmail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=482110
Diffstat (limited to 'net-im/telegram-desktop')
7 files changed, 23 insertions, 22 deletions
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index 0c491aa939af..103b83d550ec 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -2,7 +2,7 @@ PORTNAME= telegram-desktop DISTVERSIONPREFIX= v -DISTVERSION= 1.4.0 +DISTVERSION= 1.4.2 CATEGORIES= net-im MAINTAINER= henry.hu.sh@gmail.com diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo index 7be65fbbfa3a..f83a7ed6616b 100644 --- a/net-im/telegram-desktop/distinfo +++ b/net-im/telegram-desktop/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1538948703 -SHA256 (telegramdesktop-tdesktop-v1.4.0_GH0.tar.gz) = e3ee54461dae5552b41b6b56f12225a4d546118b2e2d4d864442e4462da97a9b -SIZE (telegramdesktop-tdesktop-v1.4.0_GH0.tar.gz) = 17318129 +TIMESTAMP = 1539390512 +SHA256 (telegramdesktop-tdesktop-v1.4.2_GH0.tar.gz) = f8e90949e2b52c2df7dca35d33731880fa8f3d526431ad82f197ece7dce773aa +SIZE (telegramdesktop-tdesktop-v1.4.2_GH0.tar.gz) = 17340759 SHA256 (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 8cdf2a345897bda1aaabffd4496dffe263768cef3e4254e74ae63545c8e12cc2 SIZE (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 375264 SHA256 (mapbox-variant-550ac2f_GH0.tar.gz) = 7ab3aa7c9fa672027f13721584df5f7ec09c0ecca499d374c6ac76e147ef7354 diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h index d1bb2baa978d..7a8a22367920 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/core/utils.h.orig 2018-09-28 13:08:38 UTC +--- Telegram/SourceFiles/core/utils.h.orig 2018-10-09 21:21:48 UTC +++ Telegram/SourceFiles/core/utils.h -@@ -411,6 +411,7 @@ enum DBIPlatform { +@@ -406,6 +406,7 @@ enum DBIPlatform { dbipLinux64 = 2, dbipLinux32 = 3, dbipMacOld = 4, diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp index 5b17d997b64d..ab134d8ff06a 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp @@ -1,16 +1,16 @@ ---- Telegram/SourceFiles/logs.cpp.orig 2018-09-28 13:08:38 UTC +--- Telegram/SourceFiles/logs.cpp.orig 2018-10-09 21:21:48 UTC +++ Telegram/SourceFiles/logs.cpp -@@ -332,7 +332,7 @@ void start(not_null<Core::Launcher*> lau - +@@ -333,7 +333,7 @@ void start(not_null<Core::Launcher*> lau if (cAlphaVersion()) { workingDirChosen = true; + -#if defined Q_OS_MAC || defined Q_OS_LINUX +#if defined Q_OS_MAC || defined Q_OS_LINUX || defined Q_OS_FREEBSD } else { - #ifdef _DEBUG - cForceWorkingDir(cExeDir()); -@@ -346,15 +346,15 @@ void start(not_null<Core::Launcher*> lau - #endif // !_DEBUG + if (!cWorkingDir().isEmpty()) { + // This value must come from TelegramForcePortable +@@ -348,16 +348,16 @@ void start(not_null<Core::Launcher*> lau + } workingDirChosen = true; -#if defined Q_OS_LINUX && !defined _DEBUG // fix first version @@ -24,15 +24,16 @@ } else { cForceWorkingDir(psAppDataPath()); workingDirChosen = true; + -#elif defined OS_WIN_STORE // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT +#elif defined OS_WIN_STORE // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_FREEBSD #ifdef _DEBUG cForceWorkingDir(cExeDir()); #else // _DEBUG -@@ -368,7 +368,7 @@ void start(not_null<Core::Launcher*> lau - cForceWorkingDir(cWorkingDir()); +@@ -374,7 +374,7 @@ void start(not_null<Core::Launcher*> lau workingDirChosen = true; } + -#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || OS_WIN_STORE +#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || OS_WIN_STORE || Q_OS_FREEBSD } diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp index 46849b423da8..ed6f5e47a62d 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/settings.cpp.orig 2018-08-04 18:53:40 UTC +--- Telegram/SourceFiles/settings.cpp.orig 2018-10-09 21:21:48 UTC +++ Telegram/SourceFiles/settings.cpp -@@ -81,6 +81,8 @@ DBIPlatform gPlatform = dbipMac; +@@ -79,6 +79,8 @@ DBIPlatform gPlatform = dbipMac; DBIPlatform gPlatform = dbipLinux64; #elif defined Q_OS_LINUX32 DBIPlatform gPlatform = dbipLinux32; diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp index b2a25abe1770..5f4aed19c4bd 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/window/main_window.cpp.orig 2018-08-04 18:53:40 UTC +--- Telegram/SourceFiles/window/main_window.cpp.orig 2018-10-09 21:21:48 UTC +++ Telegram/SourceFiles/window/main_window.cpp -@@ -421,7 +421,7 @@ bool MainWindow::minimizeToTray() { +@@ -496,7 +496,7 @@ bool MainWindow::minimizeToTray() { } void MainWindow::reActivateWindow() { @@ -9,7 +9,7 @@ const auto reActivate = [=] { if (const auto w = App::wnd()) { if (auto f = QApplication::focusWidget()) { -@@ -436,7 +436,7 @@ void MainWindow::reActivateWindow() { +@@ -511,7 +511,7 @@ void MainWindow::reActivateWindow() { }; crl::on_main(this, reActivate); App::CallDelayed(200, this, reActivate); diff --git a/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt b/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt index 6f01715a5f8e..25d09fc5342c 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt +++ b/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt @@ -1,6 +1,6 @@ ---- Telegram/gyp/telegram_sources.txt.orig 2018-09-28 13:08:38 UTC +--- Telegram/gyp/telegram_sources.txt.orig 2018-10-09 21:21:48 UTC +++ Telegram/gyp/telegram_sources.txt -@@ -755,14 +755,7 @@ +@@ -761,14 +761,7 @@ <(emoji_suggestions_loc)/emoji_suggestions.cpp <(emoji_suggestions_loc)/emoji_suggestions.h |