From 95e67b903473f2e3963a1340ee52578c74e16b0a Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 2 Jul 2018 17:28:21 +1000 Subject: [PATCH] Telegram: bump version * Export now broken. gcc7 segfault on export code. --- ...telegram_desktop-1.3.9-libtgvoip.patchset} | 0 ... => telegram_desktop-1.3.9-systemqt.patch} | 0 ...tchset => telegram_desktop-1.3.9.patchset} | 105 +++++++++--------- ...8.recipe => telegram_desktop-1.3.9.recipe} | 6 +- 4 files changed, 58 insertions(+), 53 deletions(-) rename net-im/telegram-desktop/patches/{telegram_desktop-1.3.8-libtgvoip.patchset => telegram_desktop-1.3.9-libtgvoip.patchset} (100%) rename net-im/telegram-desktop/patches/{telegram_desktop-1.3.8-systemqt.patch => telegram_desktop-1.3.9-systemqt.patch} (100%) rename net-im/telegram-desktop/patches/{telegram_desktop-1.3.8.patchset => telegram_desktop-1.3.9.patchset} (97%) rename net-im/telegram-desktop/{telegram_desktop-1.3.8.recipe => telegram_desktop-1.3.9.recipe} (95%) diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.8-libtgvoip.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.3.9-libtgvoip.patchset similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.8-libtgvoip.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.3.9-libtgvoip.patchset diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.8-systemqt.patch b/net-im/telegram-desktop/patches/telegram_desktop-1.3.9-systemqt.patch similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.8-systemqt.patch rename to net-im/telegram-desktop/patches/telegram_desktop-1.3.9-systemqt.patch diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.8.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.3.9.patchset similarity index 97% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.8.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.3.9.patchset index ad89d3a2f..0f9411022 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.3.8.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.3.9.patchset @@ -1,4 +1,4 @@ -From 82f4b94d124679b5491a33aa36554e84239754c8 Mon Sep 17 00:00:00 2001 +From 0a32fa61b36de7504e77573deb3c2c07dfdddec3 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 10 Jun 2018 10:41:50 +1000 Subject: Add haiku support @@ -194,10 +194,10 @@ index e8236c4..c2858d6 100644 case dbipLinux32: return "linux32"; } diff --git a/Telegram/SourceFiles/core/utils.h b/Telegram/SourceFiles/core/utils.h -index 1e71dd3..ca8542f 100644 +index bdc258e..493452b 100644 --- a/Telegram/SourceFiles/core/utils.h +++ b/Telegram/SourceFiles/core/utils.h -@@ -429,6 +429,7 @@ enum DBIPlatform { +@@ -432,6 +432,7 @@ enum DBIPlatform { dbipLinux64 = 2, dbipLinux32 = 3, dbipMacOld = 4, @@ -2198,7 +2198,7 @@ index 622462e..e3ba800 100644 2.16.4 -From 042db473e1606d45a8321ef80c0f79c29d42f348 Mon Sep 17 00:00:00 2001 +From f1400359aa156ebcc48f2568d0baec36044a2389 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 10 Jun 2018 14:50:46 +1000 Subject: Adapt code to new API @@ -2260,7 +2260,7 @@ index b303e1d..1928257 100644 2.16.4 -From ee9f560bfa453cb74eb685528de59aedaa295a7e Mon Sep 17 00:00:00 2001 +From b2b3c15725e59b8d127ebead6db2b8021717f0e2 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 28 Jun 2018 00:02:04 +1000 Subject: Fix range include path @@ -2283,67 +2283,72 @@ index 0d368e2..847f82b 100644 2.16.4 -From c538dff42b5a7e7459956cbda33922e73a1ced48 Mon Sep 17 00:00:00 2001 +From ca597937ca31a50c3dd800c385f457219ba4da92 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Thu, 28 Jun 2018 00:03:23 +1000 -Subject: gcc7 segfault on this code +Date: Mon, 2 Jul 2018 17:24:39 +1000 +Subject: gcc7 segfault on this code. export is broken now. diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp -index e684899..e4b318b 100644 +index 0cc79f7..22d0f16 100644 --- a/Telegram/SourceFiles/export/data/export_data_types.cpp +++ b/Telegram/SourceFiles/export/data/export_data_types.cpp -@@ -179,13 +179,13 @@ Image ParseMaxImage( - result.width = data.vw.v; - result.height = data.vh.v; - result.file.location = ParseLocation(data.vlocation); -- if constexpr (MTPDphotoCachedSize::Is()) { -- result.file.content = data.vbytes.v; -- result.file.size = result.file.content.size(); -- } else { -- result.file.content = QByteArray(); -- result.file.size = data.vsize.v; -- } -+// if constexpr (MTPDphotoCachedSize::Is()) { -+// result.file.content = data.vbytes.v; -+// result.file.size = result.file.content.size(); -+// } else { -+// result.file.content = QByteArray(); -+// result.file.size = data.vsize.v; -+// } - maxArea = area; +@@ -168,6 +168,8 @@ Image ParseMaxImage( + const MTPVector &data, + const QString &suggestedPath) { + auto result = Image(); ++// GCC7 Segmentation violation for Haiku ++#ifndef __HAIKU__ + result.file.suggestedPath = suggestedPath; + + auto maxArea = int64(0); +@@ -190,6 +192,7 @@ Image ParseMaxImage( } }); + } ++#endif + return result; + } + diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp -index 987bad8..6e8b1f4 100644 +index 34ddd1b..afcfc67 100644 --- a/Telegram/SourceFiles/export/export_api_wrap.cpp +++ b/Telegram/SourceFiles/export/export_api_wrap.cpp -@@ -610,9 +610,9 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) { +@@ -709,6 +709,8 @@ void ApiWrap::requestUserpics( + void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) { Expects(_userpicsProcess != nullptr); ++// GCC7 Segmentation violation for Haiku ++#ifndef __HAIKU__ result.match([&](const auto &data) { -- if constexpr (MTPDphotos_photos::Is()) { -- _userpicsProcess->lastSlice = true; -- } -+// if constexpr (MTPDphotos_photos::Is()) { -+// _userpicsProcess->lastSlice = true; -+// } - loadUserpicsFiles(Data::ParseUserpicsSlice( + if constexpr (MTPDphotos_photos::Is()) { + _userpicsProcess->lastSlice = true; +@@ -717,6 +719,7 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) { data.vphotos, _userpicsProcess->processed)); -@@ -1018,9 +1018,9 @@ void ApiWrap::requestMessagesSlice() { - result.match([&](const MTPDmessages_messagesNotModified &data) { - error("Unexpected messagesNotModified received."); - }, [&](const auto &data) { -- if constexpr (MTPDmessages_messages::Is()) { -- _chatProcess->lastSlice = true; -- } -+// if constexpr (MTPDmessages_messages::Is()) { -+// _chatProcess->lastSlice = true; -+// } - loadMessagesFiles(Data::ParseMessagesSlice( - _chatProcess->context, - data.vmessages, + }); ++#endif + } + + void ApiWrap::loadUserpicsFiles(Data::UserpicsSlice &&slice) { +@@ -1116,7 +1119,8 @@ void ApiWrap::appendChatsSlice( + + void ApiWrap::requestMessagesSlice() { + Expects(_chatProcess != nullptr); +- ++// GCC7 Segmentation violation for Haiku ++#ifndef __HAIKU__ + requestChatMessages( + _chatProcess->info.splits[_chatProcess->localSplitIndex], + _chatProcess->largestIdPlusOne, +@@ -1139,6 +1143,7 @@ void ApiWrap::requestMessagesSlice() { + _chatProcess->info.relativePath)); + }); + }); ++#endif + } + + void ApiWrap::requestChatMessages( -- 2.16.4 diff --git a/net-im/telegram-desktop/telegram_desktop-1.3.8.recipe b/net-im/telegram-desktop/telegram_desktop-1.3.9.recipe similarity index 95% rename from net-im/telegram-desktop/telegram_desktop-1.3.8.recipe rename to net-im/telegram-desktop/telegram_desktop-1.3.9.recipe index 95e8145a5..7e1780acf 100644 --- a/net-im/telegram-desktop/telegram_desktop-1.3.8.recipe +++ b/net-im/telegram-desktop/telegram_desktop-1.3.9.recipe @@ -7,7 +7,7 @@ REVISION="1" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz" SOURCE_DIR="tdesktop-$portVersion" -CHECKSUM_SHA256="1bf32ca02022741bfc43a4b7d9e48089260064ef94b56d247e21ec2962410096" +CHECKSUM_SHA256="fd52433dac14a6643114e8f5ff9d38c709141bfca8461cce47fa93e9ef8b45b2" COMMIT_2="6ba1241cfef6c3ddf4e50e82f67afde0abc02285" SOURCE_URI_2="https://github.com/telegramdesktop/libtgvoip/archive/$COMMIT_2.zip" @@ -17,9 +17,9 @@ COMMIT_3="550ac2f159ca883d360c196149b466955c77a573" SOURCE_URI_3="https://github.com/mapbox/variant/archive/$COMMIT_3.zip" CHECKSUM_SHA256_3="3676117c49db1ef1ff2818f6f70713c3a4469f0da8ecb5c98c157499322501fc" -COMMIT_4="9d65e74400976b3509833f49b16d401600c7317d" +COMMIT_4="d846fe50a3f0bb7767c7e087a05f4be95f4da0ec" SOURCE_URI_4="https://github.com/Microsoft/GSL/archive/$COMMIT_4.zip" -CHECKSUM_SHA256_4="210a39a9d1f9636843dc8b2b8fac2cfcac7226c79d6748a956f7a27c686202d2" +CHECKSUM_SHA256_4="320e2d7707aaa6f7bcc0d6ddc95e2e4413b433ddcc1c8afa0a93fb85a47db47b" COMMIT_5="5ca44b68721833ae3731802ed99af67c6f38a53a" SOURCE_URI_5="https://github.com/philsquared/Catch/archive/$COMMIT_5.zip"