diff options
Diffstat (limited to 'net-im/telegram-desktop/files')
-rw-r--r-- | net-im/telegram-desktop/files/tdesktop-4.3.4-fix-disabling-spellcheck.patch | 43 | ||||
-rw-r--r-- | net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-1.patch | 42 |
2 files changed, 0 insertions, 85 deletions
diff --git a/net-im/telegram-desktop/files/tdesktop-4.3.4-fix-disabling-spellcheck.patch b/net-im/telegram-desktop/files/tdesktop-4.3.4-fix-disabling-spellcheck.patch deleted file mode 100644 index 9529370cdbae..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-4.3.4-fix-disabling-spellcheck.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix building without spellcheck - -Upcoming changes to tdesktop include language recognition, which is a bit of a -doozy, and as is tradition, "unusual" compilation flags go untested. - -Regular builds would always return false here, anyway, as linux isn't a -priority with these things. - -/var/tmp/portage/net-im/telegram-desktop-4.3.4/work/tdesktop-4.3.4-full/Telegram/SourceFiles/boxes/translate_box.cpp:18:10: fatal error: spellcheck/platform/platform_language.h: No such file or directory - 18 | #include "spellcheck/platform/platform_language.h" - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -compilation terminated. - ---- tdesktop-4.3.4-full.orig/Telegram/SourceFiles/boxes/translate_box.cpp -+++ tdesktop-4.3.4-full/Telegram/SourceFiles/boxes/translate_box.cpp -@@ -15,7 +15,9 @@ - #include "main/main_session.h" - #include "mtproto/sender.h" - #include "settings/settings_common.h" -+#ifndef TDESKTOP_DISABLE_SPELLCHECK - #include "spellcheck/platform/platform_language.h" -+#endif - #include "ui/effects/loading_element.h" - #include "ui/layers/generic_box.h" - #include "ui/widgets/buttons.h" -@@ -331,6 +333,7 @@ - if (!hasLetters) { - return true; - } -+#ifndef TDESKTOP_DISABLE_SPELLCHECK - const auto result = Platform::Language::Recognize(text); - if (result.unknown) { - return false; -@@ -343,6 +346,9 @@ - ? QLocale::English - : settingsLang; - return (result.locale.language() == skip); -+#else -+ return false; -+#endif - } - - } // namespace Ui diff --git a/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-1.patch b/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-1.patch deleted file mode 100644 index 3229b5be54c8..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-4.3.4-qt5-incompatibility-1.patch +++ /dev/null @@ -1,42 +0,0 @@ -Disable portal-related event loop with qt5 - -QEventLoop::ApplicationExec is undocumented, but only present in qt6, so I have -no idea if the functionality can be preserved in qt5. Upstream code indicates -that not using it at all is safe, and unlikely to cause problems in -distribution packaging. - -Yet another reminder that qt5 is dying. - -/var/tmp/portage/net-im/telegram-desktop-4.3.4/work/tdesktop-4.3.4-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp: In lambda function: -/var/tmp/portage/net-im/telegram-desktop-4.3.4/work/tdesktop-4.3.4-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp:294:55: error: ‘ApplicationExec’ is not a member of ‘QEventLoop’ - 294 | loop.exec(QEventLoop::ApplicationExec); - | ^~~~~~~~~~~~~~~ - ---- tdesktop-4.3.4-full.orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp -+++ tdesktop-4.3.4-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp -@@ -229,6 +229,7 @@ - } - } - -+#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0) - void LaunchGApplication() { - const auto connection = [] { - try { -@@ -401,6 +402,7 @@ - }); - } - } -+#endif // QT_VERSION >= QT_VERSION_CHECK(6, 2, 0) - - bool GenerateDesktopFile( - const QString &targetPath, -@@ -862,7 +864,9 @@ - LOG(("Fallback icon theme: %1").arg(QIcon::fallbackThemeName())); - - #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION -+#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0) - LaunchGApplication(); -+#endif // QT_VERSION >= QT_VERSION_CHECK(6, 2, 0) - #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION - } - |