diff options
author | Arseniy Zaostrovnykh <necto.ne@gmail.com> | 2025-03-17 09:07:53 +0100 |
---|---|---|
committer | Jonathan Brielmaier <jonathan.brielmaier@web.de> | 2025-03-22 23:56:40 +0100 |
commit | aaf4bf1491dca1e8cd3bfff85226e244c2af968a (patch) | |
tree | 7c75bb200bb44a6949b3ac812d13016992c308ae /gnu/packages/patches/telegram-desktop-hashmap-incomplete-value.patch | |
parent | 0c99a75fe1c40273b62597d5e55982f717cdb9e9 (diff) |
gnu: telegram-desktop: Update to version 5.12.3.
Add three patches to fix the compilation errors raised by gcc 11.
Note: https://github.com/desktop-app/cmake_helpers/pull/320 was merged,
so telegram-desktop-unbundle-gsl.patch is no longer needed.
* gnu/packages/telegram.scm (%telegram-version): Update to 5.12.3.
(codegen-for-telegram-desktop): Update to revision used by v5.12.3.
(lib-base-for-telegram-desktop): Likewise.
(lib-lottie-for-telegram-desktop): Likewise.
(lib-rpl-for-telegram-desktop): Likewise.
(lib-spellcheck-for-telegram-desktop): Likewise.
(lib-ui-for-telegram-desktop): Likewise.
(lib-webrtc-for-telegram-desktop): Likewise.
(cmake-helpers-for-telegram-desktop): Likewise;
Remove the obsolete patch.
(lib-tl-for-telegram-desktop):
Apply a patch to fix gcc-11 compilation error.
(telegram-desktop): Update to v5.12.3;
Apply patches to make it compile.
* gnu/packages/patches/telegram-desktop-unbundle-gsl.patch: Remove.
* gnu/packages/patches/lib-tl-for-telegram-memcpy.patch: New file.
* gnu/packages/patches/telegram-desktop-hashmap-incomplete-value.patch:
New file.
* gnu/packages/patches/telegram-desktop-qguiapp.patch: New file.
* gnu/local.mk: Adjust accordingly.
Change-Id: Iaa34ff2cd3f55aa92b1d9ba61a2ff66a72eb1132
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Diffstat (limited to 'gnu/packages/patches/telegram-desktop-hashmap-incomplete-value.patch')
-rw-r--r-- | gnu/packages/patches/telegram-desktop-hashmap-incomplete-value.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/gnu/packages/patches/telegram-desktop-hashmap-incomplete-value.patch b/gnu/packages/patches/telegram-desktop-hashmap-incomplete-value.patch new file mode 100644 index 0000000000..2f249fbf7a --- /dev/null +++ b/gnu/packages/patches/telegram-desktop-hashmap-incomplete-value.patch @@ -0,0 +1,59 @@ +From 3865a179b3aed172bac4a3dcd1f320270de16dcf Mon Sep 17 00:00:00 2001 +From: Arseniy Zaostrovnykh <necto.ne@gmail.com> +Date: Sun, 16 Mar 2025 20:49:16 +0100 +Subject: [PATCH] dialogs_inner_widget: Fix use-before-def compile error. + + * Telegram/SourceFiles/dialogs/dialogs_inner_widget.h: Include headers + and eagerly define TagCache to avoid using under-defined types for + std::unsigned_map values. + * Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp: Remove the + definition of TagCache that is now in the header. +--- + Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp | 5 ----- + Telegram/SourceFiles/dialogs/dialogs_inner_widget.h | 7 ++++++- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp +index 39e047897..9687405aa 100644 +--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp ++++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp +@@ -247,11 +247,6 @@ struct InnerWidget::PeerSearchResult { + BasicRow row; + }; + +-struct InnerWidget::TagCache { +- Ui::ChatsFilterTagContext context; +- QImage frame; +-}; +- + Key InnerWidget::FilterResult::key() const { + return row->key(); + } +diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h +index 2500f43d1..c85c5ce32 100644 +--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h ++++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h +@@ -16,6 +16,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #include "ui/effects/animations.h" + #include "ui/rp_widget.h" + #include "ui/userpic_view.h" ++#include "dialogs/dialogs_common.h" ++#include "ui/chat/chats_filter_tag.h" + + namespace style { + struct DialogRow; +@@ -226,7 +228,10 @@ private: + struct CollapsedRow; + struct HashtagResult; + struct PeerSearchResult; +- struct TagCache; ++ struct TagCache { ++ Ui::ChatsFilterTagContext context; ++ QImage frame; ++ }; + + enum class JumpSkip { + PreviousOrBegin, +-- +2.48.1 + |