From 303a58df8743394407c51da572d8bcfdca2b1e4c Mon Sep 17 00:00:00 2001 From: Rmys Date: Sat, 6 Aug 2022 19:46:53 +0300 Subject: [PATCH] tdesktop-4.0.4 --- network/chat/telegram-desktop/actions.py | 4 + .../telegram-desktop/files/tdesktop.patch | 84 +++++-------------- network/chat/telegram-desktop/pspec.xml | 12 ++- 3 files changed, 36 insertions(+), 64 deletions(-) diff --git a/network/chat/telegram-desktop/actions.py b/network/chat/telegram-desktop/actions.py index 1189c9e077..d44abf37d1 100644 --- a/network/chat/telegram-desktop/actions.py +++ b/network/chat/telegram-desktop/actions.py @@ -19,6 +19,10 @@ def setup(): cmake/external/rlottie/CMakeLists.txt || die") shelltools.system('echo "target_link_libraries(external_webrtc INTERFACE jpeg Xcomposite Xdamage Xext Xfixes Xrandr Xrender Xtst X11)" | tee -a cmake/external/webrtc/CMakeLists.txt') pisitools.cxxflags.add("-Wno-deprecated-declarations -Wno-error=deprecated-declarations -Wno-switch -Wp,-U_GLIBCXX_ASSERTIONS") + #pisitools.cxxflags.add(" -std=c++17") + #shelltools.export("CC", "gcc") + #shelltools.export("CXX", "g++") + params = ' '.join([ '-B build', '-Ddisable_autoupdate=1', diff --git a/network/chat/telegram-desktop/files/tdesktop.patch b/network/chat/telegram-desktop/files/tdesktop.patch index 2bb2c21720..6104fe8788 100644 --- a/network/chat/telegram-desktop/files/tdesktop.patch +++ b/network/chat/telegram-desktop/files/tdesktop.patch @@ -1,62 +1,22 @@ -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 -Nuar a/Telegram/lib_lottie/lottie/lottie_emoji.h b/Telegram/lib_lottie/lottie/lottie_emoji.h +--- a/Telegram/lib_lottie/lottie/lottie_emoji.h 2022-07-25 12:46:55.000000000 +0300 ++++ b/Telegram/lib_lottie/lottie/lottie_emoji.h 2022-08-06 15:19:52.852451704 +0300 +@@ -9,6 +9,7 @@ + #include "ui/effects/frame_generator.h" + + #include ++#include + + namespace rlottie { + class Animation; +diff -Nuar a/Telegram/SourceFiles/ffmpeg/ffmpeg_emoji.h b/Telegram/SourceFiles/ffmpeg/ffmpeg_emoji.h +--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_emoji.h 2022-08-05 10:12:48.000000000 +0300 ++++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_emoji.h 2022-08-06 15:19:14.286454487 +0300 +@@ -10,6 +10,7 @@ + #include "ui/effects/frame_generator.h" + + #include ++#include + + namespace FFmpeg { + diff --git a/network/chat/telegram-desktop/pspec.xml b/network/chat/telegram-desktop/pspec.xml index 0e20add6fd..8993954e92 100644 --- a/network/chat/telegram-desktop/pspec.xml +++ b/network/chat/telegram-desktop/pspec.xml @@ -10,9 +10,10 @@ GPLv3 app:gui + telegram 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/v4.0.2/tdesktop-4.0.2-full.tar.gz + https://github.com/telegramdesktop/tdesktop/releases/download/v4.0.4/tdesktop-4.0.4-full.tar.gz fix-tgcalls-cstdint.patch @@ -51,7 +52,7 @@ pipewire-devel - + tdesktop.patch @@ -103,6 +104,13 @@ + + 2022-08-05 + 4.0.4 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-06-29 4.0.2