haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-02 13:08:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Telegram: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2021-10-09 14:10:30 +10:00
parent c59f9d6af1
commit 88f3172cb3
4 changed files with 168 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
net-im/telegram-desktop/patches/gcc8fixes-3.1.1.patchset → net-im/telegram-desktop/patches/gcc8fixes-3.1.8.patchset
View File

@@ -1,11 +1,11 @@
From d23db224a74f90569b8f79fae84f08e4a788afa5 Mon Sep 17 00:00:00 2001 From 831bf906370fbaea18bc03895fc499536a914fa0 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 20 Sep 2021 20:17:35 +1000 Date: Sat, 9 Oct 2021 13:52:53 +1000
Subject: Workaround build issues on GCC8 Subject: Workaround build issues on GCC8
diff --git a/Telegram/SourceFiles/api/api_who_read.cpp b/Telegram/SourceFiles/api/api_who_read.cpp diff --git a/Telegram/SourceFiles/api/api_who_read.cpp b/Telegram/SourceFiles/api/api_who_read.cpp
index 41934e0..821a58f 100644 index 07d1ede..22092b5 100644
--- a/Telegram/SourceFiles/api/api_who_read.cpp --- a/Telegram/SourceFiles/api/api_who_read.cpp
+++ b/Telegram/SourceFiles/api/api_who_read.cpp +++ b/Telegram/SourceFiles/api/api_who_read.cpp
@@ -261,6 +261,7 @@ void RegenerateParticipants(not_null<State*> state, int small, int large) { @@ -261,6 +261,7 @@ void RegenerateParticipants(not_null<State*> state, int small, int large) {
@@ -62,7 +62,7 @@ index c6bcb04..5986fad 100644
} }
return true; return true;
diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp diff --git a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
index 54024aa..9c9b228 100644 index a33e2f0..227487e 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp --- a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
@@ -1267,11 +1267,13 @@ void Viewport::RendererGL::validateDatas() { @@ -1267,11 +1267,13 @@ void Viewport::RendererGL::validateDatas() {
@@ -92,6 +92,39 @@ index 2355208..807d270 100644
.isHidden = countryData.is_hidden(), .isHidden = countryData.is_hidden(),
})); }));
for (const auto &code : countryData.vcountry_codes().v) { for (const auto &code : countryData.vcountry_codes().v) {
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 91eaba4..e7c3814 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -578,6 +578,7 @@ ItemPreview MediaPhoto::toPreview(ToPreviewOptions options) const {
return {
.text = WithCaptionDialogsText(type, caption, !images.empty()),
.images = std::move(images),
+ .imagesInTextPosition = 0,
.loadingContext = std::move(context),
};
}
@@ -797,6 +798,7 @@ ItemPreview MediaFile::toPreview(ToPreviewOptions options) const {
return {
.text = WithCaptionDialogsText(type, caption, !images.empty()),
.images = std::move(images),
+ .imagesInTextPosition = 0,
.loadingContext = std::move(context),
};
}
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
index 759492b..642e3c3 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
@@ -848,7 +848,7 @@ void RowPainter::paint(
if (const auto searchChat = row->searchInChat()) {
if (const auto peer = searchChat.peer()) {
if (!peer->isChannel() || peer->isMegagroup()) {
- return { .hideSender = true };
+ return { .existing = nullptr, .hideSender = true };
}
}
}
diff --git a/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp b/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp diff --git a/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp b/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp
index 9100631..2e3a64b 100644 index 9100631..2e3a64b 100644
--- a/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp --- a/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp
@@ -105,6 +138,44 @@ index 9100631..2e3a64b 100644
.forceOpaque = true, .forceOpaque = true,
}).image; }).image;
if (image.isNull() if (image.isNull()
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 17e480f..87cddfd 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -2277,6 +2277,7 @@ void History::setChatListMessage(HistoryItem *item) {
// If we have a single message from a group, request the full album.
if (hasOrphanMediaGroupPart()
&& !item->toPreview({
+ .existing = nullptr,
.hideSender = true,
.hideCaption = true }).images.empty()) {
owner().histories().requestGroupAround(item);
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 29b9825..4b7994c 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -324,7 +324,9 @@ public:
ToPreviewOptions options) const;
[[nodiscard]] virtual QString inReplyText() const {
return toPreview({
+ .existing = nullptr,
.hideSender = true,
+ .hideCaption = false,
.generateImages = false,
}).text;
}
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 13efe5d..3ed9528 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -6884,6 +6884,7 @@ void HistoryWidget::updateForwardingTexts() {
if (count < 2) {
text = _toForward.items.front()->toPreview({
+ .existing = nullptr,
.hideSender = true,
.hideCaption = !keepCaptions,
.generateImages = false,
diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp diff --git a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp b/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
index 593c292..af8222a 100644 index 593c292..af8222a 100644
--- a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp --- a/Telegram/SourceFiles/history/view/history_view_schedule_box.cpp
@@ -119,7 +190,7 @@ index 593c292..af8222a 100644
? tr::lng_remind_title() ? tr::lng_remind_title()
: tr::lng_schedule_title()), : tr::lng_schedule_title()),
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
index 2b6d121..952f6aa 100644 index 50b96f1..e137c71 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp --- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
@@ -70,9 +70,10 @@ SendDataCommon::SentMessageFields SendText::getSentMessageFields() const { @@ -70,9 +70,10 @@ SendDataCommon::SentMessageFields SendText::getSentMessageFields() const {
@@ -188,7 +259,7 @@ index 2b6d121..952f6aa 100644
QString SendInvoice::getLayoutDescription(const Result *owner) const { QString SendInvoice::getLayoutDescription(const Result *owner) const {
diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp
index ef34eb3..6fdd28e 100644 index fa9ac0d..a062dc3 100644
--- a/Telegram/SourceFiles/media/audio/media_audio.cpp --- a/Telegram/SourceFiles/media/audio/media_audio.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio.cpp +++ b/Telegram/SourceFiles/media/audio/media_audio.cpp
@@ -1615,7 +1615,10 @@ public: @@ -1615,7 +1615,10 @@ public:
@@ -203,10 +274,10 @@ index ef34eb3..6fdd28e 100644
}); });
if (!read.image.isNull()) { if (!read.image.isNull()) {
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp
index 07a9fe5..2a73278 100644 index ee1da69..5de0485 100644
--- a/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp --- a/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp
+++ b/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp +++ b/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp
@@ -1171,13 +1171,13 @@ FrameWithInfo VideoTrack::frameWithInfo(const Instance *instance) { @@ -1144,13 +1144,13 @@ FrameWithInfo VideoTrack::frameWithInfo(const Instance *instance) {
const auto data = _shared->frameForPaintWithIndex(); const auto data = _shared->frameForPaintWithIndex();
const auto i = data.frame->prepared.find(instance); const auto i = data.frame->prepared.find(instance);
const auto none = (i == data.frame->prepared.end()); const auto none = (i == data.frame->prepared.end());
@@ -380,10 +451,10 @@ index ab96a8a..2d4e6ff 100644
.placeholder = tr::lng_payments_info_phone(), .placeholder = tr::lng_payments_info_phone(),
.value = _information.phone, .value = _information.phone,
diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp
index 16b8a1a..812b3c1 100644 index a198b85..b077777 100644
--- a/Telegram/SourceFiles/settings/settings_chat.cpp --- a/Telegram/SourceFiles/settings/settings_chat.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat.cpp +++ b/Telegram/SourceFiles/settings/settings_chat.cpp
@@ -651,6 +651,8 @@ void ChooseFromFile( @@ -652,6 +652,8 @@ void ChooseFromFile(
auto image = Images::Read({ auto image = Images::Read({
.path = result.paths.isEmpty() ? QString() : result.paths.front(), .path = result.paths.isEmpty() ? QString() : result.paths.front(),
.content = result.remoteContent, .content = result.remoteContent,
@@ -421,10 +492,10 @@ index 5c57bf1..22b5586 100644
void translate(int x, int y) { void translate(int x, int y) {
viewport.translate(x, y); viewport.translate(x, y);
diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.cpp b/Telegram/SourceFiles/ui/chat/chat_theme.cpp diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.cpp b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
index 61c898d..5bd6958 100644 index 52d87b7..4e056dd 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.cpp --- a/Telegram/SourceFiles/ui/chat/chat_theme.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.cpp +++ b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
@@ -384,11 +384,11 @@ style::colorizer ChatTheme::bubblesAccentColorizer( @@ -383,11 +383,11 @@ style::colorizer ChatTheme::bubblesAccentColorizer(
value.getHsv(&hue, &saturation, &lightness); value.getHsv(&hue, &saturation, &lightness);
return style::colorizer::Color{ hue, saturation, lightness }; return style::colorizer::Color{ hue, saturation, lightness };
}; };
@@ -441,6 +512,51 @@ index 61c898d..5bd6958 100644
} }
void ChatTheme::set(const style::color &my, const QColor &color) { void ChatTheme::set(const style::color &my, const QColor &color) {
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index beadbd4..f19653c 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -504,12 +504,13 @@ void ChooseThemeController::fill(
_cachingLifetime.destroy();
const auto old = base::take(_entries);
auto x = skip * 2;
- _entries.push_back({
- .preview = GenerateEmptyPreview(),
- .emoji = Ui::Emoji::Find(QString::fromUtf8("\xe2\x9d\x8c")),
- .geometry = QRect(QPoint(x, skip), single),
- .chosen = (_chosen == kDisableElement.utf16()),
- });
+
+ ChooseThemeController::Entry entry;
+ entry.preview = GenerateEmptyPreview();
+ entry.emoji = Ui::Emoji::Find(QString::fromUtf8("\xe2\x9d\x8c"));
+ entry.geometry = QRect(QPoint(x, skip), single);
+ entry.chosen = (_chosen == kDisableElement.utf16());
+ _entries.push_back(entry);
Assert(_entries.front().emoji != nullptr);
style::PaletteChanged(
) | rpl::start_with_next([=] {
@@ -525,12 +526,14 @@ void ChooseThemeController::fill(
const auto &used = dark ? theme.dark : theme.light;
const auto id = used.id;
const auto isChosen = (_chosen == emoji->text());
- _entries.push_back({
- .id = id,
- .emoji = emoji,
- .geometry = QRect(QPoint(x, skip), single),
- .chosen = isChosen,
- });
+
+ ChooseThemeController::Entry entry2;
+ entry2.id = id;
+ entry2.emoji = emoji;
+ entry2.geometry = QRect(QPoint(x, skip), single);
+ entry2.chosen = isChosen;
+ _entries.push_back(entry2);
+
_controller->cachedChatThemeValue(
used
) | rpl::filter([=](const std::shared_ptr<ChatTheme> &data) {
diff --git a/Telegram/SourceFiles/ui/toasts/common_toasts.h b/Telegram/SourceFiles/ui/toasts/common_toasts.h diff --git a/Telegram/SourceFiles/ui/toasts/common_toasts.h b/Telegram/SourceFiles/ui/toasts/common_toasts.h
index 7384c0a..12d4e17 100644 index 7384c0a..12d4e17 100644
--- a/Telegram/SourceFiles/ui/toasts/common_toasts.h --- a/Telegram/SourceFiles/ui/toasts/common_toasts.h
@@ -472,11 +588,25 @@ index ccc7559..2b37bc2 100644
}); });
} }
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp
index bfa2f5e..9f02356 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp
@@ -806,7 +806,9 @@ void Notification::updateNotifyDisplay() {
p.setFont(st::dialogsTextFont);
const auto text = _item
? _item->toPreview({
+ .existing = nullptr,
.hideSender = reminder,
+ .hideCaption = false,
.generateImages = false,
}).text
: ((!_author.isEmpty()
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index fbed3c8..037391c 100644 index affb0a0..2e1b28e 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp --- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -323,7 +323,10 @@ bool LoadTheme( @@ -324,7 +324,10 @@ bool LoadTheme(
return false; return false;
} }
auto background = Images::Read({ auto background = Images::Read({

4
net-im/telegram-desktop/patches/libtgvoip-3.1.1.patchset → net-im/telegram-desktop/patches/libtgvoip-3.1.8.patchset
View File

@@ -1,6 +1,6 @@
From 42598166048ff82991366738dd9714c87610bf8e Mon Sep 17 00:00:00 2001 From 5c5fdc0c815ede9ac87f2b9151604d4b886b104e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 20 Sep 2021 20:06:53 +1000 Date: Sat, 9 Oct 2021 13:51:20 +1000
Subject: Add Haiku support Subject: Add Haiku support

46
net-im/telegram-desktop/patches/telegram_desktop-3.1.1.patchset → net-im/telegram-desktop/patches/telegram_desktop-3.1.8.patchset
View File

@@ -1,14 +1,14 @@
From bcedb865a10f86b5038ce27f60f85cd531577ca1 Mon Sep 17 00:00:00 2001 From 65240913d72e70aa9652dd74fd2d3e981fb209f0 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 20 Sep 2021 20:16:52 +1000 Date: Sat, 9 Oct 2021 13:52:13 +1000
Subject: Add Haiku support Subject: Add Haiku support
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 9f00b64..9edcaa2 100644 index cb92894..d72fb8b 100644
--- a/Telegram/CMakeLists.txt --- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt
@@ -89,6 +89,15 @@ PRIVATE @@ -94,6 +94,15 @@ PRIVATE
desktop-app::external_xxhash desktop-app::external_xxhash
) )
@@ -24,7 +24,7 @@ index 9f00b64..9edcaa2 100644
target_precompile_headers(Telegram PRIVATE ${src_loc}/stdafx.h) target_precompile_headers(Telegram PRIVATE ${src_loc}/stdafx.h)
nice_target_sources(Telegram ${src_loc} nice_target_sources(Telegram ${src_loc}
PRIVATE PRIVATE
@@ -1165,6 +1174,16 @@ else() @@ -1189,6 +1198,16 @@ else()
) )
endif() endif()
@@ -41,7 +41,7 @@ index 9f00b64..9edcaa2 100644
if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
remove_target_sources(Telegram ${src_loc} remove_target_sources(Telegram ${src_loc}
platform/linux/linux_wayland_integration.cpp platform/linux/linux_wayland_integration.cpp
@@ -1299,7 +1318,7 @@ if (build_macstore) @@ -1323,7 +1342,7 @@ if (build_macstore)
else() else()
set(bundle_identifier "com.tdesktop.Telegram$<$<CONFIG:Debug>:Debug>") set(bundle_identifier "com.tdesktop.Telegram$<$<CONFIG:Debug>:Debug>")
set(bundle_entitlements "Telegram.entitlements") set(bundle_entitlements "Telegram.entitlements")
@@ -99,7 +99,7 @@ index c71c522..2c3d1dc 100644
_video->moveToLeft(left, buttonsTop); _video->moveToLeft(left, buttonsTop);
left += _video->width() + skip; left += _video->width() + skip;
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index ad3e3a8..dfe245a 100644 index f8a26f0..a7b7a1e 100644
--- a/Telegram/SourceFiles/core/core_settings.h --- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h +++ b/Telegram/SourceFiles/core/core_settings.h
@@ -706,7 +706,7 @@ private: @@ -706,7 +706,7 @@ private:
@@ -201,10 +201,10 @@ index e7cce3a..e268de6 100644
void MainWindow::createGlobalMenu() { void MainWindow::createGlobalMenu() {
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp
new file mode 100644 new file mode 100644
index 0000000..72bda83 index 0000000..1cabfe2
--- /dev/null --- /dev/null
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp +++ b/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp
@@ -0,0 +1,270 @@ @@ -0,0 +1,266 @@
+/* +/*
+This file is part of Telegram Desktop for Haiku, +This file is part of Telegram Desktop for Haiku,
+ +
@@ -313,8 +313,7 @@ index 0000000..72bda83
+ const QString &title, + const QString &title,
+ const QString &subtitle, + const QString &subtitle,
+ const QString &msg, + const QString &msg,
+ bool hideNameAndPhoto, + DisplayOptions options);
+ bool hideReplyButton);
+ +
+ ~Private(); + ~Private();
+ +
@@ -373,7 +372,7 @@ index 0000000..72bda83
+ if (message.Unflatten(buffer) == B_OK) { + if (message.Unflatten(buffer) == B_OK) {
+ uint64 sessionId = message.GetUInt64("session", 0); + uint64 sessionId = message.GetUInt64("session", 0);
+ uint64 peerId = message.GetUInt64("peer", 0); + uint64 peerId = message.GetUInt64("peer", 0);
+ int32 messageId = message.GetInt32("message", 0); + int64 messageId = message.GetInt64("message", 0);
+ +
+ const auto key = FullPeer{ + const auto key = FullPeer{
+ .sessionId = sessionId, + .sessionId = sessionId,
@@ -395,13 +394,12 @@ index 0000000..72bda83
+ const QString &title, + const QString &title,
+ const QString &subtitle, + const QString &subtitle,
+ const QString &msg, + const QString &msg,
+ bool hideNameAndPhoto, + DisplayOptions options) {
+ bool hideReplyButton) {
+ auto titleText = title; + auto titleText = title;
+ auto subtitleText = subtitle; + auto subtitleText = subtitle;
+ auto msgText = msg; + auto msgText = msg;
+ +
+ const auto key = hideNameAndPhoto + const auto key = options.hideNameAndPhoto
+ ? InMemoryKey() + ? InMemoryKey()
+ : peer->userpicUniqueKey(userpicView); + : peer->userpicUniqueKey(userpicView);
+ +
@@ -412,8 +410,8 @@ index 0000000..72bda83
+ "target:tg_notify " + "target:tg_notify "
+ "session:uint64:%1 " + "session:uint64:%1 "
+ "peer:uint64:%2 " + "peer:uint64:%2 "
+ "message:int32:%3") + "message:int64:%3")
+ .arg(peer->session().uniqueId()).arg(peer->id.value).arg(msgId); + .arg(peer->session().uniqueId()).arg(peer->id.value).arg(msgId.bare);
+ BNotification notify(B_INFORMATION_NOTIFICATION); + BNotification notify(B_INFORMATION_NOTIFICATION);
+ if (icon) + if (icon)
+ notify.SetIcon(icon); + notify.SetIcon(icon);
@@ -442,8 +440,7 @@ index 0000000..72bda83
+ const QString &title, + const QString &title,
+ const QString &subtitle, + const QString &subtitle,
+ const QString &msg, + const QString &msg,
+ bool hideNameAndPhoto, + DisplayOptions options) {
+ bool hideReplyButton) {
+ _private->showNotification( + _private->showNotification(
+ peer, + peer,
+ userpicView, + userpicView,
@@ -451,8 +448,7 @@ index 0000000..72bda83
+ title, + title,
+ subtitle, + subtitle,
+ msg, + msg,
+ hideNameAndPhoto, + options);
+ hideReplyButton);
+} +}
+ +
+void Manager::doClearAllFast() { } +void Manager::doClearAllFast() { }
@@ -616,7 +612,7 @@ index 0000000..3a57ce2
+ +
+#endif +#endif
diff --git a/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp b/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp diff --git a/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp b/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp
index d843163..276dbf6 100644 index b3ba5f3..a481e3b 100644
--- a/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp --- a/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp +++ b/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp
@@ -27,8 +27,58 @@ @@ -27,8 +27,58 @@
@@ -778,7 +774,7 @@ index 87c3c04..9d1ef4f 100644
} // namespace Platform } // namespace Platform
diff --git a/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp b/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp diff --git a/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp b/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp
index 8aa87d7..19deeff 100644 index da05ec0..4daaae5 100644
--- a/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp --- a/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp
+++ b/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp +++ b/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp
@@ -4,6 +4,11 @@ @@ -4,6 +4,11 @@
@@ -823,10 +819,10 @@ index 58ba80a..fe98397 100644
endif() endif()
add_checked_subdirectory(jpeg) add_checked_subdirectory(jpeg)
diff --git a/cmake/options_linux.cmake b/cmake/options_linux.cmake diff --git a/cmake/options_linux.cmake b/cmake/options_linux.cmake
index 2797c7b..26368f2 100644 index 24f0e0e..d746f55 100644
--- a/cmake/options_linux.cmake --- a/cmake/options_linux.cmake
+++ b/cmake/options_linux.cmake +++ b/cmake/options_linux.cmake
@@ -45,10 +45,12 @@ if (DESKTOP_APP_SPECIAL_TARGET) @@ -52,10 +52,12 @@ if (DESKTOP_APP_SPECIAL_TARGET)
target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>) target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>)
endif() endif()

2
net-im/telegram-desktop/telegram_desktop-3.1.1.recipe → net-im/telegram-desktop/telegram_desktop-3.1.8.recipe
View File

@@ -5,7 +5,7 @@ COPYRIGHT="2013-2021 Telegram"
LICENSE="GNU GPL v3" LICENSE="GNU GPL v3"
REVISION="1" REVISION="1"
SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz"
CHECKSUM_SHA256="04c891128639f0c96fbb63248692d1674a5c03db0f9d294adb4281ec4b895afe" CHECKSUM_SHA256="f686a2779bb2c225f8a15fab3421a6a84fd2986d4f3a8c8bad647e873cd43f0d"
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz" SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
SOURCE_DIR="tdesktop-$portVersion-full" SOURCE_DIR="tdesktop-$portVersion-full"
srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92" srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"