From 1d34390bdd03dbe91ae6a5bdfca56671b4dad1e4 Mon Sep 17 00:00:00 2001 From: Rmys Date: Sat, 23 Apr 2022 22:07:55 +0300 Subject: [PATCH] tdesktop-3.7.1 --- network/chat/telegram-desktop/actions.py | 2 +- .../telegram-desktop/files/tdesktop.patch | 62 +++++++++++++++++++ network/chat/telegram-desktop/pspec.xml | 13 ++-- 3 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 network/chat/telegram-desktop/files/tdesktop.patch diff --git a/network/chat/telegram-desktop/actions.py b/network/chat/telegram-desktop/actions.py index fbc0be9f2d..7cbe1d2a1b 100644 --- a/network/chat/telegram-desktop/actions.py +++ b/network/chat/telegram-desktop/actions.py @@ -29,7 +29,7 @@ def setup(): '-DDESKTOP_APP_USE_PACKAGED=ON', '-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON', '-DDESKTOP_APP_SPECIAL_TARGET=""', - '-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=OFF' + '-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=ON', '-DTDESKTOP_API_ID=611335', '-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c', '-DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop"' diff --git a/network/chat/telegram-desktop/files/tdesktop.patch b/network/chat/telegram-desktop/files/tdesktop.patch new file mode 100644 index 0000000000..2bb2c21720 --- /dev/null +++ b/network/chat/telegram-desktop/files/tdesktop.patch @@ -0,0 +1,62 @@ +diff -Nuar a/Telegram/lib_ui/ui/widgets/popup_menu.cpp b/Telegram/lib_ui/ui/widgets/popup_menu.cpp +--- a/Telegram/lib_ui/ui/widgets/popup_menu.cpp 2022-04-20 10:41:10.000000000 +0300 ++++ b/Telegram/lib_ui/ui/widgets/popup_menu.cpp 2022-04-23 20:35:16.524988000 +0300 +@@ -760,11 +760,6 @@ + } + _parent = parent; + +- if (_parent) { +- setScreen(_parent->screen()); +- } else if (screen) { +- setScreen(screen); +- } + + using Origin = PanelAnimation::Origin; + auto origin = Origin::TopLeft; +diff -Nuar a/Telegram/lib_ui/ui/widgets/tooltip.cpp b/Telegram/lib_ui/ui/widgets/tooltip.cpp +--- a/Telegram/lib_ui/ui/widgets/tooltip.cpp 2022-04-20 10:41:10.000000000 +0300 ++++ b/Telegram/lib_ui/ui/widgets/tooltip.cpp 2022-04-23 20:36:33.692982000 +0300 +@@ -117,7 +117,6 @@ + + // adjust tooltip position + if (screen) { +- setScreen(screen); + const auto r = screen->availableGeometry(); + if (r.x() + r.width() - _st->skip < p.x() + s.width() && p.x() + s.width() > m.x()) { + p.setX(qMax(r.x() + r.width() - int32(_st->skip) - s.width(), m.x() - s.width())); +diff -Nuar a/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp b/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp +--- a/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp 2022-04-20 12:56:09.000000000 +0300 ++++ b/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp 2022-04-23 21:30:13.256750000 +0300 +@@ -585,7 +585,7 @@ + }(); + const auto myScreen = _window->screen(); + if (parentScreen && myScreen != parentScreen) { +- _window->setScreen(parentScreen); ++ // _window->setScreen(parentScreen); + } + _window->move( + parent->x() + (parent->width() - _window->width()) / 2, +diff -Nuar a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp 2022-04-20 12:56:09.000000000 +0300 ++++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp 2022-04-23 21:31:50.214743000 +0300 +@@ -499,7 +499,7 @@ + DEBUG_LOG(("Viewer Pos: Currently on screen %1, moving to screen %2") + .arg(screenList.indexOf(myScreen)) + .arg(screenList.indexOf(activeWindowScreen))); +- _widget->setScreen(activeWindowScreen); ++ //_widget->setScreen(activeWindowScreen); + DEBUG_LOG(("Viewer Pos: New actual screen: %1") + .arg(screenList.indexOf(_widget->screen()))); + } +diff -Nuar a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp +--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp 2022-04-20 12:56:09.000000000 +0300 ++++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp 2022-04-23 21:33:13.915737000 +0300 +@@ -475,7 +475,7 @@ + const auto parentScreen = widgetScreen(_parent); + const auto myScreen = widgetScreen(widget()); + if (parentScreen && myScreen && myScreen != parentScreen) { +- widget()->setScreen(parentScreen); ++ //widget()->setScreen(parentScreen); + } + auto position = Position(); + position.snapped = RectPart::Top | RectPart::Left; diff --git a/network/chat/telegram-desktop/pspec.xml b/network/chat/telegram-desktop/pspec.xml index dbd024d5d6..fa7e4c0744 100644 --- a/network/chat/telegram-desktop/pspec.xml +++ b/network/chat/telegram-desktop/pspec.xml @@ -12,7 +12,7 @@ app:gui Official Telegram Desktop client Telegram is a messaging app with a focus on speed and security, it is super-fast, simple and free. You can use Telegram on all your devices at the same time — your messages sync seamlessly across any number of your phones, tablets or computers. - https://github.com/telegramdesktop/tdesktop/releases/download/v3.7.0/tdesktop-3.7.0-full.tar.gz + https://github.com/telegramdesktop/tdesktop/releases/download/v3.7.1/tdesktop-3.7.1-full.tar.gz cmake ninja @@ -43,9 +43,12 @@ glibmm-devel qt5-svg-devel llvm-clang-devel - abseil-cpp-devel - pipewire-devel + abseil-cpp-devel + pipewire-devel + + tdesktop.patch + @@ -96,8 +99,8 @@ - 2022-04-17 - 3.7.0 + 2022-04-22 + 3.7.1 Version bump. Mustafa Cinasal muscnsl@gmail.com