From 51015a84ef32ebbc92c7c7bc1ebd68b871f79998 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 18 Aug 2018 20:19:36 +1000 Subject: [PATCH] Telegram: bump version --- ...elegram_desktop-1.3.12-libtgvoip.patchset} | 0 ...=> telegram_desktop-1.3.12-systemqt.patch} | 0 ...chset => telegram_desktop-1.3.12.patchset} | 26 +++++++++++++++++++ ....recipe => telegram_desktop-1.3.12.recipe} | 18 ++++++------- 4 files changed, 35 insertions(+), 9 deletions(-) rename net-im/telegram-desktop/patches/{telegram_desktop-1.3.10-libtgvoip.patchset => telegram_desktop-1.3.12-libtgvoip.patchset} (100%) rename net-im/telegram-desktop/patches/{telegram_desktop-1.3.10-systemqt.patch => telegram_desktop-1.3.12-systemqt.patch} (100%) rename net-im/telegram-desktop/patches/{telegram_desktop-1.3.10.patchset => telegram_desktop-1.3.12.patchset} (98%) rename net-im/telegram-desktop/{telegram_desktop-1.3.10.recipe => telegram_desktop-1.3.12.recipe} (87%) diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.10-libtgvoip.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.3.12-libtgvoip.patchset similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.10-libtgvoip.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.3.12-libtgvoip.patchset diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.10-systemqt.patch b/net-im/telegram-desktop/patches/telegram_desktop-1.3.12-systemqt.patch similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.10-systemqt.patch rename to net-im/telegram-desktop/patches/telegram_desktop-1.3.12-systemqt.patch diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.10.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.3.12.patchset similarity index 98% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.10.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.3.12.patchset index adf756bd6..3b7cf4a89 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.3.10.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.3.12.patchset @@ -2443,3 +2443,29 @@ index 96b6190..171c216 100644 ], -- 2.16.4 + + +From ddfc648224733852fddc43ece708e7356248853f Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 18 Aug 2018 15:45:49 +1000 +Subject: Add IsApplicationActive function for Haiku platform + + +diff --git a/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp b/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp +index 1928257..4ce6ac6 100644 +--- a/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp ++++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp +@@ -327,6 +327,10 @@ bool TranslucentWindowsSupported(QPoint globalPosition) { + return false; + } + ++bool IsApplicationActive() { ++ return static_cast(QApplication::instance())->activeWindow() != nullptr; ++} ++ + QString SystemCountry() { + return QString(); + } +-- +2.16.4 + diff --git a/net-im/telegram-desktop/telegram_desktop-1.3.10.recipe b/net-im/telegram-desktop/telegram_desktop-1.3.12.recipe similarity index 87% rename from net-im/telegram-desktop/telegram_desktop-1.3.10.recipe rename to net-im/telegram-desktop/telegram_desktop-1.3.12.recipe index 364704867..728252304 100644 --- a/net-im/telegram-desktop/telegram_desktop-1.3.10.recipe +++ b/net-im/telegram-desktop/telegram_desktop-1.3.12.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="2cdf89859be93196def45145fabbbbeff6c54743f84fe2a1809d66644aac243c" +CHECKSUM_SHA256="4d19fdc85f0c792c6c073062dacf707fc976581a8d249fa91757015cceb7662b" SOURCE_DIR="tdesktop-$portVersion" srcGitRev_2="697eea96aa90205db4fc368df4127eef56b2a5c6" SOURCE_URI_2="https://github.com/telegramdesktop/libtgvoip/archive/$srcGitRev_2.zip" @@ -19,9 +19,9 @@ CHECKSUM_SHA256_4="320e2d7707aaa6f7bcc0d6ddc95e2e4413b433ddcc1c8afa0a93fb85a47db srcGitRev_5="5ca44b68721833ae3731802ed99af67c6f38a53a" SOURCE_URI_5="https://github.com/philsquared/Catch/archive/$srcGitRev_5.zip" CHECKSUM_SHA256_5="bec93e64dea2dd0c6662a75a81cdd1747a753ccd86025ef436b7d2fac3b408d2" -srcGitRev_6="9bc641f2d4ab140a84aea64c7f2d4669f7633246" +srcGitRev_6="527ad273b683d52c5adf5b45b73c6466aa0d0cf0" SOURCE_URI_6="https://github.com/telegramdesktop/crl/archive/$srcGitRev_6.zip" -CHECKSUM_SHA256_6="563424b0a56c8a3c7b05d82a0e3551a467051057b53e8f7e68f4815921e6953a" +CHECKSUM_SHA256_6="a52c86d3d0cb21c20ed81d4d81b61a5bc4fbb5eaef407a8fe9ea5cae89e80345" srcGitRev_7="4b10be9cbadd7d0880437f48f875185589fd86d3" SOURCE_URI_7="https://github.com/ericniebler/range-v3/archive/$srcGitRev_7.zip" CHECKSUM_SHA256_7="67095606bd533dcffefb6a9ae6be0dc5176d77912928b60ad4e60cc66fc611c7" @@ -101,12 +101,12 @@ BUILD() { # link submodules rm -rf Telegram/ThirdParty/{libtgvoip,variant,GSL,Catch,crl,range} - ln -sfn $sourceDir2/libtgvoip-$COMMIT_2 Telegram/ThirdParty/libtgvoip - ln -sfn $sourceDir3/variant-$COMMIT_3 Telegram/ThirdParty/variant - ln -sfn $sourceDir4/GSL-$COMMIT_4 Telegram/ThirdParty/GSL - ln -sfn $sourceDir5/Catch2-$COMMIT_5 Telegram/ThirdParty/Catch - ln -sfn $sourceDir6/crl-$COMMIT_6 Telegram/ThirdParty/crl - ln -sfn $sourceDir7/range-v3-$COMMIT_7 Telegram/ThirdParty/range + ln -sfn $sourceDir2/libtgvoip-$srcGitRev_2 Telegram/ThirdParty/libtgvoip + ln -sfn $sourceDir3/variant-$srcGitRev_3 Telegram/ThirdParty/variant + ln -sfn $sourceDir4/GSL-$srcGitRev_4 Telegram/ThirdParty/GSL + ln -sfn $sourceDir5/Catch2-$srcGitRev_5 Telegram/ThirdParty/Catch + ln -sfn $sourceDir6/crl-$srcGitRev_6 Telegram/ThirdParty/crl + ln -sfn $sourceDir7/range-v3-$srcGitRev_7 Telegram/ThirdParty/range Telegram/gyp/refresh.sh ; cd out/Release # multi-job takes too much memory