Date: Tue, 23 Apr 2019 14:21:40 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499760 - in head/net-im/telegram-desktop: . files Message-ID: <201904231421.x3NELeZi009264@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue Apr 23 14:21:40 2019 New Revision: 499760 URL: https://svnweb.freebsd.org/changeset/ports/499760 Log: net-im/telegram-desktop: update to 1.6.7 PR: 237428 Submitted by: Henry Hu <henry.hu.sh@gmail.com> (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/gyp-patches 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_core_utils.h (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.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_linux_main__window__linux.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp (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_ThirdParty_libtgvoip_VoIPController.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi (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 Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/Makefile Tue Apr 23 14:21:40 2019 (r499760) @@ -2,7 +2,7 @@ PORTNAME= telegram-desktop DISTVERSIONPREFIX= v -DISTVERSION= 1.5.11 +DISTVERSION= 1.6.7 CATEGORIES= net-im MAINTAINER= henry.hu.sh@gmail.com @@ -33,8 +33,8 @@ GH_PROJECT= tdesktop 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:59a975b:libtgvoip/Telegram/ThirdParty/libtgvoip \ - telegramdesktop:crl:9b7c6b5:crl/Telegram/ThirdParty/crl \ + 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 Modified: head/net-im/telegram-desktop/distinfo ============================================================================== --- head/net-im/telegram-desktop/distinfo Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/distinfo Tue Apr 23 14:21:40 2019 (r499760) @@ -1,15 +1,15 @@ -TIMESTAMP = 1549225629 -SHA256 (telegramdesktop-tdesktop-v1.5.11_GH0.tar.gz) = e7dde48fc0bb9d5e5a94d5f4300b68033700bb8bf7926d710334e0ba9b7d6af8 -SIZE (telegramdesktop-tdesktop-v1.5.11_GH0.tar.gz) = 14244290 +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-59a975b_GH0.tar.gz) = c75846b685370982ab657d3dc5caee59dfaf4038bcd5a24b8004ce84f6c9fcfb -SIZE (telegramdesktop-libtgvoip-59a975b_GH0.tar.gz) = 1450257 -SHA256 (telegramdesktop-crl-9b7c6b5_GH0.tar.gz) = 4ce7f672aa9a944631152be747099e966fd2b71ec9b0ddd76d129b9ec934a72b -SIZE (telegramdesktop-crl-9b7c6b5_GH0.tar.gz) = 21540 +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 Modified: head/net-im/telegram-desktop/files/gyp-patches ============================================================================== --- head/net-im/telegram-desktop/files/gyp-patches Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/gyp-patches Tue Apr 23 14:21:40 2019 (r499760) @@ -1,4 +1,4 @@ ---- Telegram/gyp/codegen_rules.gypi.orig 2019-02-01 12:51:46 UTC +--- 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', @@ -25,7 +25,7 @@ '-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp', '<@(qrc_files)', ], ---- Telegram/gyp/lib_export.gyp.orig 2019-02-01 12:51:46 UTC +--- Telegram/gyp/lib_export.gyp.orig 2019-04-13 06:46:58 UTC +++ Telegram/gyp/lib_export.gyp @@ -46,7 +46,7 @@ 'include_dirs': [ @@ -36,7 +36,7 @@ '<(submodules_loc)/GSL/include', '<(submodules_loc)/variant/include', '<(submodules_loc)/crl/src', ---- Telegram/gyp/lib_scheme.gyp.orig 2019-02-01 12:51:46 UTC +--- 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', @@ -47,7 +47,7 @@ '-o', '<(SHARED_INTERMEDIATE_DIR)', '<(res_loc)/scheme.tl', ], 'message': 'codegen_scheme-ing scheme.tl..', ---- Telegram/gyp/qt_moc.gypi.orig 2019-02-01 12:51:46 UTC +--- 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', @@ -64,7 +64,7 @@ # '<!@(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-02-01 12:51:46 UTC +--- 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', @@ -75,7 +75,7 @@ '-name', '<(RULE_INPUT_ROOT)', '-no-compress', '<(RULE_INPUT_PATH)', ---- Telegram/gyp/qt.gypi.orig 2019-02-01 12:51:46 UTC +--- Telegram/gyp/qt.gypi.orig 2019-04-13 06:46:58 UTC +++ Telegram/gyp/qt.gypi @@ -14,25 +14,21 @@ [ 'build_macold', { @@ -233,7 +233,7 @@ '-pthread', '-rdynamic', ], ---- Telegram/gyp/telegram_linux.gypi.orig 2019-02-01 12:51:46 UTC +--- Telegram/gyp/telegram_linux.gypi.orig 2019-04-13 06:46:58 UTC +++ Telegram/gyp/telegram_linux.gypi @@ -10,7 +10,7 @@ 'variables': { @@ -339,7 +339,7 @@ ], }], ['<!(pkg-config ayatana-appindicator3-0.1; echo $?) == 0', { 'cflags_cc': [ '<!(pkg-config --cflags ayatana-appindicator3-0.1)' ], ---- Telegram/gyp/Telegram.gyp.orig 2019-02-01 12:51:46 UTC +--- Telegram/gyp/Telegram.gyp.orig 2019-04-13 06:46:58 UTC +++ Telegram/gyp/Telegram.gyp @@ -51,7 +51,7 @@ 'pt-BR', @@ -397,7 +397,7 @@ ], 'conditions': [ [ '"<(official_build_target)" != ""', { ---- Telegram/gyp/tests/tests.gyp.orig 2019-02-01 12:51:46 UTC +--- 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', @@ -408,7 +408,7 @@ }, 'targets': [{ 'target_name': 'tests', ---- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig 2018-12-31 01:05:58 UTC +--- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig 2019-04-03 18:20:00 UTC +++ Telegram/ThirdParty/libtgvoip/libtgvoip.gyp @@ -14,11 +14,12 @@ 'variables': { @@ -424,7 +424,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ -@@ -741,7 +742,7 @@ +@@ -743,7 +744,7 @@ }, ], [ @@ -433,7 +433,7 @@ 'sources/': [['exclude', '<(tgvoip_src_loc)/os/linux/']], }, ], -@@ -866,13 +867,16 @@ +@@ -891,13 +892,16 @@ }, ], [ 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 Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp Tue Apr 23 14:21:40 2019 (r499760) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/core/update_checker.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/core/update_checker.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/core/update_checker.cpp -@@ -1457,6 +1457,9 @@ int UpdateChecker::size() const { +@@ -1456,6 +1456,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()) { -@@ -1509,6 +1512,9 @@ bool checkReadyUpdate() { +@@ -1508,6 +1511,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_core_utils.h ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h Tue Apr 23 14:21:40 2019 (r499760) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/core/utils.h.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/core/utils.h.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/core/utils.h -@@ -350,6 +350,7 @@ enum DBIPlatform { +@@ -347,6 +347,7 @@ enum DBIPlatform { dbipLinux64 = 2, dbipLinux32 = 3, dbipMacOld = 4, Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp Tue Apr 23 14:21:40 2019 (r499760) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/data/data_document.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/data/data_document.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/data/data_document.cpp -@@ -128,7 +128,7 @@ QString FileNameUnsafe( +@@ -133,7 +133,7 @@ QString FileNameUnsafe( name = name.replace(QRegularExpression(qsl("[\\\\\\/\\:\\*\\?\\\"\\<\\>\\|]")), qsl("_")); #elif defined Q_OS_MAC name = name.replace(QRegularExpression(qsl("[\\:]")), qsl("_")); Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp Tue Apr 23 14:21:40 2019 (r499760) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/export/data/export_data_types.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/export/data/export_data_types.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/export/data/export_data_types.cpp -@@ -369,9 +369,9 @@ QString CleanDocumentName(QString name) { +@@ -353,9 +353,9 @@ QString CleanDocumentName(QString name) { '|', #elif defined Q_OS_MAC // Q_OS_WIN ':', 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 Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp Tue Apr 23 14:21:40 2019 (r499760) @@ -1,13 +1,13 @@ ---- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2019-02-01 12:51:46 UTC +--- 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 -@@ -1389,13 +1389,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre +@@ -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) { - SetClipboardWithEntities( + SetClipboardText( _selectedItem->selectedText(_selectedText), QClipboard::Selection); } 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 Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp Tue Apr 23 14:21:40 2019 (r499760) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/history/history_inner_widget.cpp -@@ -1362,7 +1362,7 @@ void HistoryInner::mouseActionFinish( +@@ -1376,7 +1376,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()) { -@@ -1371,7 +1371,7 @@ void HistoryInner::mouseActionFinish( +@@ -1385,7 +1385,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 Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp Tue Apr 23 14:21:40 2019 (r499760) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp -@@ -2018,7 +2018,7 @@ void ListWidget::mouseActionFinish( +@@ -2031,7 +2031,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)) { -@@ -2027,7 +2027,7 @@ void ListWidget::mouseActionFinish( +@@ -2040,7 +2040,7 @@ void ListWidget::mouseActionFinish( QClipboard::Selection); } } 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 Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp Tue Apr 23 14:21:40 2019 (r499760) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2019-02-01 12:51:46 UTC +--- 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; @@ -10,7 +10,7 @@ GtkStatusIcon *_trayIcon = 0; GtkWidget *_trayMenu = 0; GdkPixbuf *_trayPixbuf = 0; -@@ -293,7 +295,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { +@@ -290,7 +292,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); } -@@ -309,7 +313,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { +@@ -306,7 +310,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); } -@@ -328,7 +334,9 @@ void MainWindow::psUpdateIndicator() { +@@ -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); @@ -40,7 +40,7 @@ } else { useAppIndicator = false; } -@@ -425,11 +433,15 @@ void MainWindow::LibsLoaded() { +@@ -422,11 +430,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; -@@ -465,6 +477,7 @@ void MainWindow::psCreateTrayIcon() { +@@ -462,6 +474,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(); -@@ -495,6 +508,7 @@ void MainWindow::psCreateTrayIcon() { +@@ -492,6 +505,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(); -@@ -619,10 +633,12 @@ MainWindow::~MainWindow() { +@@ -616,10 +630,12 @@ MainWindow::~MainWindow() { Libs::g_object_unref(_trayMenu); _trayMenu = nullptr; } Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h Tue Apr 23 14:21:40 2019 (r499760) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/platform_specific.h.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/platform/platform_specific.h.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/platform/platform_specific.h -@@ -53,8 +53,8 @@ void finish(); +@@ -58,8 +58,8 @@ void finish(); #ifdef Q_OS_MAC #include "platform/mac/specific_mac.h" Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp Tue Apr 23 14:21:40 2019 (r499760) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/settings/settings_notifications.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/settings/settings_notifications.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/settings/settings_notifications.cpp -@@ -478,11 +478,11 @@ void NotificationsCount::SampleWidget::destroyDelayed( +@@ -479,11 +479,11 @@ void NotificationsCount::SampleWidget::destroyDelayed( _deleted = true; // Ubuntu has a lag if deleteLater() called immediately. Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp Tue Apr 23 14:21:40 2019 (r499760) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/text/text.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/ui/text/text.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/ui/text/text.cpp -@@ -1760,11 +1760,11 @@ class TextPainter { (private) +@@ -1762,11 +1762,11 @@ class TextPainter { (private) if (item == -1) return; 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 Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp Tue Apr 23 14:21:40 2019 (r499760) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/ui/twidget.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/ui/twidget.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/ui/twidget.cpp @@ -249,9 +249,9 @@ void sendSynteticMouseEvent(QWidget *widget, QEvent::T , button @@ -10,5 +10,5 @@ -#endif // OS_MAC_OLD +#endif ); - ev.setTimestamp(getms()); + ev.setTimestamp(crl::now()); QGuiApplication::sendEvent(windowHandle, &ev); 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 Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp Tue Apr 23 14:21:40 2019 (r499760) @@ -1,13 +1,13 @@ ---- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/ui/widgets/labels.cpp -@@ -364,11 +364,11 @@ Text::StateResult FlatLabel::dragActionFinish(const QP +@@ -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()) { - QApplication::clipboard()->setText(_text.originalText(_selection, _contextExpandLinksMode), QClipboard::Selection); + SetClipboardText(_text.toTextForMimeData(_selection), QClipboard::Selection); } -#endif // Q_OS_LINUX32 || Q_OS_LINUX64 +#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || Q_OS_FREEBSD 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 Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp Tue Apr 23 14:21:40 2019 (r499760) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/window/main_window.cpp.orig 2019-02-01 12:51:46 UTC +--- Telegram/SourceFiles/window/main_window.cpp.orig 2019-04-13 06:46:58 UTC +++ Telegram/SourceFiles/window/main_window.cpp -@@ -503,7 +503,7 @@ bool MainWindow::minimizeToTray() { +@@ -521,7 +521,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()) { -@@ -518,7 +518,7 @@ void MainWindow::reActivateWindow() { +@@ -536,7 +536,7 @@ void MainWindow::reActivateWindow() { }; crl::on_main(this, reActivate); App::CallDelayed(200, this, reActivate); Modified: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp Tue Apr 23 14:21:40 2019 (r499760) @@ -1,6 +1,6 @@ ---- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2018-12-31 01:05:58 UTC +--- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2019-04-03 18:20:00 UTC +++ Telegram/ThirdParty/libtgvoip/VoIPController.cpp -@@ -2840,7 +2840,7 @@ static void initMachTimestart() { +@@ -3048,7 +3048,7 @@ static void initMachTimestart() { #endif double VoIPController::GetCurrentTime(){ Modified: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp Tue Apr 23 14:21:40 2019 (r499760) @@ -1,6 +1,6 @@ ---- Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp.orig 2018-12-31 01:05:58 UTC +--- Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp.orig 2019-04-03 18:20:00 UTC +++ Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp -@@ -61,6 +61,7 @@ void NetworkSocketPosix::SetMaxPriority(){ +@@ -64,6 +64,7 @@ void NetworkSocketPosix::SetMaxPriority(){ if(res<0){ LOGE("error setting darwin-specific net priority: %d / %s", errno, strerror(errno)); } Modified: head/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi Tue Apr 23 14:21:40 2019 (r499760) @@ -1,4 +1,4 @@ ---- Telegram/gyp/settings_linux.gypi.orig 2018-08-04 18:53:40 UTC +--- 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': [ @@ -8,7 +8,7 @@ '-W', '-fPIC', '-Wno-unused-variable', -@@ -25,7 +24,7 @@ +@@ -26,7 +25,7 @@ ], }, 'conditions': [ @@ -17,7 +17,7 @@ 'defines': [ 'Q_OS_LINUX64', ], -@@ -60,7 +59,6 @@ +@@ -61,7 +60,6 @@ ], 'defines': [ '_REENTRANT', @@ -25,7 +25,7 @@ 'QT_PLUGIN', ], 'cflags_c': [ -@@ -73,9 +71,6 @@ +@@ -74,9 +72,6 @@ '-Wno-register', ], 'make_global_settings': [ 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 Tue Apr 23 14:11:50 2019 (r499759) +++ head/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt Tue Apr 23 14:21:40 2019 (r499760) @@ -1,6 +1,6 @@ ---- Telegram/gyp/telegram_sources.txt.orig 2019-02-01 12:51:46 UTC +--- Telegram/gyp/telegram_sources.txt.orig 2019-04-13 06:46:58 UTC +++ Telegram/gyp/telegram_sources.txt -@@ -830,14 +830,7 @@ +@@ -857,14 +857,7 @@ <(emoji_suggestions_loc)/emoji_suggestions.cpp <(emoji_suggestions_loc)/emoji_suggestions.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904231421.x3NELeZi009264>