From 0ce723bce5554a3e9ac3cc7cdae2c2d053182cb7 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 21 Jan 2020 21:52:30 +1000 Subject: [PATCH] Telegram: cleanup patchset --- .../patches/telegram_desktop-1.9.4.patchset | 45 ------------------- 1 file changed, 45 deletions(-) diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.9.4.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.9.4.patchset index ef612b0bd..8c005cab9 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.9.4.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.9.4.patchset @@ -1800,37 +1800,6 @@ index 6aea663..a5c46ef 100644 -#endif // Q_OS_MAC || Q_OS_WIN || Q_OS_WINRT || Q_OS_LINUX +#endif // Q_OS_MAC || Q_OS_WIN || Q_OS_WINRT || Q_OS_LINUX || Q_OS_HAIKU -diff --git a/Telegram/SourceFiles/qt_static_plugins.cpp b/Telegram/SourceFiles/qt_static_plugins.cpp -index cc1a767..c1b5859 100644 ---- a/Telegram/SourceFiles/qt_static_plugins.cpp -+++ b/Telegram/SourceFiles/qt_static_plugins.cpp -@@ -7,26 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - */ - #include - --Q_IMPORT_PLUGIN(QWebpPlugin) - - #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) --Q_IMPORT_PLUGIN(QJpegPlugin) --Q_IMPORT_PLUGIN(QGifPlugin) - #endif // Qt 5.8.0 - - #ifdef Q_OS_WIN --Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) - #elif defined Q_OS_MAC // Q_OS_WIN --Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) --Q_IMPORT_PLUGIN(QGenericEnginePlugin) - #elif defined Q_OS_LINUX // Q_OS_WIN | Q_OS_MAC --Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) --Q_IMPORT_PLUGIN(QConnmanEnginePlugin) --Q_IMPORT_PLUGIN(QGenericEnginePlugin) --Q_IMPORT_PLUGIN(QNetworkManagerEnginePlugin) --Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin) --Q_IMPORT_PLUGIN(QIbusPlatformInputContextPlugin) --Q_IMPORT_PLUGIN(QFcitxPlatformInputContextPlugin) --Q_IMPORT_PLUGIN(QHimePlatformInputContextPlugin) --Q_IMPORT_PLUGIN(NimfInputContextPlugin) - #endif // Q_OS_WIN | Q_OS_MAC | Q_OS_LINUX diff --git a/Telegram/SourceFiles/settings/settings_calls.cpp b/Telegram/SourceFiles/settings/settings_calls.cpp index 31d16e3..e592a75 100644 --- a/Telegram/SourceFiles/settings/settings_calls.cpp @@ -4320,20 +4289,6 @@ index 81bf4d1..4b462bd 100644 ui/platform/ui_platform_window.h ui/platform/ui_platform_utility.h ui/style/style_core.cpp -diff --git a/Telegram/lib_ui/qt_conf/haiku.qrc b/Telegram/lib_ui/qt_conf/haiku.qrc -new file mode 100644 -index 0000000..b9f5692 ---- /dev/null -+++ b/Telegram/lib_ui/qt_conf/haiku.qrc -@@ -0,0 +1,8 @@ -+ -+ -+ qt_linux.conf -+ -+ -+ fc-custom.conf -+ -+ diff --git a/Telegram/lib_ui/ui/platform/haiku/ui_utility_haiku.cpp b/Telegram/lib_ui/ui/platform/haiku/ui_utility_haiku.cpp new file mode 100644 index 0000000..0bd8f94