tdesktop: Drop the patch for a GCC bug
GCC 7.4.0 is now the default and not affected by this bug.
This commit is contained in:
parent
2031aaff07
commit
db8e3654e2
@ -1,68 +0,0 @@
|
|||||||
Date: Tue, 17 Jul 2018 20:29:49 +0200
|
|
||||||
|
|
||||||
---
|
|
||||||
Telegram/SourceFiles/export/data/export_data_types.cpp | 9 ++++++---
|
|
||||||
Telegram/SourceFiles/export/export_api_wrap.cpp | 6 ++++--
|
|
||||||
2 files changed, 10 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
|
|
||||||
index f835dc2f9..e811c27e8 100644
|
|
||||||
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
|
|
||||||
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
|
|
||||||
@@ -221,7 +221,8 @@ Image ParseMaxImage(
|
|
||||||
result.width = data.vw.v;
|
|
||||||
result.height = data.vh.v;
|
|
||||||
result.file.location = ParseLocation(data.vlocation);
|
|
||||||
- if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) {
|
|
||||||
+ constexpr bool condition = MTPDphotoCachedSize::Is<decltype(data)>();
|
|
||||||
+ if constexpr (condition) {
|
|
||||||
result.file.content = data.vbytes.v;
|
|
||||||
result.file.size = result.file.content.size();
|
|
||||||
} else {
|
|
||||||
@@ -409,7 +410,8 @@ Document ParseDocument(
|
|
||||||
result.width = data.vw.v;
|
|
||||||
result.height = data.vh.v;
|
|
||||||
result.file.location = ParseLocation(data.vlocation);
|
|
||||||
- if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) {
|
|
||||||
+ constexpr bool condition = MTPDphotoCachedSize::Is<decltype(data)>();
|
|
||||||
+ if constexpr (condition) {
|
|
||||||
result.file.content = data.vbytes.v;
|
|
||||||
result.file.size = result.file.content.size();
|
|
||||||
} else {
|
|
||||||
@@ -1017,7 +1019,8 @@ Message ParseMessage(
|
|
||||||
auto result = Message();
|
|
||||||
data.match([&](const auto &data) {
|
|
||||||
result.id = data.vid.v;
|
|
||||||
- if constexpr (!MTPDmessageEmpty::Is<decltype(data)>()) {
|
|
||||||
+ constexpr bool condition = !MTPDmessageEmpty::Is<decltype(data)>();
|
|
||||||
+ if constexpr (condition) {
|
|
||||||
result.toId = ParsePeerId(data.vto_id);
|
|
||||||
const auto peerId = (!data.is_out()
|
|
||||||
&& data.has_from_id()
|
|
||||||
diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
|
|
||||||
index b618937f6..bb98647dd 100644
|
|
||||||
--- a/Telegram/SourceFiles/export/export_api_wrap.cpp
|
|
||||||
+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
|
|
||||||
@@ -709,7 +709,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) {
|
|
||||||
Expects(_userpicsProcess != nullptr);
|
|
||||||
|
|
||||||
result.match([&](const auto &data) {
|
|
||||||
- if constexpr (MTPDphotos_photos::Is<decltype(data)>()) {
|
|
||||||
+ constexpr bool condition = MTPDphotos_photos::Is<decltype(data)>();
|
|
||||||
+ if constexpr (condition) {
|
|
||||||
_userpicsProcess->lastSlice = true;
|
|
||||||
}
|
|
||||||
loadUserpicsFiles(Data::ParseUserpicsSlice(
|
|
||||||
@@ -1141,7 +1142,8 @@ void ApiWrap::requestMessagesSlice() {
|
|
||||||
result.match([&](const MTPDmessages_messagesNotModified &data) {
|
|
||||||
error("Unexpected messagesNotModified received.");
|
|
||||||
}, [&](const auto &data) {
|
|
||||||
- if constexpr (MTPDmessages_messages::Is<decltype(data)>()) {
|
|
||||||
+ constexpr bool condition = MTPDmessages_messages::Is<decltype(data)>();
|
|
||||||
+ if constexpr (condition) {
|
|
||||||
_chatProcess->lastSlice = true;
|
|
||||||
}
|
|
||||||
loadMessagesFiles(Data::ParseMessagesSlice(
|
|
||||||
--
|
|
||||||
2.16.3
|
|
||||||
|
|
@ -29,12 +29,7 @@ mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
# TODO: libtgvoip.patch no-gtk2.patch
|
# TODO: libtgvoip.patch no-gtk2.patch
|
||||||
patches = [
|
patches = [ "${archPatches}/tdesktop.patch" ];
|
||||||
"${archPatches}/tdesktop.patch"
|
|
||||||
]
|
|
||||||
# TODO: Only required to work around a compiler bug.
|
|
||||||
# This should be fixed in GCC 7.3.1 (or later?)
|
|
||||||
++ [ ./fix-internal-compiler-error.patch ];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
|
substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
|
||||||
|
Loading…
Reference in New Issue
Block a user