From owner-svn-ports-all@freebsd.org Mon Oct 7 20:41:48 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 38FFE1392D2; Mon, 7 Oct 2019 20:41:48 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46nC7w1RP4z4YM2; Mon, 7 Oct 2019 20:41:48 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 152911C3A7; Mon, 7 Oct 2019 20:41:48 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x97KfmOB096902; Mon, 7 Oct 2019 20:41:48 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x97KfiNg096884; Mon, 7 Oct 2019 20:41:44 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201910072041.x97KfiNg096884@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Mon, 7 Oct 2019 20:41:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513998 - in head/net-im/telegram-desktop: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/net-im/telegram-desktop: . files X-SVN-Commit-Revision: 513998 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Oct 2019 20:41:48 -0000 Author: swills Date: Mon Oct 7 20:41:44 2019 New Revision: 513998 URL: https://svnweb.freebsd.org/changeset/ports/513998 Log: net-im/telegram-desktop: update to 1.8.9 PR: 240929 Submitted by: Henry Hu (maintainer) Modified: head/net-im/telegram-desktop/Makefile (contents, props changed) head/net-im/telegram-desktop/distinfo (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_freebsd_info__freebsd.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__info.h (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt (contents, props changed) Modified: head/net-im/telegram-desktop/Makefile ============================================================================== --- head/net-im/telegram-desktop/Makefile Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/Makefile Mon Oct 7 20:41:44 2019 (r513998) @@ -2,7 +2,7 @@ PORTNAME= telegram-desktop DISTVERSIONPREFIX= v -DISTVERSION= 1.8.4 +DISTVERSION= 1.8.9 CATEGORIES= net-im MAINTAINER= henry.hu.sh@gmail.com Modified: head/net-im/telegram-desktop/distinfo ============================================================================== --- head/net-im/telegram-desktop/distinfo Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/distinfo Mon Oct 7 20:41:44 2019 (r513998) @@ -1,6 +1,6 @@ -TIMESTAMP = 1567889674 -SHA256 (telegramdesktop-tdesktop-v1.8.4_GH0.tar.gz) = 97f034d78447c99002b8742c75a3a436e709cdf2f5dff79f7ca04a8c76298627 -SIZE (telegramdesktop-tdesktop-v1.8.4_GH0.tar.gz) = 14367314 +TIMESTAMP = 1569722754 +SHA256 (telegramdesktop-tdesktop-v1.8.9_GH0.tar.gz) = 2df035cc4a582660b612656c22ff10d37eb34dbece958f9c99f6a0bd4e2fb61b +SIZE (telegramdesktop-tdesktop-v1.8.9_GH0.tar.gz) = 14407939 SHA256 (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 8cdf2a345897bda1aaabffd4496dffe263768cef3e4254e74ae63545c8e12cc2 SIZE (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 375264 SHA256 (mapbox-variant-550ac2f_GH0.tar.gz) = 7ab3aa7c9fa672027f13721584df5f7ec09c0ecca499d374c6ac76e147ef7354 Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp Mon Oct 7 20:41:44 2019 (r513998) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp.orig 2019-09-06 13:41:43 UTC +--- Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp.orig 2019-09-27 17:04:25 UTC +++ Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp -@@ -103,7 +103,7 @@ constexpr auto kClearSourceTimeout = 10 * crl::time(10 +@@ -105,7 +105,7 @@ constexpr auto kClearSourceTimeout = 10 * crl::time(10 }, 5, }; Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp Mon Oct 7 20:41:44 2019 (r513998) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/core/update_checker.cpp.orig 2019-09-06 13:41:43 UTC +--- Telegram/SourceFiles/core/update_checker.cpp.orig 2019-09-27 17:04:25 UTC +++ Telegram/SourceFiles/core/update_checker.cpp -@@ -1463,6 +1463,9 @@ int UpdateChecker::size() const { +@@ -1458,6 +1458,9 @@ int UpdateChecker::size() const { //} bool checkReadyUpdate() { @@ -10,7 +10,7 @@ QString readyFilePath = cWorkingDir() + qsl("tupdates/temp/ready"), readyPath = cWorkingDir() + qsl("tupdates/temp"); if (!QFile(readyFilePath).exists() || cExeName().isEmpty()) { if (QDir(cWorkingDir() + qsl("tupdates/ready")).exists() || QDir(cWorkingDir() + qsl("tupdates/temp")).exists()) { -@@ -1515,6 +1518,9 @@ bool checkReadyUpdate() { +@@ -1510,6 +1513,9 @@ bool checkReadyUpdate() { #elif defined Q_OS_LINUX // Q_OS_MAC QString curUpdater = (cExeDir() + qsl("Updater")); QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater")); Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp Mon Oct 7 20:41:44 2019 (r513998) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2019-09-06 13:41:43 UTC +--- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2019-09-27 17:04:25 UTC +++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp -@@ -1425,13 +1425,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre +@@ -1428,13 +1428,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre _mouseSelectType = TextSelectType::Letters; //_widget->noSelectingScroll(); // TODO Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp Mon Oct 7 20:41:44 2019 (r513998) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-09-06 13:41:43 UTC +--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-09-27 17:04:25 UTC +++ Telegram/SourceFiles/history/history_inner_widget.cpp -@@ -1390,7 +1390,7 @@ void HistoryInner::mouseActionFinish( +@@ -1394,7 +1394,7 @@ void HistoryInner::mouseActionFinish( _widget->noSelectingScroll(); _widget->updateTopBarSelection(); @@ -9,7 +9,7 @@ if (!_selected.empty() && _selected.cbegin()->second != FullSelection) { const auto [item, selection] = *_selected.cbegin(); if (const auto view = item->mainView()) { -@@ -1399,7 +1399,7 @@ void HistoryInner::mouseActionFinish( +@@ -1403,7 +1403,7 @@ void HistoryInner::mouseActionFinish( QClipboard::Selection); } } Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp Mon Oct 7 20:41:44 2019 (r513998) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2019-09-06 13:41:43 UTC +--- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2019-09-27 17:04:25 UTC +++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp -@@ -2050,7 +2050,7 @@ void ListWidget::mouseActionFinish( +@@ -2053,7 +2053,7 @@ void ListWidget::mouseActionFinish( _mouseSelectType = TextSelectType::Letters; //_widget->noSelectingScroll(); // #TODO select scroll @@ -9,7 +9,7 @@ if (_selectedTextItem && _selectedTextRange.from != _selectedTextRange.to) { if (const auto view = viewForItem(_selectedTextItem)) { -@@ -2059,7 +2059,7 @@ void ListWidget::mouseActionFinish( +@@ -2062,7 +2062,7 @@ void ListWidget::mouseActionFinish( QClipboard::Selection); } } Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_freebsd_info__freebsd.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_freebsd_info__freebsd.cpp Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_freebsd_info__freebsd.cpp Mon Oct 7 20:41:44 2019 (r513998) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/freebsd/info_freebsd.cpp.orig 2019-07-28 03:19:18 UTC +--- Telegram/SourceFiles/platform/freebsd/info_freebsd.cpp.orig 2019-09-29 04:23:33 UTC +++ Telegram/SourceFiles/platform/freebsd/info_freebsd.cpp -@@ -0,0 +1,35 @@ +@@ -0,0 +1,49 @@ +/* +This file is part of Telegram Desktop, +the official desktop application for the Telegram messaging service. @@ -24,15 +24,29 @@ +} + +QString SystemCountry() { -+ return QString(); ++ return QLocale::system().name().split('_').last(); +} + +QString SystemLanguage() { -+ return QString(); ++ const auto system = QLocale::system(); ++ const auto languages = system.uiLanguages(); ++ return languages.isEmpty() ++ ? system.name().split('_').first() ++ : languages.front(); +} + +QDate WhenSystemBecomesOutdated() { + return QDate(); +} ++ ++int AutoUpdateVersion() { ++ return 2; ++} ++ ++QString AutoUpdateKey() { ++ return "freebsd"; ++} ++ ++ + +} // namespace Platform Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp Mon Oct 7 20:41:44 2019 (r513998) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2019-09-27 17:04:25 UTC +++ Telegram/SourceFiles/platform/linux/linux_libs.cpp -@@ -121,6 +121,7 @@ bool setupGtkBase(QLibrary &lib_gtk) { +@@ -128,6 +128,7 @@ bool setupGtkBase(QLibrary &lib_gtk) { return true; } @@ -8,7 +8,7 @@ bool setupAppIndicator(QLibrary &lib_indicator) { if (!load(lib_indicator, "app_indicator_new", app_indicator_new)) return false; if (!load(lib_indicator, "app_indicator_set_status", app_indicator_set_status)) return false; -@@ -130,6 +131,7 @@ bool setupAppIndicator(QLibrary &lib_indicator) { +@@ -137,6 +138,7 @@ bool setupAppIndicator(QLibrary &lib_indicator) { DEBUG_LOG(("Library appindicator functions loaded!")); return true; } @@ -16,7 +16,7 @@ #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION } // namespace -@@ -191,10 +193,12 @@ f_g_type_check_instance_cast g_type_check_instance_cas +@@ -198,10 +200,12 @@ f_g_type_check_instance_cast g_type_check_instance_cas f_g_type_check_instance_is_a g_type_check_instance_is_a = nullptr; f_g_signal_connect_data g_signal_connect_data = nullptr; f_g_signal_handler_disconnect g_signal_handler_disconnect = nullptr; @@ -29,15 +29,15 @@ f_gdk_init_check gdk_init_check = nullptr; f_gdk_pixbuf_new_from_data gdk_pixbuf_new_from_data = nullptr; f_gdk_pixbuf_new_from_file gdk_pixbuf_new_from_file = nullptr; -@@ -229,6 +233,7 @@ void start() { - bool gtkLoaded = false; +@@ -237,6 +241,7 @@ void start() { bool indicatorLoaded = false; + bool isWayland = QGuiApplication::platformName().startsWith(qsl("wayland"), Qt::CaseInsensitive); QLibrary lib_gtk, lib_indicator; +#ifdef HAVE_APPINDICATOR if (loadLibrary(lib_indicator, "ayatana-appindicator3", 1) || loadLibrary(lib_indicator, "appindicator3", 1)) { if (loadLibrary(lib_gtk, "gtk-3", 0)) { gtkLoaded = setupGtkBase(lib_gtk); -@@ -244,6 +249,7 @@ void start() { +@@ -252,6 +257,7 @@ void start() { } } } Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h Mon Oct 7 20:41:44 2019 (r513998) @@ -1,7 +1,7 @@ ---- Telegram/SourceFiles/platform/linux/linux_libs.h.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/platform/linux/linux_libs.h.orig 2019-09-27 17:04:25 UTC +++ Telegram/SourceFiles/platform/linux/linux_libs.h -@@ -10,11 +10,13 @@ https://github.com/telegramdesktop/tdesktop/blob/maste - #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION +@@ -13,11 +13,13 @@ https://github.com/telegramdesktop/tdesktop/blob/maste + extern "C" { #undef signals +#ifdef HAVE_APPINDICATOR @@ -14,7 +14,7 @@ #include #include #define signals public -@@ -275,6 +277,7 @@ inline gulong g_signal_connect_swapped_helper(gpointer +@@ -278,6 +280,7 @@ inline gulong g_signal_connect_swapped_helper(gpointer typedef void (*f_g_signal_handler_disconnect)(gpointer instance, gulong handler_id); extern f_g_signal_handler_disconnect g_signal_handler_disconnect; @@ -22,7 +22,7 @@ typedef AppIndicator* (*f_app_indicator_new)(const gchar *id, const gchar *icon_name, AppIndicatorCategory category); extern f_app_indicator_new app_indicator_new; -@@ -286,6 +289,7 @@ extern f_app_indicator_set_menu app_indicator_set_menu +@@ -289,6 +292,7 @@ extern f_app_indicator_set_menu app_indicator_set_menu typedef void (*f_app_indicator_set_icon_full)(AppIndicator *self, const gchar *icon_name, const gchar *icon_desc); extern f_app_indicator_set_icon_full app_indicator_set_icon_full; Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp Mon Oct 7 20:41:44 2019 (r513998) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2019-09-06 13:41:43 UTC +--- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2019-09-27 17:04:25 UTC +++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp -@@ -26,7 +26,9 @@ bool noQtTrayIcon = false, tryAppIndicator = false; +@@ -28,7 +28,9 @@ bool noQtTrayIcon = false, tryAppIndicator = false; bool useGtkBase = false, useAppIndicator = false, useStatusIcon = false, trayIconChecked = false, useUnityCount = false; #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION @@ -10,7 +10,7 @@ GtkStatusIcon *_trayIcon = 0; GtkWidget *_trayMenu = 0; GdkPixbuf *_trayPixbuf = 0; -@@ -292,7 +294,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { +@@ -294,7 +296,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { if (noQtTrayIcon) { #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION if (useAppIndicator) { @@ -20,7 +20,7 @@ } else if (useStatusIcon) { Libs::gtk_status_icon_set_visible(_trayIcon, false); } -@@ -308,7 +312,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { +@@ -310,7 +314,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { if (noQtTrayIcon) { #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION if (useAppIndicator) { @@ -30,7 +30,7 @@ } else if (useStatusIcon) { Libs::gtk_status_icon_set_visible(_trayIcon, true); } -@@ -327,7 +333,9 @@ void MainWindow::psUpdateIndicator() { +@@ -329,7 +335,9 @@ void MainWindow::psUpdateIndicator() { if (iconFile.exists()) { QByteArray path = QFile::encodeName(iconFile.absoluteFilePath()), name = QFile::encodeName(iconFile.fileName()); name = name.mid(0, name.size() - 4); @@ -40,7 +40,7 @@ } else { useAppIndicator = false; } -@@ -424,11 +432,15 @@ void MainWindow::LibsLoaded() { +@@ -426,11 +434,15 @@ void MainWindow::LibsLoaded() { && (Libs::g_object_ref_sink != nullptr) && (Libs::g_object_unref != nullptr); @@ -56,7 +56,7 @@ if (tryAppIndicator && useGtkBase && useAppIndicator) { noQtTrayIcon = true; -@@ -464,6 +476,7 @@ void MainWindow::psCreateTrayIcon() { +@@ -466,6 +478,7 @@ void MainWindow::psCreateTrayIcon() { } #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION @@ -64,7 +64,7 @@ if (useAppIndicator) { DEBUG_LOG(("Trying to create AppIndicator")); _trayMenu = Libs::gtk_menu_new(); -@@ -494,6 +507,7 @@ void MainWindow::psCreateTrayIcon() { +@@ -496,6 +509,7 @@ void MainWindow::psCreateTrayIcon() { useAppIndicator = false; } } @@ -72,7 +72,7 @@ if (useStatusIcon) { if (Libs::gdk_init_check(0, 0)) { if (!_trayMenu) _trayMenu = Libs::gtk_menu_new(); -@@ -628,10 +642,12 @@ MainWindow::~MainWindow() { +@@ -630,10 +644,12 @@ MainWindow::~MainWindow() { Libs::g_object_unref(_trayMenu); _trayMenu = nullptr; } Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__info.h ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__info.h Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__info.h Mon Oct 7 20:41:44 2019 (r513998) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/platform_info.h.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/platform/platform_info.h.orig 2019-09-27 17:04:25 UTC +++ Telegram/SourceFiles/platform/platform_info.h -@@ -49,4 +49,6 @@ namespace Platform { +@@ -51,4 +51,6 @@ namespace Platform { #include "platform/linux/info_linux.h" #elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX #include "platform/win/info_win.h" Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp Mon Oct 7 20:41:44 2019 (r513998) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/twidget.cpp.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/ui/twidget.cpp.orig 2019-09-27 17:04:25 UTC +++ Telegram/SourceFiles/ui/twidget.cpp -@@ -270,9 +270,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::T +@@ -274,9 +274,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::T , button , QGuiApplication::mouseButtons() | button , QGuiApplication::keyboardModifiers() Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp Mon Oct 7 20:41:44 2019 (r513998) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2019-09-27 17:04:25 UTC +++ Telegram/SourceFiles/ui/widgets/labels.cpp -@@ -391,11 +391,11 @@ Ui::Text::StateResult FlatLabel::dragActionFinish(cons +@@ -396,11 +396,11 @@ Ui::Text::StateResult FlatLabel::dragActionFinish(cons } } Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp Mon Oct 7 20:41:44 2019 (r513998) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/window/main_window.cpp.orig 2019-09-06 13:41:43 UTC +--- Telegram/SourceFiles/window/main_window.cpp.orig 2019-09-27 17:04:25 UTC +++ Telegram/SourceFiles/window/main_window.cpp -@@ -564,7 +564,7 @@ bool MainWindow::minimizeToTray() { +@@ -571,7 +571,7 @@ bool MainWindow::minimizeToTray() { } void MainWindow::reActivateWindow() { @@ -9,7 +9,7 @@ const auto reActivate = [=] { if (const auto w = App::wnd()) { if (auto f = QApplication::focusWidget()) { -@@ -579,7 +579,7 @@ void MainWindow::reActivateWindow() { +@@ -586,7 +586,7 @@ void MainWindow::reActivateWindow() { }; crl::on_main(this, reActivate); App::CallDelayed(200, this, reActivate); Modified: head/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt Mon Oct 7 20:36:10 2019 (r513997) +++ head/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt Mon Oct 7 20:41:44 2019 (r513998) @@ -1,6 +1,6 @@ ---- Telegram/gyp/telegram_sources.txt.orig 2019-09-06 13:41:43 UTC +--- Telegram/gyp/telegram_sources.txt.orig 2019-09-27 17:04:25 UTC +++ Telegram/gyp/telegram_sources.txt -@@ -605,8 +605,8 @@ +@@ -607,8 +607,8 @@ <(src_loc)/platform/linux/linux_libs.h <(src_loc)/platform/linux/file_utilities_linux.cpp <(src_loc)/platform/linux/file_utilities_linux.h @@ -11,7 +11,7 @@ <(src_loc)/platform/linux/launcher_linux.cpp <(src_loc)/platform/linux/launcher_linux.h <(src_loc)/platform/linux/main_window_linux.cpp -@@ -923,14 +923,7 @@ +@@ -931,14 +931,7 @@ <(emoji_suggestions_loc)/emoji_suggestions.cpp <(emoji_suggestions_loc)/emoji_suggestions.h