Date: Sunday, September 2, 2018 @ 19:12:29 Author: svenstaro Revision: 376079
upgpkg: telegram-desktop 1.3.13-1 Added: telegram-desktop/trunk/401e1166f9de4c4a19aba79f9afcd611eaa6e30d.patch telegram-desktop/trunk/46946c73236285649950071632beb3f3e855b2ea.patch Modified: telegram-desktop/trunk/PKGBUILD ------------------------------------------------+ 401e1166f9de4c4a19aba79f9afcd611eaa6e30d.patch | 27 +++++++++++++++++++++++ 46946c73236285649950071632beb3f3e855b2ea.patch | 27 +++++++++++++++++++++++ PKGBUILD | 12 +++++++--- 3 files changed, 63 insertions(+), 3 deletions(-) Added: 401e1166f9de4c4a19aba79f9afcd611eaa6e30d.patch =================================================================== --- 401e1166f9de4c4a19aba79f9afcd611eaa6e30d.patch (rev 0) +++ 401e1166f9de4c4a19aba79f9afcd611eaa6e30d.patch 2018-09-02 19:12:29 UTC (rev 376079) @@ -0,0 +1,27 @@ +From 401e1166f9de4c4a19aba79f9afcd611eaa6e30d Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev <guriev...@ya.ru> +Date: Fri, 31 Aug 2018 00:28:27 +0300 +Subject: [PATCH] Workaround internal compiler error in GCC + +Closes: #5111 +--- + Telegram/SourceFiles/apiwrap.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp +index 3301b6f04..c3e3c6f16 100644 +--- a/Telegram/SourceFiles/apiwrap.cpp ++++ b/Telegram/SourceFiles/apiwrap.cpp +@@ -2390,7 +2390,11 @@ void ApiWrap::requestFileReference( + + request(std::move(data)).done([=](const auto &result) { + const auto parsed = Data::GetFileReferences(result); +- for (const auto &[origin, reference] : parsed) { ++ for (const auto &p : parsed) { ++ // Unpack here the parsed pair by hand to workaround a GCC bug. ++ // See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=87122 ++ const auto &origin = p.first; ++ const auto &reference = p.second; + const auto documentId = base::get_if<DocumentFileLocationId>( + &origin); + if (documentId) { Added: 46946c73236285649950071632beb3f3e855b2ea.patch =================================================================== --- 46946c73236285649950071632beb3f3e855b2ea.patch (rev 0) +++ 46946c73236285649950071632beb3f3e855b2ea.patch 2018-09-02 19:12:29 UTC (rev 376079) @@ -0,0 +1,27 @@ +From 46946c73236285649950071632beb3f3e855b2ea Mon Sep 17 00:00:00 2001 +From: John Preston <johnprestonm...@gmail.com> +Date: Mon, 27 Aug 2018 14:34:18 +0300 +Subject: [PATCH] Use correct SHA1_ functions. + +Fixes #5103. +--- + Telegram/SourceFiles/base/openssl_help.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Telegram/SourceFiles/base/openssl_help.h b/Telegram/SourceFiles/base/openssl_help.h +index 0ad4916be..9d776b3da 100644 +--- a/Telegram/SourceFiles/base/openssl_help.h ++++ b/Telegram/SourceFiles/base/openssl_help.h +@@ -388,9 +388,9 @@ template < + inline bytes::vector Sha1(Args &&...args) { + return details::Sha<kSha1Size>( + SHA_CTX(), +- SHA_Init, +- SHA_Update, +- SHA_Final, ++ SHA1_Init, ++ SHA1_Update, ++ SHA1_Final, + args...); + } + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-09-02 18:43:18 UTC (rev 376078) +++ PKGBUILD 2018-09-02 19:12:29 UTC (rev 376079) @@ -5,8 +5,8 @@ # https://github.com/mymedia2/tdesktop pkgname=telegram-desktop -pkgver=1.3.10 -pkgrel=2 +pkgver=1.3.13 +pkgrel=1 pkgdesc='Official Telegram Desktop client' arch=('x86_64') url="https://desktop.telegram.org/" @@ -26,6 +26,8 @@ "tdesktop.patch" "no-gtk2.patch" "libtgvoip.patch" + "46946c73236285649950071632beb3f3e855b2ea.patch" + "401e1166f9de4c4a19aba79f9afcd611eaa6e30d.patch" ) sha512sums=('SKIP' 'SKIP' @@ -37,7 +39,9 @@ '2647251940f0d3a2d41ca8a32a592f1ab1e23fe02d3b11d8dc3a54ef34df7c290c9cbf3df76b09970e1cba15c149bc38d49fc824a173d4b21c54edb3c5d5a3da' '00b4307143cf599859d9b9b6d7ac4acbe8b407da55a1e3833921e113dc3aed8c61f2e5f2c1c37e81a261ba4b9e6f40d9bf5f8c90c20dcf0820cfb73852cb091d' '7a37e0ca582145a56a411585aec0bc94889dc18a80cc038d2efa237e19eebf8b67d56825e068be88f7566b08316ce068d7f20c25729caa33d0e9d6c370325025' - 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39') + 'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39' + 'e441175afe31d875ba9699274e2c0153d594a4e94e4dae7134d2ee170ad4468b93972b47f801197d88cf3350cc6d9ef6243419dcf1e18a12184cff1e5cdb617c' + 'cb5a414c58614f39dbd45d7260a06abe921165f8426f3e6327bc24e7e7ad291db484fee38975b11f8eff39c3e78d5312e6548b9110dd621f13013c6084be3c1e') prepare() { cd "$srcdir/tdesktop" @@ -51,6 +55,8 @@ patch -Np1 -i "$srcdir/tdesktop.patch" patch -Np1 -i "$srcdir/no-gtk2.patch" + patch -Np1 -i "$srcdir/46946c73236285649950071632beb3f3e855b2ea.patch" + patch -Np1 -i "$srcdir/401e1166f9de4c4a19aba79f9afcd611eaa6e30d.patch" cd "Telegram/ThirdParty/libtgvoip" patch -Np1 -i "$srcdir/libtgvoip.patch"