From 9db92bc12e54685666e17094be2426c27a5396f0 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 30 Sep 2018 17:36:10 +1000 Subject: [PATCH] Telegram: bump version --- ...telegram_desktop-1.4.0-libtgvoip.patchset} | 0 ... => telegram_desktop-1.4.0-systemqt.patch} | 0 ...tchset => telegram_desktop-1.4.0.patchset} | 24 +++++++++---------- ...7.recipe => telegram_desktop-1.4.0.recipe} | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) rename net-im/telegram-desktop/patches/{telegram_desktop-1.3.17-libtgvoip.patchset => telegram_desktop-1.4.0-libtgvoip.patchset} (100%) rename net-im/telegram-desktop/patches/{telegram_desktop-1.3.17-systemqt.patch => telegram_desktop-1.4.0-systemqt.patch} (100%) rename net-im/telegram-desktop/patches/{telegram_desktop-1.3.17.patchset => telegram_desktop-1.4.0.patchset} (99%) rename net-im/telegram-desktop/{telegram_desktop-1.3.17.recipe => telegram_desktop-1.4.0.recipe} (98%) diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.17-libtgvoip.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.4.0-libtgvoip.patchset similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.17-libtgvoip.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.4.0-libtgvoip.patchset diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.17-systemqt.patch b/net-im/telegram-desktop/patches/telegram_desktop-1.4.0-systemqt.patch similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.17-systemqt.patch rename to net-im/telegram-desktop/patches/telegram_desktop-1.4.0-systemqt.patch diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.17.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.4.0.patchset similarity index 99% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.17.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.4.0.patchset index a0e566017..7429b5f20 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.3.17.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.4.0.patchset @@ -1,6 +1,6 @@ -From 5e85126e91e7fa202902941c52b0e96c0636d9cf Mon Sep 17 00:00:00 2001 +From 68c8bd7d3abacff92bba9157cee42bc29ceef215 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 28 Sep 2018 19:42:05 +1000 +Date: Sun, 30 Sep 2018 12:33:03 +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 1abe33b..554655a 100644 +index 0c71c39..32f29ee 100644 --- a/Telegram/SourceFiles/core/update_checker.cpp +++ b/Telegram/SourceFiles/core/update_checker.cpp -@@ -636,6 +636,7 @@ bool ParseCommonMap( +@@ -633,6 +633,7 @@ bool ParseCommonMap( case dbipWindows: return "win"; case dbipMac: return "mac"; case dbipMacOld: return "mac32"; @@ -193,7 +193,7 @@ index 1abe33b..554655a 100644 case dbipLinux64: return "linux"; case dbipLinux32: return "linux32"; } -@@ -2071,6 +2072,9 @@ bool checkReadyUpdate() { +@@ -2068,6 +2069,9 @@ bool checkReadyUpdate() { #elif defined Q_OS_LINUX // Q_OS_MAC QString curUpdater = (cExeDir() + qsl("Updater")); QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater")); @@ -308,12 +308,12 @@ index dee4a09..efb0ab2 100644 void ApiWrap::requestChatMessages( diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp -index 3236788..822d906 100644 +index c09b2ff..4a04e83 100644 --- a/Telegram/SourceFiles/logs.cpp +++ b/Telegram/SourceFiles/logs.cpp -@@ -333,7 +333,7 @@ void start(not_null launcher) { +@@ -332,7 +332,7 @@ void start(not_null launcher) { + if (cAlphaVersion()) { - SetDebugEnabled(true); workingDirChosen = true; -#if defined Q_OS_MAC || defined Q_OS_LINUX +#if defined Q_OS_MAC || defined Q_OS_LINUX || defined Q_OS_HAIKU @@ -2111,10 +2111,10 @@ index 48c947d..a3784de 100644 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 9ece38f..0bc6996 100644 +index 641e485..a3acf2c 100644 --- a/Telegram/SourceFiles/settings/settings_notifications.cpp +++ b/Telegram/SourceFiles/settings/settings_notifications.cpp -@@ -66,6 +66,8 @@ void SetupNotificationsContent(not_null container) { +@@ -552,6 +552,8 @@ void SetupNotificationsContent(not_null container) { return LangKey(); } else if (cPlatform() == dbipWindows) { return lng_settings_use_windows; @@ -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 0f24af7..9858cef 100644 +index 46bd016..f16a2f8 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -477,6 +477,18 @@ +@@ -475,6 +475,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.17.recipe b/net-im/telegram-desktop/telegram_desktop-1.4.0.recipe similarity index 98% rename from net-im/telegram-desktop/telegram_desktop-1.3.17.recipe rename to net-im/telegram-desktop/telegram_desktop-1.4.0.recipe index e51895c12..6b1b090a2 100644 --- a/net-im/telegram-desktop/telegram_desktop-1.3.17.recipe +++ b/net-im/telegram-desktop/telegram_desktop-1.4.0.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="28c81ae5faeeb06c5ea70a08cc9e78aea62db080f3fec89f685a3a733f50701e" +CHECKSUM_SHA256="e3ee54461dae5552b41b6b56f12225a4d546118b2e2d4d864442e4462da97a9b" SOURCE_FILENAME="tdesktop-$portVersion.tar.gz" SOURCE_DIR="tdesktop-$portVersion" srcGitRev_2="697eea96aa90205db4fc368df4127eef56b2a5c6"