From c7a17bba0f934fdb7d2e31361a0ed96db9f36fca Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Fri, 2 Jul 2021 19:26:45 +0200 Subject: [PATCH] Fix tdlib compilation issue Fixes https://github.com/tdlib/td/issues/1592 --- implementations/tdlib | 2 +- implementations/tdlight | 2 +- .../patches/tdlib/001-fix-compilation-issue.patch | 13 ------------- 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 src/main/patches/tdlib/001-fix-compilation-issue.patch diff --git a/implementations/tdlib b/implementations/tdlib index 24e5803..971de95 160000 --- a/implementations/tdlib +++ b/implementations/tdlib @@ -1 +1 @@ -Subproject commit 24e5803b969b15c286e8e501f6b66446b32f2b09 +Subproject commit 971de952d85299e97f85a11c2e0233a819eedef4 diff --git a/implementations/tdlight b/implementations/tdlight index 265a85c..5bc1413 160000 --- a/implementations/tdlight +++ b/implementations/tdlight @@ -1 +1 @@ -Subproject commit 265a85c6cc1131ce07b32268c71fb94d345df375 +Subproject commit 5bc14138c9dd18651bd349b89fe8d6f0ed91b701 diff --git a/src/main/patches/tdlib/001-fix-compilation-issue.patch b/src/main/patches/tdlib/001-fix-compilation-issue.patch deleted file mode 100644 index 4ba2da8..0000000 --- a/src/main/patches/tdlib/001-fix-compilation-issue.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/td/telegram/PasswordManager.cpp b/td/telegram/PasswordManager.cpp -index 43cf194a..387eabb7 100644 ---- a/td/telegram/PasswordManager.cpp -+++ b/td/telegram/PasswordManager.cpp -@@ -689,7 +689,7 @@ Result PasswordManager::get_password_inp - settings->flags_ |= telegram_api::account_passwordInputSettings::EMAIL_MASK; - settings->email_ = std::move(update_settings.recovery_email_address); - } -- return settings; -+ return std::move(settings); - } - - void PasswordManager::do_update_password_settings_impl(UpdateSettings update_settings, PasswordState state,