Attachment #203849 for bug #237428




# $FreeBSD: head/net-im/telegram-desktop/Makefile 484686 2018-11-11 11:45:19Z makc $

PORTNAME=	telegram-desktop
DISTVERSIONPREFIX=	v
DISTVERSION=	1.6.7
CATEGORIES=	net-im

MAINTAINER=	henry.hu.sh@gmail.com

GH_TUPLE=	catchorg:Catch2:5ca44b68:catch/Telegram/ThirdParty/Catch \
		mapbox:variant:550ac2f:variant/Telegram/ThirdParty/variant \
		Microsoft:GSL:d846fe5:gsl/Telegram/ThirdParty/GSL \
		telegramdesktop:libtgvoip:e701050:libtgvoip/Telegram/ThirdParty/libtgvoip \
		telegramdesktop:crl:84072fb:crl/Telegram/ThirdParty/crl \
		Cyan4973:xxHash:7cc9639:xxhash/Telegram/ThirdParty/xxHash
USE_GNOME=	glib20
USE_QT=		core gui imageformats network widgets buildtools_build qmake_build dbus




TIMESTAMP = 1555805465
SHA256 (telegramdesktop-tdesktop-v1.6.7_GH0.tar.gz) = 77f4cf6507d1ebc26eaef472aa4817cc57a77c5e3065f6b2afa294530f0633a1
SIZE (telegramdesktop-tdesktop-v1.6.7_GH0.tar.gz) = 14323106
SHA256 (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 8cdf2a345897bda1aaabffd4496dffe263768cef3e4254e74ae63545c8e12cc2
SIZE (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 375264
SHA256 (mapbox-variant-550ac2f_GH0.tar.gz) = 7ab3aa7c9fa672027f13721584df5f7ec09c0ecca499d374c6ac76e147ef7354
SIZE (mapbox-variant-550ac2f_GH0.tar.gz) = 108686
SHA256 (Microsoft-GSL-d846fe5_GH0.tar.gz) = 4c463f93ca3b1dcb0b8d73b54309c1d31145761c457f1a6fd53554a6d469b468
SIZE (Microsoft-GSL-d846fe5_GH0.tar.gz) = 58930
SHA256 (telegramdesktop-libtgvoip-e701050_GH0.tar.gz) = 16cb5f4588f4a35877aacc5f39bb93e9c0ac5fca1ddfc4dabda841131c29d3d5
SIZE (telegramdesktop-libtgvoip-e701050_GH0.tar.gz) = 1484741
SHA256 (telegramdesktop-crl-84072fb_GH0.tar.gz) = 0d1c5a08b94c90ef213fadfdfb1f4587a23c01474195931c67bc98fb7fd01936
SIZE (telegramdesktop-crl-84072fb_GH0.tar.gz) = 21681
SHA256 (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = f40801820e885f92bbe3d2434efeb39aa18eeaf878341982e8525b538468e3ed
SIZE (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = 37534




--- Telegram/gyp/codegen_rules.gypi.orig	2019-04-13 06:46:58 UTC
+++ Telegram/gyp/codegen_rules.gypi
@@ -15,7 +15,7 @@
       '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp',

       '-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp',
       '<@(qrc_files)',
     ],
--- Telegram/gyp/lib_export.gyp.orig	2019-04-13 06:46:58 UTC
+++ Telegram/gyp/lib_export.gyp
@@ -46,7 +46,7 @@
     'include_dirs': [

       '<(submodules_loc)/GSL/include',
       '<(submodules_loc)/variant/include',
       '<(submodules_loc)/crl/src',
--- Telegram/gyp/lib_scheme.gyp.orig	2019-04-13 06:46:58 UTC
+++ Telegram/gyp/lib_scheme.gyp
@@ -48,7 +48,7 @@
         '<(SHARED_INTERMEDIATE_DIR)/scheme.h',

         '-o', '<(SHARED_INTERMEDIATE_DIR)', '<(res_loc)/scheme.tl',
       ],
       'message': 'codegen_scheme-ing scheme.tl..',
--- Telegram/gyp/qt_moc.gypi.orig	2019-04-13 06:46:58 UTC
+++ Telegram/gyp/qt_moc.gypi
@@ -12,12 +12,12 @@
       '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',

       # '<!@(python -c "for s in \'<@(_include_dirs)\'.split(\' \'): print(\'-I\' + s)")',
       '<(RULE_INPUT_PATH)',
       '-o', '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
--- Telegram/gyp/qt_rcc.gypi.orig	2019-04-13 06:46:58 UTC
+++ Telegram/gyp/qt_rcc.gypi
@@ -15,7 +15,7 @@
       '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp',

       '-name', '<(RULE_INPUT_ROOT)',
       '-no-compress',
       '<(RULE_INPUT_PATH)',
--- Telegram/gyp/qt.gypi.orig	2019-04-13 06:46:58 UTC
+++ Telegram/gyp/qt.gypi
@@ -14,25 +14,21 @@
               [ 'build_macold', {

         '-pthread',
         '-rdynamic',
       ],
--- Telegram/gyp/telegram_linux.gypi.orig	2019-04-13 06:46:58 UTC
+++ Telegram/gyp/telegram_linux.gypi
@@ -10,7 +10,7 @@
       'variables': {

         ],
       }], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', {
         'cflags_cc': [ '<!(pkg-config --cflags ayatana-appindicator3-0.1)' ],
--- Telegram/gyp/Telegram.gyp.orig	2019-04-13 06:46:58 UTC
+++ Telegram/gyp/Telegram.gyp
@@ -51,7 +51,7 @@
         'pt-BR',

     ],
     'conditions': [
       [ '"<(official_build_target)" != ""', {
--- Telegram/gyp/tests/tests.gyp.orig	2019-04-13 06:46:58 UTC
+++ Telegram/gyp/tests/tests.gyp
@@ -13,7 +13,7 @@
     'src_loc': '../../SourceFiles',

   },
   'targets': [{
     'target_name': 'tests',
--- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig	2019-04-03 18:20:00 UTC
+++ Telegram/ThirdParty/libtgvoip/libtgvoip.gyp
@@ -14,11 +14,12 @@
         'variables': {

         ],
         'direct_dependent_settings': {
           'include_dirs': [
@@ -743,7 +744,7 @@
             },
           ],
           [

               'sources/': [['exclude', '<(tgvoip_src_loc)/os/linux/']],
             },
           ],
@@ -891,13 +892,16 @@
             },
           ],
           [

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_core_update__checker.cpp (-3 / +3 lines)
1	--- Telegram/SourceFiles/core/update_checker.cpp.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/core/update_checker.cpp.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/SourceFiles/core/update_checker.cpp	2	+++ Telegram/SourceFiles/core/update_checker.cpp
3	@@ -1457,6 +1457,9 @@ int UpdateChecker::size() const {	3	@@ -1456,6 +1456,9 @@ int UpdateChecker::size() const {
4	//}	4	//}
5		5
6	bool checkReadyUpdate() {	6	bool checkReadyUpdate() {
Lines 10-16 Link Here
10	QString readyFilePath = cWorkingDir() + qsl("tupdates/temp/ready"), readyPath = cWorkingDir() + qsl("tupdates/temp");	10	QString readyFilePath = cWorkingDir() + qsl("tupdates/temp/ready"), readyPath = cWorkingDir() + qsl("tupdates/temp");
11	if (!QFile(readyFilePath).exists() \|\| cExeName().isEmpty()) {	11	if (!QFile(readyFilePath).exists() \|\| cExeName().isEmpty()) {
12	if (QDir(cWorkingDir() + qsl("tupdates/ready")).exists() \|\| QDir(cWorkingDir() + qsl("tupdates/temp")).exists()) {	12	if (QDir(cWorkingDir() + qsl("tupdates/ready")).exists() \|\| QDir(cWorkingDir() + qsl("tupdates/temp")).exists()) {
13	@@ -1509,6 +1512,9 @@ bool checkReadyUpdate() {	13	@@ -1508,6 +1511,9 @@ bool checkReadyUpdate() {
14	#elif defined Q_OS_LINUX // Q_OS_MAC	14	#elif defined Q_OS_LINUX // Q_OS_MAC
15	QString curUpdater = (cExeDir() + qsl("Updater"));	15	QString curUpdater = (cExeDir() + qsl("Updater"));
16	QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater"));	16	QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater"));

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_core_utils.h (-2 / +2 lines)
1	--- Telegram/SourceFiles/core/utils.h.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/core/utils.h.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/SourceFiles/core/utils.h	2	+++ Telegram/SourceFiles/core/utils.h
3	@@ -350,6 +350,7 @@ enum DBIPlatform {	3	@@ -347,6 +347,7 @@ enum DBIPlatform {
4	dbipLinux64 = 2,	4	dbipLinux64 = 2,
5	dbipLinux32 = 3,	5	dbipLinux32 = 3,
6	dbipMacOld = 4,	6	dbipMacOld = 4,

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_data_data__document.cpp (-2 / +2 lines)
1	--- Telegram/SourceFiles/data/data_document.cpp.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/data/data_document.cpp.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/SourceFiles/data/data_document.cpp	2	+++ Telegram/SourceFiles/data/data_document.cpp
3	@@ -128,7 +128,7 @@ QString FileNameUnsafe(	3	@@ -133,7 +133,7 @@ QString FileNameUnsafe(
4	name = name.replace(QRegularExpression(qsl("[\\\\\\/\\:\\*\\?\\\"\\<\\>\\\|]")), qsl("_"));	4	name = name.replace(QRegularExpression(qsl("[\\\\\\/\\:\\*\\?\\\"\\<\\>\\\|]")), qsl("_"));
5	#elif defined Q_OS_MAC	5	#elif defined Q_OS_MAC
6	name = name.replace(QRegularExpression(qsl("[\\:]")), qsl("_"));	6	name = name.replace(QRegularExpression(qsl("[\\:]")), qsl("_"));

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp (-2 / +2 lines)
1	--- Telegram/SourceFiles/export/data/export_data_types.cpp.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/export/data/export_data_types.cpp.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/SourceFiles/export/data/export_data_types.cpp	2	+++ Telegram/SourceFiles/export/data/export_data_types.cpp
3	@@ -369,9 +369,9 @@ QString CleanDocumentName(QString name) {	3	@@ -353,9 +353,9 @@ QString CleanDocumentName(QString name) {
4	'\|',	4	'\|',
5	#elif defined Q_OS_MAC // Q_OS_WIN	5	#elif defined Q_OS_MAC // Q_OS_WIN
6	':',	6	':',




--- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig	2019-04-13 06:46:58 UTC
+++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -1392,13 +1392,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre
 	_mouseSelectType = TextSelectType::Letters;
 	//_widget->noSelectingScroll(); // TODO
 
-#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64
+#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 || defined Q_OS_FREEBSD
 	if (_selectedItem && _selectedText.from != _selectedText.to) {
 		SetClipboardText(
 			_selectedItem->selectedText(_selectedText),
 			QClipboard::Selection);
 	}

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp (-3 / +3 lines)
1	--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/SourceFiles/history/history_inner_widget.cpp	2	+++ Telegram/SourceFiles/history/history_inner_widget.cpp
3	@@ -1362,7 +1362,7 @@ void HistoryInner::mouseActionFinish(	3	@@ -1376,7 +1376,7 @@ void HistoryInner::mouseActionFinish(
4	_widget->noSelectingScroll();	4	_widget->noSelectingScroll();
5	_widget->updateTopBarSelection();	5	_widget->updateTopBarSelection();
6		6
Lines 9-15 Link Here
9	if (!_selected.empty() && _selected.cbegin()->second != FullSelection) {	9	if (!_selected.empty() && _selected.cbegin()->second != FullSelection) {
10	const auto [item, selection] = *_selected.cbegin();	10	const auto [item, selection] = *_selected.cbegin();
11	if (const auto view = item->mainView()) {	11	if (const auto view = item->mainView()) {
12	@@ -1371,7 +1371,7 @@ void HistoryInner::mouseActionFinish(	12	@@ -1385,7 +1385,7 @@ void HistoryInner::mouseActionFinish(
13	QClipboard::Selection);	13	QClipboard::Selection);
14	}	14	}
15	}	15	}

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp (-3 / +3 lines)
1	--- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp	2	+++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp
3	@@ -2018,7 +2018,7 @@ void ListWidget::mouseActionFinish(	3	@@ -2031,7 +2031,7 @@ void ListWidget::mouseActionFinish(
4	_mouseSelectType = TextSelectType::Letters;	4	_mouseSelectType = TextSelectType::Letters;
5	//_widget->noSelectingScroll(); // #TODO select scroll	5	//_widget->noSelectingScroll(); // #TODO select scroll
6		6
Lines 9-15 Link Here
9	if (_selectedTextItem	9	if (_selectedTextItem
10	&& _selectedTextRange.from != _selectedTextRange.to) {	10	&& _selectedTextRange.from != _selectedTextRange.to) {
11	if (const auto view = viewForItem(_selectedTextItem)) {	11	if (const auto view = viewForItem(_selectedTextItem)) {
12	@@ -2027,7 +2027,7 @@ void ListWidget::mouseActionFinish(	12	@@ -2040,7 +2040,7 @@ void ListWidget::mouseActionFinish(
13	QClipboard::Selection);	13	QClipboard::Selection);
14	}	14	}
15	}	15	}




--- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig	2019-04-13 06:46:58 UTC
+++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -25,7 +25,9 @@ bool noQtTrayIcon = false, tryAppIndicator = false;
 bool useGtkBase = false, useAppIndicator = false, useStatusIcon = false, trayIconChecked = false, useUnityCount = false;

 GtkStatusIcon *_trayIcon = 0;
 GtkWidget *_trayMenu = 0;
 GdkPixbuf *_trayPixbuf = 0;
@@ -290,7 +292,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
 		if (noQtTrayIcon) {
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
 			if (useAppIndicator) {

 			} else if (useStatusIcon) {
 				Libs::gtk_status_icon_set_visible(_trayIcon, false);
 			}
@@ -306,7 +310,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
 		if (noQtTrayIcon) {
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
 			if (useAppIndicator) {

 			} else if (useStatusIcon) {
 				Libs::gtk_status_icon_set_visible(_trayIcon, true);
 			}
@@ -325,7 +331,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);

 	} else {
 		useAppIndicator = false;
 	}
@@ -422,11 +430,15 @@ void MainWindow::LibsLoaded() {
 			&& (Libs::g_object_ref_sink != nullptr)
 			&& (Libs::g_object_unref != nullptr);
 

 
 	if (tryAppIndicator && useGtkBase && useAppIndicator) {
 		noQtTrayIcon = true;
@@ -462,6 +474,7 @@ void MainWindow::psCreateTrayIcon() {
 	}
 
 #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION

 	if (useAppIndicator) {
 		DEBUG_LOG(("Trying to create AppIndicator"));
 		_trayMenu = Libs::gtk_menu_new();
@@ -492,6 +505,7 @@ void MainWindow::psCreateTrayIcon() {
 			useAppIndicator = false;
 		}
 	}

 	if (useStatusIcon) {
 		if (Libs::gdk_init_check(0, 0)) {
 			if (!_trayMenu) _trayMenu = Libs::gtk_menu_new();
@@ -616,10 +630,12 @@ MainWindow::~MainWindow() {
 		Libs::g_object_unref(_trayMenu);
 		_trayMenu = nullptr;
 	}

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_platform_platform__specific.h (-2 / +2 lines)
1	--- Telegram/SourceFiles/platform/platform_specific.h.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/platform/platform_specific.h.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/SourceFiles/platform/platform_specific.h	2	+++ Telegram/SourceFiles/platform/platform_specific.h
3	@@ -53,8 +53,8 @@ void finish();	3	@@ -58,8 +58,8 @@ void finish();
4		4
5	#ifdef Q_OS_MAC	5	#ifdef Q_OS_MAC
6	#include "platform/mac/specific_mac.h"	6	#include "platform/mac/specific_mac.h"

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp (-2 / +2 lines)
1	--- Telegram/SourceFiles/settings/settings_notifications.cpp.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/settings/settings_notifications.cpp.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/SourceFiles/settings/settings_notifications.cpp	2	+++ Telegram/SourceFiles/settings/settings_notifications.cpp
3	@@ -478,11 +478,11 @@ void NotificationsCount::SampleWidget::destroyDelayed(	3	@@ -479,11 +479,11 @@ void NotificationsCount::SampleWidget::destroyDelayed(
4	_deleted = true;	4	_deleted = true;
5		5
6	// Ubuntu has a lag if deleteLater() called immediately.	6	// Ubuntu has a lag if deleteLater() called immediately.

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_ui_text_text.cpp (-2 / +2 lines)
1	--- Telegram/SourceFiles/ui/text/text.cpp.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/ui/text/text.cpp.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/SourceFiles/ui/text/text.cpp	2	+++ Telegram/SourceFiles/ui/text/text.cpp
3	@@ -1760,11 +1760,11 @@ class TextPainter { (private)	3	@@ -1762,11 +1762,11 @@ class TextPainter { (private)
4	if (item == -1)	4	if (item == -1)
5	return;	5	return;
6		6

Lines 1-4 Link Here

(-)./files/patch-Telegram_SourceFiles_ui_twidget.cpp (-2 / +2 lines)
1	--- Telegram/SourceFiles/ui/twidget.cpp.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/ui/twidget.cpp.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/SourceFiles/ui/twidget.cpp	2	+++ Telegram/SourceFiles/ui/twidget.cpp
3	@@ -249,9 +249,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::T	3	@@ -249,9 +249,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::T
4	, button	4	, button
Lines 10-14 Link Here
10	-#endif // OS_MAC_OLD	10	-#endif // OS_MAC_OLD
11	+#endif	11	+#endif
12	);	12	);
13	ev.setTimestamp(getms());	13	ev.setTimestamp(crl::now());
14	QGuiApplication::sendEvent(windowHandle, &ev);	14	QGuiApplication::sendEvent(windowHandle, &ev);




--- Telegram/SourceFiles/ui/widgets/labels.cpp.orig	2019-04-13 06:46:58 UTC
+++ Telegram/SourceFiles/ui/widgets/labels.cpp
@@ -361,11 +361,11 @@ Text::StateResult FlatLabel::dragActionFinish(const QP
 		}
 	}
 
-#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64
+#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 || defined Q_OS_FREEBSD
 	if (!_selection.empty()) {
 		SetClipboardText(_text.toTextForMimeData(_selection), QClipboard::Selection);
 	}
-#endif // Q_OS_LINUX32 || Q_OS_LINUX64
+#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || Q_OS_FREEBSD

Lines 1-6 Link Here

(-)./files/patch-Telegram_SourceFiles_window_main__window.cpp (-3 / +3 lines)
1	--- Telegram/SourceFiles/window/main_window.cpp.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/window/main_window.cpp.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/SourceFiles/window/main_window.cpp	2	+++ Telegram/SourceFiles/window/main_window.cpp
3	@@ -503,7 +503,7 @@ bool MainWindow::minimizeToTray() {	3	@@ -521,7 +521,7 @@ bool MainWindow::minimizeToTray() {
4	}	4	}
5		5
6	void MainWindow::reActivateWindow() {	6	void MainWindow::reActivateWindow() {
Lines 9-15 Link Here
9	const auto reActivate = [=] {	9	const auto reActivate = [=] {
10	if (const auto w = App::wnd()) {	10	if (const auto w = App::wnd()) {
11	if (auto f = QApplication::focusWidget()) {	11	if (auto f = QApplication::focusWidget()) {
12	@@ -518,7 +518,7 @@ void MainWindow::reActivateWindow() {	12	@@ -536,7 +536,7 @@ void MainWindow::reActivateWindow() {
13	};	13	};
14	crl::on_main(this, reActivate);	14	crl::on_main(this, reActivate);
15	App::CallDelayed(200, this, reActivate);	15	App::CallDelayed(200, this, reActivate);

Lines 1-6 Link Here

(-)./files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp (-2 / +2 lines)
1	--- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2018-12-31 01:05:58 UTC	1	--- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2019-04-03 18:20:00 UTC
2	+++ Telegram/ThirdParty/libtgvoip/VoIPController.cpp	2	+++ Telegram/ThirdParty/libtgvoip/VoIPController.cpp
3	@@ -2840,7 +2840,7 @@ static void initMachTimestart() {	3	@@ -3048,7 +3048,7 @@ static void initMachTimestart() {
4	#endif	4	#endif
5		5
6	double VoIPController::GetCurrentTime(){	6	double VoIPController::GetCurrentTime(){

Lines 1-6 Link Here

(-)./files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp (-2 / +2 lines)
1	--- Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp.orig 2018-12-31 01:05:58 UTC	1	--- Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp.orig 2019-04-03 18:20:00 UTC
2	+++ Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp	2	+++ Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp
3	@@ -61,6 +61,7 @@ void NetworkSocketPosix::SetMaxPriority(){	3	@@ -64,6 +64,7 @@ void NetworkSocketPosix::SetMaxPriority(){
4	if(res<0){	4	if(res<0){
5	LOGE("error setting darwin-specific net priority: %d / %s", errno, strerror(errno));	5	LOGE("error setting darwin-specific net priority: %d / %s", errno, strerror(errno));
6	}	6	}




--- Telegram/gyp/settings_linux.gypi.orig	2019-04-13 06:46:58 UTC
+++ Telegram/gyp/settings_linux.gypi
@@ -11,7 +11,6 @@
         'linux_common_flags': [

           '-W',
           '-fPIC',
           '-Wno-unused-variable',
@@ -26,7 +25,7 @@
         ],
       },
       'conditions': [

           'defines': [
             'Q_OS_LINUX64',
           ],
@@ -61,7 +60,6 @@
       ],
       'defines': [
         '_REENTRANT',

         'QT_PLUGIN',
       ],
       'cflags_c': [
@@ -74,9 +72,6 @@
         '-Wno-register',
       ],
       'make_global_settings': [

Lines 1-6 Link Here

(-)./files/patch-Telegram_gyp_telegram__sources.txt (-2 / +2 lines)
1	--- Telegram/gyp/telegram_sources.txt.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/gyp/telegram_sources.txt.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/gyp/telegram_sources.txt	2	+++ Telegram/gyp/telegram_sources.txt
3	@@ -830,14 +830,7 @@	3	@@ -857,14 +857,7 @@
4	<(emoji_suggestions_loc)/emoji_suggestions.cpp	4	<(emoji_suggestions_loc)/emoji_suggestions.cpp
5	<(emoji_suggestions_loc)/emoji_suggestions.h	5	<(emoji_suggestions_loc)/emoji_suggestions.h
6		6

Return to bug 237428

Lines 1-8 Link Here

(-)./Makefile (-4 / +4 lines)
1	# $FreeBSD: head/net-im/telegram-desktop/Makefile 494874 2019-03-07 03:47:58Z linimon $	1	# $FreeBSD: head/net-im/telegram-desktop/Makefile 484686 2018-11-11 11:45:19Z makc $
2		2
3	PORTNAME= telegram-desktop	3	PORTNAME= telegram-desktop
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 1.5.11	5	DISTVERSION= 1.6.7
6	CATEGORIES= net-im	6	CATEGORIES= net-im
7		7
8	MAINTAINER= henry.hu.sh@gmail.com	8	MAINTAINER= henry.hu.sh@gmail.com
Lines 33-40 Link Here
33	GH_TUPLE= catchorg:Catch2:5ca44b68:catch/Telegram/ThirdParty/Catch \	33	GH_TUPLE= catchorg:Catch2:5ca44b68:catch/Telegram/ThirdParty/Catch \
34	mapbox:variant:550ac2f:variant/Telegram/ThirdParty/variant \	34	mapbox:variant:550ac2f:variant/Telegram/ThirdParty/variant \
35	Microsoft:GSL:d846fe5:gsl/Telegram/ThirdParty/GSL \	35	Microsoft:GSL:d846fe5:gsl/Telegram/ThirdParty/GSL \
36	telegramdesktop:libtgvoip:59a975b:libtgvoip/Telegram/ThirdParty/libtgvoip \	36	telegramdesktop:libtgvoip:e701050:libtgvoip/Telegram/ThirdParty/libtgvoip \
37	telegramdesktop:crl:9b7c6b5:crl/Telegram/ThirdParty/crl \	37	telegramdesktop:crl:84072fb:crl/Telegram/ThirdParty/crl \
38	Cyan4973:xxHash:7cc9639:xxhash/Telegram/ThirdParty/xxHash	38	Cyan4973:xxHash:7cc9639:xxhash/Telegram/ThirdParty/xxHash
39	USE_GNOME= glib20	39	USE_GNOME= glib20
40	USE_QT= core gui imageformats network widgets buildtools_build qmake_build dbus	40	USE_QT= core gui imageformats network widgets buildtools_build qmake_build dbus

Lines 1-15 Link Here

(-)./distinfo (-7 / +7 lines)
1	TIMESTAMP = 1549225629	1	TIMESTAMP = 1555805465
2	SHA256 (telegramdesktop-tdesktop-v1.5.11_GH0.tar.gz) = e7dde48fc0bb9d5e5a94d5f4300b68033700bb8bf7926d710334e0ba9b7d6af8	2	SHA256 (telegramdesktop-tdesktop-v1.6.7_GH0.tar.gz) = 77f4cf6507d1ebc26eaef472aa4817cc57a77c5e3065f6b2afa294530f0633a1
3	SIZE (telegramdesktop-tdesktop-v1.5.11_GH0.tar.gz) = 14244290	3	SIZE (telegramdesktop-tdesktop-v1.6.7_GH0.tar.gz) = 14323106
4	SHA256 (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 8cdf2a345897bda1aaabffd4496dffe263768cef3e4254e74ae63545c8e12cc2	4	SHA256 (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 8cdf2a345897bda1aaabffd4496dffe263768cef3e4254e74ae63545c8e12cc2
5	SIZE (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 375264	5	SIZE (catchorg-Catch2-5ca44b68_GH0.tar.gz) = 375264
6	SHA256 (mapbox-variant-550ac2f_GH0.tar.gz) = 7ab3aa7c9fa672027f13721584df5f7ec09c0ecca499d374c6ac76e147ef7354	6	SHA256 (mapbox-variant-550ac2f_GH0.tar.gz) = 7ab3aa7c9fa672027f13721584df5f7ec09c0ecca499d374c6ac76e147ef7354
7	SIZE (mapbox-variant-550ac2f_GH0.tar.gz) = 108686	7	SIZE (mapbox-variant-550ac2f_GH0.tar.gz) = 108686
8	SHA256 (Microsoft-GSL-d846fe5_GH0.tar.gz) = 4c463f93ca3b1dcb0b8d73b54309c1d31145761c457f1a6fd53554a6d469b468	8	SHA256 (Microsoft-GSL-d846fe5_GH0.tar.gz) = 4c463f93ca3b1dcb0b8d73b54309c1d31145761c457f1a6fd53554a6d469b468
9	SIZE (Microsoft-GSL-d846fe5_GH0.tar.gz) = 58930	9	SIZE (Microsoft-GSL-d846fe5_GH0.tar.gz) = 58930
10	SHA256 (telegramdesktop-libtgvoip-59a975b_GH0.tar.gz) = c75846b685370982ab657d3dc5caee59dfaf4038bcd5a24b8004ce84f6c9fcfb	10	SHA256 (telegramdesktop-libtgvoip-e701050_GH0.tar.gz) = 16cb5f4588f4a35877aacc5f39bb93e9c0ac5fca1ddfc4dabda841131c29d3d5
11	SIZE (telegramdesktop-libtgvoip-59a975b_GH0.tar.gz) = 1450257	11	SIZE (telegramdesktop-libtgvoip-e701050_GH0.tar.gz) = 1484741
12	SHA256 (telegramdesktop-crl-9b7c6b5_GH0.tar.gz) = 4ce7f672aa9a944631152be747099e966fd2b71ec9b0ddd76d129b9ec934a72b	12	SHA256 (telegramdesktop-crl-84072fb_GH0.tar.gz) = 0d1c5a08b94c90ef213fadfdfb1f4587a23c01474195931c67bc98fb7fd01936
13	SIZE (telegramdesktop-crl-9b7c6b5_GH0.tar.gz) = 21540	13	SIZE (telegramdesktop-crl-84072fb_GH0.tar.gz) = 21681
14	SHA256 (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = f40801820e885f92bbe3d2434efeb39aa18eeaf878341982e8525b538468e3ed	14	SHA256 (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = f40801820e885f92bbe3d2434efeb39aa18eeaf878341982e8525b538468e3ed
15	SIZE (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = 37534	15	SIZE (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = 37534

Lines 1-4 Link Here

(-)./files/gyp-patches (-12 / +12 lines)
1	--- Telegram/gyp/codegen_rules.gypi.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/gyp/codegen_rules.gypi.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/gyp/codegen_rules.gypi	2	+++ Telegram/gyp/codegen_rules.gypi
3	@@ -15,7 +15,7 @@	3	@@ -15,7 +15,7 @@
4	'<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp',	4	'<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp',
Lines 25-31 Link Here
25	'-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp',	25	'-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp',
26	'<@(qrc_files)',	26	'<@(qrc_files)',
27	],	27	],
28	--- Telegram/gyp/lib_export.gyp.orig 2019-02-01 12:51:46 UTC	28	--- Telegram/gyp/lib_export.gyp.orig 2019-04-13 06:46:58 UTC
29	+++ Telegram/gyp/lib_export.gyp	29	+++ Telegram/gyp/lib_export.gyp
30	@@ -46,7 +46,7 @@	30	@@ -46,7 +46,7 @@
31	'include_dirs': [	31	'include_dirs': [
Lines 36-42 Link Here
36	'<(submodules_loc)/GSL/include',	36	'<(submodules_loc)/GSL/include',
37	'<(submodules_loc)/variant/include',	37	'<(submodules_loc)/variant/include',
38	'<(submodules_loc)/crl/src',	38	'<(submodules_loc)/crl/src',
39	--- Telegram/gyp/lib_scheme.gyp.orig 2019-02-01 12:51:46 UTC	39	--- Telegram/gyp/lib_scheme.gyp.orig 2019-04-13 06:46:58 UTC
40	+++ Telegram/gyp/lib_scheme.gyp	40	+++ Telegram/gyp/lib_scheme.gyp
41	@@ -48,7 +48,7 @@	41	@@ -48,7 +48,7 @@
42	'<(SHARED_INTERMEDIATE_DIR)/scheme.h',	42	'<(SHARED_INTERMEDIATE_DIR)/scheme.h',
Lines 47-53 Link Here
47	'-o', '<(SHARED_INTERMEDIATE_DIR)', '<(res_loc)/scheme.tl',	47	'-o', '<(SHARED_INTERMEDIATE_DIR)', '<(res_loc)/scheme.tl',
48	],	48	],
49	'message': 'codegen_scheme-ing scheme.tl..',	49	'message': 'codegen_scheme-ing scheme.tl..',
50	--- Telegram/gyp/qt_moc.gypi.orig 2019-02-01 12:51:46 UTC	50	--- Telegram/gyp/qt_moc.gypi.orig 2019-04-13 06:46:58 UTC
51	+++ Telegram/gyp/qt_moc.gypi	51	+++ Telegram/gyp/qt_moc.gypi
52	@@ -12,12 +12,12 @@	52	@@ -12,12 +12,12 @@
53	'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',	53	'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
Lines 64-70 Link Here
64	# '<!@(python -c "for s in \'<@(_include_dirs)\'.split(\' \'): print(\'-I\' + s)")',	64	# '<!@(python -c "for s in \'<@(_include_dirs)\'.split(\' \'): print(\'-I\' + s)")',
65	'<(RULE_INPUT_PATH)',	65	'<(RULE_INPUT_PATH)',
66	'-o', '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',	66	'-o', '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
67	--- Telegram/gyp/qt_rcc.gypi.orig 2019-02-01 12:51:46 UTC	67	--- Telegram/gyp/qt_rcc.gypi.orig 2019-04-13 06:46:58 UTC
68	+++ Telegram/gyp/qt_rcc.gypi	68	+++ Telegram/gyp/qt_rcc.gypi
69	@@ -15,7 +15,7 @@	69	@@ -15,7 +15,7 @@
70	'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp',	70	'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp',
Lines 75-81 Link Here
75	'-name', '<(RULE_INPUT_ROOT)',	75	'-name', '<(RULE_INPUT_ROOT)',
76	'-no-compress',	76	'-no-compress',
77	'<(RULE_INPUT_PATH)',	77	'<(RULE_INPUT_PATH)',
78	--- Telegram/gyp/qt.gypi.orig 2019-02-01 12:51:46 UTC	78	--- Telegram/gyp/qt.gypi.orig 2019-04-13 06:46:58 UTC
79	+++ Telegram/gyp/qt.gypi	79	+++ Telegram/gyp/qt.gypi
80	@@ -14,25 +14,21 @@	80	@@ -14,25 +14,21 @@
81	[ 'build_macold', {	81	[ 'build_macold', {
Lines 233-239 Link Here
233	'-pthread',	233	'-pthread',
234	'-rdynamic',	234	'-rdynamic',
235	],	235	],
236	--- Telegram/gyp/telegram_linux.gypi.orig 2019-02-01 12:51:46 UTC	236	--- Telegram/gyp/telegram_linux.gypi.orig 2019-04-13 06:46:58 UTC
237	+++ Telegram/gyp/telegram_linux.gypi	237	+++ Telegram/gyp/telegram_linux.gypi
238	@@ -10,7 +10,7 @@	238	@@ -10,7 +10,7 @@
239	'variables': {	239	'variables': {
Lines 339-345 Link Here
339	],	339	],
340	}], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', {	340	}], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', {
341	'cflags_cc': [ '<!(pkg-config --cflags ayatana-appindicator3-0.1)' ],	341	'cflags_cc': [ '<!(pkg-config --cflags ayatana-appindicator3-0.1)' ],
342	--- Telegram/gyp/Telegram.gyp.orig 2019-02-01 12:51:46 UTC	342	--- Telegram/gyp/Telegram.gyp.orig 2019-04-13 06:46:58 UTC
343	+++ Telegram/gyp/Telegram.gyp	343	+++ Telegram/gyp/Telegram.gyp
344	@@ -51,7 +51,7 @@	344	@@ -51,7 +51,7 @@
345	'pt-BR',	345	'pt-BR',
Lines 397-403 Link Here
397	],	397	],
398	'conditions': [	398	'conditions': [
399	[ '"<(official_build_target)" != ""', {	399	[ '"<(official_build_target)" != ""', {
400	--- Telegram/gyp/tests/tests.gyp.orig 2019-02-01 12:51:46 UTC	400	--- Telegram/gyp/tests/tests.gyp.orig 2019-04-13 06:46:58 UTC
401	+++ Telegram/gyp/tests/tests.gyp	401	+++ Telegram/gyp/tests/tests.gyp
402	@@ -13,7 +13,7 @@	402	@@ -13,7 +13,7 @@
403	'src_loc': '../../SourceFiles',	403	'src_loc': '../../SourceFiles',
Lines 408-414 Link Here
408	},	408	},
409	'targets': [{	409	'targets': [{
410	'target_name': 'tests',	410	'target_name': 'tests',
411	--- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig 2018-12-31 01:05:58 UTC	411	--- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig 2019-04-03 18:20:00 UTC
412	+++ Telegram/ThirdParty/libtgvoip/libtgvoip.gyp	412	+++ Telegram/ThirdParty/libtgvoip/libtgvoip.gyp
413	@@ -14,11 +14,12 @@	413	@@ -14,11 +14,12 @@
414	'variables': {	414	'variables': {
Lines 424-430 Link Here
424	],	424	],
425	'direct_dependent_settings': {	425	'direct_dependent_settings': {
426	'include_dirs': [	426	'include_dirs': [
427	@@ -741,7 +742,7 @@	427	@@ -743,7 +744,7 @@
428	},	428	},
429	],	429	],
430	[	430	[
Lines 433-439 Link Here
433	'sources/': [['exclude', '<(tgvoip_src_loc)/os/linux/']],	433	'sources/': [['exclude', '<(tgvoip_src_loc)/os/linux/']],
434	},	434	},
435	],	435	],
436	@@ -866,13 +867,16 @@	436	@@ -891,13 +892,16 @@
437	},	437	},
438	],	438	],
439	[	439	[

Lines 1-13 Link Here

(-)./files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp (-3 / +3 lines)
1	--- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp	2	+++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
3	@@ -1389,13 +1389,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre	3	@@ -1392,13 +1392,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre
4	_mouseSelectType = TextSelectType::Letters;	4	_mouseSelectType = TextSelectType::Letters;
5	//_widget->noSelectingScroll(); // TODO	5	//_widget->noSelectingScroll(); // TODO
6		6
7	-#if defined Q_OS_LINUX32 \|\| defined Q_OS_LINUX64	7	-#if defined Q_OS_LINUX32 \|\| defined Q_OS_LINUX64
8	+#if defined Q_OS_LINUX32 \|\| defined Q_OS_LINUX64 \|\| defined Q_OS_FREEBSD	8	+#if defined Q_OS_LINUX32 \|\| defined Q_OS_LINUX64 \|\| defined Q_OS_FREEBSD
9	if (_selectedItem && _selectedText.from != _selectedText.to) {	9	if (_selectedItem && _selectedText.from != _selectedText.to) {
10	SetClipboardWithEntities(	10	SetClipboardText(
11	_selectedItem->selectedText(_selectedText),	11	_selectedItem->selectedText(_selectedText),
12	QClipboard::Selection);	12	QClipboard::Selection);
13	}	13	}

Lines 1-4 Link Here

(-)./files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp (-8 / +8 lines)
1	--- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp	2	+++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp
3	@@ -25,7 +25,9 @@ bool noQtTrayIcon = false, tryAppIndicator = false;	3	@@ -25,7 +25,9 @@ bool noQtTrayIcon = false, tryAppIndicator = false;
4	bool useGtkBase = false, useAppIndicator = false, useStatusIcon = false, trayIconChecked = false, useUnityCount = false;	4	bool useGtkBase = false, useAppIndicator = false, useStatusIcon = false, trayIconChecked = false, useUnityCount = false;
Lines 10-16 Link Here
10	GtkStatusIcon *_trayIcon = 0;	10	GtkStatusIcon *_trayIcon = 0;
11	GtkWidget *_trayMenu = 0;	11	GtkWidget *_trayMenu = 0;
12	GdkPixbuf *_trayPixbuf = 0;	12	GdkPixbuf *_trayPixbuf = 0;
13	@@ -293,7 +295,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {	13	@@ -290,7 +292,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
14	if (noQtTrayIcon) {	14	if (noQtTrayIcon) {
15	#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION	15	#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
16	if (useAppIndicator) {	16	if (useAppIndicator) {
Lines 20-26 Link Here
20	} else if (useStatusIcon) {	20	} else if (useStatusIcon) {
21	Libs::gtk_status_icon_set_visible(_trayIcon, false);	21	Libs::gtk_status_icon_set_visible(_trayIcon, false);
22	}	22	}
23	@@ -309,7 +313,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {	23	@@ -306,7 +310,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) {
24	if (noQtTrayIcon) {	24	if (noQtTrayIcon) {
25	#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION	25	#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
26	if (useAppIndicator) {	26	if (useAppIndicator) {
Lines 30-36 Link Here
30	} else if (useStatusIcon) {	30	} else if (useStatusIcon) {
31	Libs::gtk_status_icon_set_visible(_trayIcon, true);	31	Libs::gtk_status_icon_set_visible(_trayIcon, true);
32	}	32	}
33	@@ -328,7 +334,9 @@ void MainWindow::psUpdateIndicator() {	33	@@ -325,7 +331,9 @@ void MainWindow::psUpdateIndicator() {
34	if (iconFile.exists()) {	34	if (iconFile.exists()) {
35	QByteArray path = QFile::encodeName(iconFile.absoluteFilePath()), name = QFile::encodeName(iconFile.fileName());	35	QByteArray path = QFile::encodeName(iconFile.absoluteFilePath()), name = QFile::encodeName(iconFile.fileName());
36	name = name.mid(0, name.size() - 4);	36	name = name.mid(0, name.size() - 4);
Lines 40-46 Link Here
40	} else {	40	} else {
41	useAppIndicator = false;	41	useAppIndicator = false;
42	}	42	}
43	@@ -425,11 +433,15 @@ void MainWindow::LibsLoaded() {	43	@@ -422,11 +430,15 @@ void MainWindow::LibsLoaded() {
44	&& (Libs::g_object_ref_sink != nullptr)	44	&& (Libs::g_object_ref_sink != nullptr)
45	&& (Libs::g_object_unref != nullptr);	45	&& (Libs::g_object_unref != nullptr);
46		46
Lines 56-62 Link Here
56		56
57	if (tryAppIndicator && useGtkBase && useAppIndicator) {	57	if (tryAppIndicator && useGtkBase && useAppIndicator) {
58	noQtTrayIcon = true;	58	noQtTrayIcon = true;
59	@@ -465,6 +477,7 @@ void MainWindow::psCreateTrayIcon() {	59	@@ -462,6 +474,7 @@ void MainWindow::psCreateTrayIcon() {
60	}	60	}
61		61
62	#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION	62	#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
Lines 64-70 Link Here
64	if (useAppIndicator) {	64	if (useAppIndicator) {
65	DEBUG_LOG(("Trying to create AppIndicator"));	65	DEBUG_LOG(("Trying to create AppIndicator"));
66	_trayMenu = Libs::gtk_menu_new();	66	_trayMenu = Libs::gtk_menu_new();
67	@@ -495,6 +508,7 @@ void MainWindow::psCreateTrayIcon() {	67	@@ -492,6 +505,7 @@ void MainWindow::psCreateTrayIcon() {
68	useAppIndicator = false;	68	useAppIndicator = false;
69	}	69	}
70	}	70	}
Lines 72-78 Link Here
72	if (useStatusIcon) {	72	if (useStatusIcon) {
73	if (Libs::gdk_init_check(0, 0)) {	73	if (Libs::gdk_init_check(0, 0)) {
74	if (!_trayMenu) _trayMenu = Libs::gtk_menu_new();	74	if (!_trayMenu) _trayMenu = Libs::gtk_menu_new();
75	@@ -619,10 +633,12 @@ MainWindow::~MainWindow() {	75	@@ -616,10 +630,12 @@ MainWindow::~MainWindow() {
76	Libs::g_object_unref(_trayMenu);	76	Libs::g_object_unref(_trayMenu);
77	_trayMenu = nullptr;	77	_trayMenu = nullptr;
78	}	78	}

Lines 1-13 Link Here

(-)./files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp (-3 / +3 lines)
1	--- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2019-02-01 12:51:46 UTC	1	--- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/SourceFiles/ui/widgets/labels.cpp	2	+++ Telegram/SourceFiles/ui/widgets/labels.cpp
3	@@ -364,11 +364,11 @@ Text::StateResult FlatLabel::dragActionFinish(const QP	3	@@ -361,11 +361,11 @@ Text::StateResult FlatLabel::dragActionFinish(const QP
4	}	4	}
5	}	5	}
6		6
7	-#if defined Q_OS_LINUX32 \|\| defined Q_OS_LINUX64	7	-#if defined Q_OS_LINUX32 \|\| defined Q_OS_LINUX64
8	+#if defined Q_OS_LINUX32 \|\| defined Q_OS_LINUX64 \|\| defined Q_OS_FREEBSD	8	+#if defined Q_OS_LINUX32 \|\| defined Q_OS_LINUX64 \|\| defined Q_OS_FREEBSD
9	if (!_selection.empty()) {	9	if (!_selection.empty()) {
10	QApplication::clipboard()->setText(_text.originalText(_selection, _contextExpandLinksMode), QClipboard::Selection);	10	SetClipboardText(_text.toTextForMimeData(_selection), QClipboard::Selection);
11	}	11	}
12	-#endif // Q_OS_LINUX32 \|\| Q_OS_LINUX64	12	-#endif // Q_OS_LINUX32 \|\| Q_OS_LINUX64
13	+#endif // Q_OS_LINUX32 \|\| Q_OS_LINUX64 \|\| Q_OS_FREEBSD	13	+#endif // Q_OS_LINUX32 \|\| Q_OS_LINUX64 \|\| Q_OS_FREEBSD

Lines 1-4 Link Here

(-)./files/patch-Telegram_gyp_settings__linux.gypi (-4 / +4 lines)
1	--- Telegram/gyp/settings_linux.gypi.orig 2018-08-04 18:53:40 UTC	1	--- Telegram/gyp/settings_linux.gypi.orig 2019-04-13 06:46:58 UTC
2	+++ Telegram/gyp/settings_linux.gypi	2	+++ Telegram/gyp/settings_linux.gypi
3	@@ -11,7 +11,6 @@	3	@@ -11,7 +11,6 @@
4	'linux_common_flags': [	4	'linux_common_flags': [
Lines 8-14 Link Here
8	'-W',	8	'-W',
9	'-fPIC',	9	'-fPIC',
10	'-Wno-unused-variable',	10	'-Wno-unused-variable',
11	@@ -25,7 +24,7 @@	11	@@ -26,7 +25,7 @@
12	],	12	],
13	},	13	},
14	'conditions': [	14	'conditions': [
Lines 17-23 Link Here
17	'defines': [	17	'defines': [
18	'Q_OS_LINUX64',	18	'Q_OS_LINUX64',
19	],	19	],
20	@@ -60,7 +59,6 @@	20	@@ -61,7 +60,6 @@
21	],	21	],
22	'defines': [	22	'defines': [
23	'_REENTRANT',	23	'_REENTRANT',
Lines 25-31 Link Here
25	'QT_PLUGIN',	25	'QT_PLUGIN',
26	],	26	],
27	'cflags_c': [	27	'cflags_c': [
28	@@ -73,9 +71,6 @@	28	@@ -74,9 +72,6 @@
29	'-Wno-register',	29	'-Wno-register',
30	],	30	],
31	'make_global_settings': [	31	'make_global_settings': [