Attachment 207951 Details for Bug 240929 – patch for 1.8.9. Please apply with "patch -p0".

[patch] patch for 1.8.9. Please apply with "patch -p0".

telegram-desktop-1.8.9.patch (text/plain), 21.54 KB, created by Henry Hu on 2019-09-30 03:43:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Henry Hu

Created: 2019-09-30 03:43:06 UTC

Size: 21.54 KB

patch

obsolete

>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/Makefile ./Makefile
>--- /usr/ports/net-im/telegram-desktop/Makefile	2019-09-28 22:03:54.441069000 -0400
>+++ ./Makefile	2019-09-29 23:35:32.602938000 -0400
>@@ -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
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/distinfo ./distinfo
>--- /usr/ports/net-im/telegram-desktop/distinfo	2019-09-28 22:03:54.438017000 -0400
>+++ ./distinfo	2019-09-28 22:05:54.665091000 -0400
>@@ -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
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp ./files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp	2019-09-28 22:03:54.441262000 -0400
>+++ ./files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp	2019-09-29 00:23:33.546953000 -0400
>@@ -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,
>  	};
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp ./files/patch-Telegram_SourceFiles_core_update__checker.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp	2019-09-28 22:03:54.468232000 -0400
>+++ ./files/patch-Telegram_SourceFiles_core_update__checker.cpp	2019-09-29 00:23:33.549006000 -0400
>@@ -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"));
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp ./files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp	2019-09-28 22:03:54.459988000 -0400
>+++ ./files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp	2019-09-29 00:23:33.552100000 -0400
>@@ -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
>  
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp ./files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp	2019-09-28 22:03:54.455765000 -0400
>+++ ./files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp	2019-09-29 00:23:33.553183000 -0400
>@@ -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);
>  		}
>  	}
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp ./files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp	2019-09-28 22:03:54.468434000 -0400
>+++ ./files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp	2019-09-29 00:23:33.554205000 -0400
>@@ -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);
>  }
>  	}
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_freebsd_info__freebsd.cpp ./files/patch-Telegram_SourceFiles_platform_freebsd_info__freebsd.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_freebsd_info__freebsd.cpp	2019-09-07 16:22:46.590381000 -0400
>+++ ./files/patch-Telegram_SourceFiles_platform_freebsd_info__freebsd.cpp	2019-09-29 00:23:33.556281000 -0400
>@@ -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
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp ./files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp	2019-04-20 20:19:00.021794000 -0400
>+++ ./files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp	2019-09-29 00:23:33.558422000 -0400
>@@ -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() {
>  			}
>  		}
>  	}
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h ./files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h	2019-04-20 20:19:00.250221000 -0400
>+++ ./files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h	2019-09-29 00:23:33.559471000 -0400
>@@ -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 <gtk/gtk.h>
>  #include <gdk/gdk.h>
>  #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;
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp ./files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp	2019-09-28 22:03:54.475892000 -0400
>+++ ./files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp	2019-09-29 00:23:33.560538000 -0400
>@@ -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;
>  	}
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__info.h ./files/patch-Telegram_SourceFiles_platform_platform__info.h
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__info.h	2019-09-07 16:22:46.590643000 -0400
>+++ ./files/patch-Telegram_SourceFiles_platform_platform__info.h	2019-09-29 00:23:33.563823000 -0400
>@@ -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"
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp ./files/patch-Telegram_SourceFiles_ui_twidget.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp	2019-09-07 16:22:46.590902000 -0400
>+++ ./files/patch-Telegram_SourceFiles_ui_twidget.cpp	2019-09-29 00:23:33.576157000 -0400
>@@ -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()
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp ./files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp	2019-09-07 16:22:46.644555000 -0400
>+++ ./files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp	2019-09-29 00:23:33.577172000 -0400
>@@ -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
>  		}
>  	}
>  
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp ./files/patch-Telegram_SourceFiles_window_main__window.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp	2019-09-28 22:03:54.460376000 -0400
>+++ ./files/patch-Telegram_SourceFiles_window_main__window.cpp	2019-09-29 00:23:33.578211000 -0400
>@@ -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);
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt ./files/patch-Telegram_gyp_telegram__sources.txt
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt	2019-09-28 22:03:54.468822000 -0400
>+++ ./files/patch-Telegram_gyp_telegram__sources.txt	2019-09-29 00:23:33.604020000 -0400
>@@ -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
>

Flags:

henry.hu.sh: maintainer-approval+

Actions: View | Diff

Attachments on bug 240929: 207951