diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-im/telegram-desktop/files | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'net-im/telegram-desktop/files')
-rw-r--r-- | net-im/telegram-desktop/files/2.1.0-kde-dir.patch | 51 | ||||
-rw-r--r-- | net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch | 23 |
2 files changed, 0 insertions, 74 deletions
diff --git a/net-im/telegram-desktop/files/2.1.0-kde-dir.patch b/net-im/telegram-desktop/files/2.1.0-kde-dir.patch deleted file mode 100644 index b936275e3613..000000000000 --- a/net-im/telegram-desktop/files/2.1.0-kde-dir.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 7bc86cc9af28ba3d04a5cb69f6f7c16bfe7f8719 Mon Sep 17 00:00:00 2001 -From: Ilya Fedin <fedin-ilja2010@ya.ru> -Date: Tue, 21 Apr 2020 23:05:17 +0400 -Subject: [PATCH] Fix directory opening with portal and use them by default - with KDE - ---- - .../SourceFiles/platform/linux/file_utilities_linux.cpp | 6 +++--- - Telegram/SourceFiles/platform/linux/specific_linux.cpp | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp -index 47dd56a411..88f8a69a91 100644 ---- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp -+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp -@@ -83,11 +83,11 @@ constexpr auto kPreviewHeight = 512; - using Type = ::FileDialog::internal::Type; - - #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION --bool NativeSupported() { -+bool NativeSupported(Type type = Type::ReadFile) { - #ifndef TDESKTOP_FORCE_GTK_FILE_DIALOG - return false; - #endif // TDESKTOP_FORCE_GTK_FILE_DIALOG -- return !Platform::UseXDGDesktopPortal() -+ return (!Platform::UseXDGDesktopPortal() || type == Type::ReadFolder) - && Platform::internal::GdkHelperLoaded() - && (Libs::gtk_widget_hide_on_delete != nullptr) - && (Libs::gtk_clipboard_store != nullptr) -@@ -192,7 +192,7 @@ bool Get( - parent = parent->window(); - } - #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION -- if (NativeSupported()) { -+ if (NativeSupported(type)) { - return GetNative( - parent, - files, -diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -index 0bb3963420..c12e5a0780 100644 ---- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp -+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -@@ -266,7 +266,7 @@ bool UseXDGDesktopPortal() { - const auto envVar = qEnvironmentVariableIsSet("TDESKTOP_USE_PORTAL"); - const auto portalPresent = IsXDGDesktopPortalPresent(); - -- return envVar && portalPresent; -+ return (DesktopEnvironment::IsKDE() || envVar) && portalPresent; - }(); - - return UsePortal; diff --git a/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch b/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch deleted file mode 100644 index 80c02b10db2b..000000000000 --- a/net-im/telegram-desktop/files/telegram-desktop-qt5.15.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ru tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/animation_value.h tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/animation_value.h ---- tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/animation_value.h 2020-05-24 09:44:41.000000000 +0200 -+++ tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/animation_value.h 2020-05-26 20:31:34.381796057 +0200 -@@ -10,6 +10,8 @@ - - #include "ui/style/style_core.h" - -+#include <QPainterPath> -+ - namespace anim { - - enum class type { -diff -ru tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/cross_animation.cpp tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/cross_animation.cpp ---- tdesktop-2.1.7-full.orig/Telegram/lib_ui/ui/effects/cross_animation.cpp 2020-05-24 09:44:41.000000000 +0200 -+++ tdesktop-2.1.7-full/Telegram/lib_ui/ui/effects/cross_animation.cpp 2020-05-26 20:32:16.340015129 +0200 -@@ -10,6 +10,7 @@ - #include "ui/painter.h" - - #include <QtCore/QtMath> -+#include <QPainterPath> - - namespace Ui { - namespace { |