Date: Tue, 5 Feb 2019 14:05:36 +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: r492232 - in head/net-im/telegram-desktop: . files Message-ID: <201902051405.x15E5aYR017718@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue Feb 5 14:05:36 2019 New Revision: 492232 URL: https://svnweb.freebsd.org/changeset/ports/492232 Log: net-im/telegram-desktop: update to 1.5.11 PR: 235476 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_base_build__config.h (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.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_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_logs.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__specific.h (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp (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_storage_storage__encrypted__file__tests.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_text_text__block.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_audio_AudioIO.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_logging.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_PrecompiledHeader.cmake (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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/Makefile Tue Feb 5 14:05:36 2019 (r492232) @@ -2,8 +2,7 @@ PORTNAME= telegram-desktop DISTVERSIONPREFIX= v -DISTVERSION= 1.5.4 -PORTREVISION= 1 +DISTVERSION= 1.5.11 CATEGORIES= net-im MAINTAINER= henry.hu.sh@gmail.com @@ -31,8 +30,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:78e584c:libtgvoip/Telegram/ThirdParty/libtgvoip \ - telegramdesktop:crl:4291015:crl/Telegram/ThirdParty/crl \ + telegramdesktop:libtgvoip:59a975b:libtgvoip/Telegram/ThirdParty/libtgvoip \ + telegramdesktop:crl:9b7c6b5: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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/distinfo Tue Feb 5 14:05:36 2019 (r492232) @@ -1,15 +1,15 @@ -TIMESTAMP = 1546062245 -SHA256 (telegramdesktop-tdesktop-v1.5.4_GH0.tar.gz) = 747e6f73071ac24edab0704ad87f4dc36e7708d0ae38d01de78732ca943903e6 -SIZE (telegramdesktop-tdesktop-v1.5.4_GH0.tar.gz) = 14129681 +TIMESTAMP = 1549225629 +SHA256 (telegramdesktop-tdesktop-v1.5.11_GH0.tar.gz) = e7dde48fc0bb9d5e5a94d5f4300b68033700bb8bf7926d710334e0ba9b7d6af8 +SIZE (telegramdesktop-tdesktop-v1.5.11_GH0.tar.gz) = 14244290 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-78e584c_GH0.tar.gz) = b5363e613e7b7fa1273d89856bf33e6fc1f7f028c44911d6dc8f64ebb7e3b389 -SIZE (telegramdesktop-libtgvoip-78e584c_GH0.tar.gz) = 1439050 -SHA256 (telegramdesktop-crl-4291015_GH0.tar.gz) = 25f461f0e575cfa2b55959f735115acac1f515d923a85b2a7a7a886dd6f0c395 -SIZE (telegramdesktop-crl-4291015_GH0.tar.gz) = 21322 +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 (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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/gyp-patches Tue Feb 5 14:05:36 2019 (r492232) @@ -1,4 +1,4 @@ ---- Telegram/gyp/codegen_rules.gypi.orig 2018-12-24 08:16:05 UTC +--- Telegram/gyp/codegen_rules.gypi.orig 2019-02-01 12:51:46 UTC +++ Telegram/gyp/codegen_rules.gypi @@ -15,7 +15,7 @@ '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp', @@ -25,9 +25,9 @@ '-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp', '<@(qrc_files)', ], ---- Telegram/gyp/lib_export.gyp.orig 2018-12-24 08:16:05 UTC +--- Telegram/gyp/lib_export.gyp.orig 2019-02-01 12:51:46 UTC +++ Telegram/gyp/lib_export.gyp -@@ -48,7 +48,7 @@ +@@ -46,7 +46,7 @@ 'include_dirs': [ '<(src_loc)', '<(SHARED_INTERMEDIATE_DIR)', @@ -36,7 +36,7 @@ '<(submodules_loc)/GSL/include', '<(submodules_loc)/variant/include', '<(submodules_loc)/crl/src', ---- Telegram/gyp/lib_scheme.gyp.orig 2018-12-24 08:16:05 UTC +--- Telegram/gyp/lib_scheme.gyp.orig 2019-02-01 12:51:46 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 2018-12-24 08:16:05 UTC +--- Telegram/gyp/qt_moc.gypi.orig 2019-02-01 12:51:46 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 2018-12-24 08:16:05 UTC +--- Telegram/gyp/qt_rcc.gypi.orig 2019-02-01 12:51:46 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 2018-12-24 08:16:05 UTC +--- Telegram/gyp/qt.gypi.orig 2019-02-01 12:51:46 UTC +++ Telegram/gyp/qt.gypi @@ -14,25 +14,21 @@ [ 'build_macold', { @@ -233,7 +233,7 @@ '-pthread', '-rdynamic', ], ---- Telegram/gyp/telegram_linux.gypi.orig 2018-12-24 08:16:05 UTC +--- Telegram/gyp/telegram_linux.gypi.orig 2019-02-01 12:51:46 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 2018-12-24 08:16:05 UTC +--- Telegram/gyp/Telegram.gyp.orig 2019-02-01 12:51:46 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 2018-12-24 08:16:05 UTC +--- Telegram/gyp/tests/tests.gyp.orig 2019-02-01 12:51:46 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-11-23 01:03:16 UTC +--- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig 2018-12-31 01:05:58 UTC +++ Telegram/ThirdParty/libtgvoip/libtgvoip.gyp @@ -14,11 +14,12 @@ 'variables': { @@ -424,7 +424,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ -@@ -739,7 +740,7 @@ +@@ -741,7 +742,7 @@ }, ], [ @@ -433,7 +433,7 @@ 'sources/': [['exclude', '<(tgvoip_src_loc)/os/linux/']], }, ], -@@ -864,13 +865,16 @@ +@@ -866,13 +867,16 @@ }, ], [ Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_build__config.h ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_build__config.h Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_build__config.h Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/base/build_config.h.orig 2018-08-04 18:53:40 UTC +--- Telegram/SourceFiles/base/build_config.h.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/base/build_config.h -@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesk +@@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/maste #if defined(__APPLE__) #define OS_MAC 1 Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,30 +1,30 @@ ---- Telegram/SourceFiles/core/launcher.cpp.orig 2018-09-28 13:08:38 UTC +--- Telegram/SourceFiles/core/launcher.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/core/launcher.cpp -@@ -15,6 +15,8 @@ https://github.com/telegramdesktop/tdesk +@@ -15,6 +15,8 @@ https://github.com/telegramdesktop/tdesktop/blob/maste + #include "core/sandbox.h" #include "base/concurrent_timer.h" - #include "application.h" +#include "FREEBSD_QT_PLUGINDIR.h" + namespace Core { + namespace { - std::unique_ptr<Launcher> Launcher::Create(int argc, char *argv[]) { -@@ -39,9 +41,10 @@ void Launcher::init() { +@@ -208,9 +210,10 @@ void Launcher::init() { - QCoreApplication::setApplicationName(qsl("TelegramDesktop")); + QApplication::setApplicationName(qsl("TelegramDesktop")); -#ifndef OS_MAC_OLD +#if !defined(Q_OS_MAC) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + // Retina display support is working fine, others are not. - QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); + QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); -#endif // OS_MAC_OLD +#endif // not defined Q_OS_MAC and QT_VERSION >= 5.6.0 initHook(); } -@@ -59,6 +62,11 @@ int Launcher::exec() { +@@ -228,6 +231,11 @@ int Launcher::exec() { Logs::start(this); // must be started before Platform is started - Platform::start(); // must be started before QApplication is created + Platform::start(); // must be started before Sandbox is created + // I don't know why path is not in QT_PLUGIN_PATH by default + QCoreApplication::addLibraryPath(FREEBSD_QT_PLUGINDIR); @@ -34,13 +34,13 @@ auto result = executeApplication(); DEBUG_LOG(("Telegram finished, result: %1").arg(result)); -@@ -140,6 +148,9 @@ void Launcher::prepareSettings() { +@@ -329,6 +337,9 @@ void Launcher::prepareSettings() { + break; case dbipLinux32: gPlatformString = qsl("Linux32bit"); - break; ++ break; + case dbipFreeBSD: + gPlatformString = qsl("FreeBSD"); -+ break; + break; } - auto path = Platform::CurrentExecutablePath(_argc, _argv); 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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/core/update_checker.cpp.orig 2018-08-04 18:53:40 UTC +--- Telegram/SourceFiles/core/update_checker.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/core/update_checker.cpp -@@ -2016,6 +2016,9 @@ int UpdateChecker::size() const { +@@ -1457,6 +1457,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()) { -@@ -2068,6 +2071,9 @@ bool checkReadyUpdate() { +@@ -1509,6 +1512,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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/core/utils.h.orig 2018-12-24 08:16:05 UTC +--- Telegram/SourceFiles/core/utils.h.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/core/utils.h -@@ -378,6 +378,7 @@ enum DBIPlatform { +@@ -350,6 +350,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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/data/data_document.cpp.orig 2018-12-24 08:16:05 UTC +--- Telegram/SourceFiles/data/data_document.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/data/data_document.cpp -@@ -129,7 +129,7 @@ QString FileNameUnsafe( +@@ -128,7 +128,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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/export/data/export_data_types.cpp.orig 2018-12-24 08:16:05 UTC +--- Telegram/SourceFiles/export/data/export_data_types.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/export/data/export_data_types.cpp -@@ -366,9 +366,9 @@ QString CleanDocumentName(QString name) +@@ -369,9 +369,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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2018-12-24 08:16:05 UTC +--- 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 -@@ -1358,13 +1358,13 @@ void InnerWidget::mouseActionFinish(cons +@@ -1389,13 +1389,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 Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2018-12-24 08:16:05 UTC +--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/history/history_inner_widget.cpp -@@ -1352,7 +1352,7 @@ void HistoryInner::mouseActionFinish( +@@ -1362,7 +1362,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()) { -@@ -1361,7 +1361,7 @@ void HistoryInner::mouseActionFinish( +@@ -1371,7 +1371,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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2018-12-24 08:16:05 UTC +--- 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 -@@ -2019,7 +2019,7 @@ void ListWidget::mouseActionFinish( +@@ -2018,7 +2018,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)) { -@@ -2028,7 +2028,7 @@ void ListWidget::mouseActionFinish( +@@ -2027,7 +2027,7 @@ void ListWidget::mouseActionFinish( QClipboard::Selection); } } Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/logs.cpp.orig 2018-10-09 21:21:48 UTC +--- Telegram/SourceFiles/logs.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/logs.cpp -@@ -333,7 +333,7 @@ void start(not_null<Core::Launcher*> lau +@@ -333,7 +333,7 @@ void start(not_null<Core::Launcher*> launcher) { if (cAlphaVersion()) { workingDirChosen = true; @@ -9,7 +9,7 @@ } else { if (!cWorkingDir().isEmpty()) { // This value must come from TelegramForcePortable -@@ -348,16 +348,16 @@ void start(not_null<Core::Launcher*> lau +@@ -348,16 +348,16 @@ void start(not_null<Core::Launcher*> launcher) { } workingDirChosen = true; @@ -30,7 +30,7 @@ #ifdef _DEBUG cForceWorkingDir(cExeDir()); #else // _DEBUG -@@ -374,7 +374,7 @@ void start(not_null<Core::Launcher*> lau +@@ -374,7 +374,7 @@ void start(not_null<Core::Launcher*> launcher) { workingDirChosen = true; } 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 Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2018-12-24 08:16:05 UTC +--- Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/platform/linux/linux_libs.cpp @@ -121,6 +121,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_ind +@@ -130,6 +131,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_chec +@@ -191,10 +193,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,7 +29,7 @@ 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; -@@ -234,6 +238,7 @@ void start() { +@@ -229,6 +233,7 @@ void start() { bool gtkLoaded = false; bool indicatorLoaded = false; QLibrary lib_gtk, lib_indicator; @@ -37,7 +37,7 @@ if (loadLibrary(lib_indicator, "ayatana-appindicator3", 1) || loadLibrary(lib_indicator, "appindicator3", 1)) { if (loadLibrary(lib_gtk, "gtk-3", 0)) { gtkLoaded = setupGtkBase(lib_gtk); -@@ -249,6 +254,7 @@ void start() { +@@ -244,6 +249,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 Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/linux/linux_libs.h.orig 2018-12-24 08:16:05 UTC +--- Telegram/SourceFiles/platform/linux/linux_libs.h.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/platform/linux/linux_libs.h -@@ -10,18 +10,20 @@ https://github.com/telegramdesktop/tdesk +@@ -10,11 +10,13 @@ https://github.com/telegramdesktop/tdesktop/blob/maste #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION extern "C" { #undef signals @@ -14,15 +14,7 @@ #include <gtk/gtk.h> #include <gdk/gdk.h> #define signals public - } // extern "C" - - #ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION --#include <unity/unity/unity.h> -+typedef void UnityLauncherEntry; - #endif // !TDESKTOP_DISABLE_UNITY_INTEGRATION - #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION - -@@ -278,6 +280,7 @@ inline gulong g_signal_connect_swapped_h +@@ -275,6 +277,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; @@ -30,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; -@@ -289,6 +292,7 @@ extern f_app_indicator_set_menu app_indi +@@ -286,6 +289,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 Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2018-12-24 08:16:05 UTC +--- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp -@@ -25,7 +25,9 @@ bool noQtTrayIcon = false, tryAppIndicat +@@ -25,7 +25,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; -@@ -283,7 +285,9 @@ void MainWindow::workmodeUpdated(DBIWork +@@ -293,7 +295,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); } -@@ -299,7 +303,9 @@ void MainWindow::workmodeUpdated(DBIWork +@@ -309,7 +313,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); } -@@ -318,7 +324,9 @@ void MainWindow::psUpdateIndicator() { +@@ -328,7 +334,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; } -@@ -411,11 +419,15 @@ void MainWindow::LibsLoaded() { +@@ -425,11 +433,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; -@@ -460,6 +472,7 @@ void MainWindow::psCreateTrayIcon() { +@@ -465,6 +477,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(); -@@ -490,6 +503,7 @@ void MainWindow::psCreateTrayIcon() { +@@ -495,6 +508,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(); -@@ -608,10 +622,12 @@ MainWindow::~MainWindow() { +@@ -619,10 +633,12 @@ MainWindow::~MainWindow() { Libs::g_object_unref(_trayMenu); _trayMenu = nullptr; } @@ -82,6 +82,6 @@ _trayIndicator = nullptr; } +#endif - #ifndef TDESKTOP_DISABLE_UNITY_INTEGRATION - if (_psUnityLauncherEntry) { - Libs::g_object_unref(_psUnityLauncherEntry); + #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION + } + 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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/platform_specific.h.orig 2018-12-24 08:16:05 UTC +--- Telegram/SourceFiles/platform/platform_specific.h.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/platform/platform_specific.h -@@ -50,8 +50,8 @@ void finish(); +@@ -53,8 +53,8 @@ void finish(); #ifdef Q_OS_MAC #include "platform/mac/specific_mac.h" Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/platform_window_title.h.orig 2018-08-04 18:53:40 UTC +--- Telegram/SourceFiles/platform/platform_window_title.h.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/platform/platform_window_title.h -@@ -25,7 +25,7 @@ void PreviewWindowFramePaint(QImage &pre +@@ -25,7 +25,7 @@ void PreviewWindowFramePaint(QImage &preview, const st #include "platform/mac/window_title_mac.h" #elif defined Q_OS_WIN // Q_OS_MAC #include "platform/win/window_title_win.h" @@ -9,7 +9,7 @@ namespace Platform { -@@ -43,4 +43,4 @@ inline void PreviewWindowFramePaint(QIma +@@ -43,4 +43,4 @@ inline void PreviewWindowFramePaint(QImage &preview, c } // namespace Platform Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/qt_static_plugins.cpp.orig 2018-12-24 08:16:05 UTC +--- Telegram/SourceFiles/qt_static_plugins.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/qt_static_plugins.cpp -@@ -14,15 +14,5 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugi +@@ -14,15 +14,5 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) Q_IMPORT_PLUGIN(QWebpPlugin) Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin) Q_IMPORT_PLUGIN(QGenericEnginePlugin) 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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/settings/settings_notifications.cpp.orig 2018-12-24 08:16:05 UTC +--- Telegram/SourceFiles/settings/settings_notifications.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/settings/settings_notifications.cpp -@@ -477,11 +477,11 @@ void NotificationsCount::SampleWidget::d +@@ -478,11 +478,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_storage_storage__encrypted__file__tests.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_storage_storage__encrypted__file__tests.cpp Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_storage_storage__encrypted__file__tests.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/storage/storage_encrypted_file_tests.cpp.orig 2018-09-28 13:08:38 UTC +--- Telegram/SourceFiles/storage/storage_encrypted_file_tests.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/storage/storage_encrypted_file_tests.cpp -@@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesk +@@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/maste #include <thread> #ifdef Q_OS_MAC #include <mach-o/dyld.h> 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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/text/text.cpp.orig 2018-12-24 08:16:05 UTC +--- Telegram/SourceFiles/ui/text/text.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/ui/text/text.cpp -@@ -1760,11 +1760,11 @@ private: +@@ -1760,11 +1760,11 @@ class TextPainter { (private) if (item == -1) return; Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/text/text_block.cpp.orig 2018-08-04 18:53:40 UTC +--- Telegram/SourceFiles/ui/text/text_block.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/ui/text/text_block.cpp -@@ -332,6 +332,9 @@ TextBlock::TextBlock(const style::font & +@@ -332,6 +332,9 @@ TextBlock::TextBlock(const style::font &font, const QS QStackTextEngine engine(part, blockFont->f); BlockParser parser(&engine, this, minResizeWidth, _from, part); 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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/twidget.cpp.orig 2018-12-24 08:16:05 UTC +--- Telegram/SourceFiles/ui/twidget.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/ui/twidget.cpp -@@ -250,9 +250,9 @@ void sendSynteticMouseEvent(QWidget *wid +@@ -249,9 +249,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 Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2018-08-04 18:53:40 UTC +--- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/ui/widgets/labels.cpp -@@ -364,11 +364,11 @@ Text::StateResult FlatLabel::dragActionF +@@ -364,11 +364,11 @@ Text::StateResult FlatLabel::dragActionFinish(const QP } } 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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/window/main_window.cpp.orig 2018-12-24 08:16:05 UTC +--- Telegram/SourceFiles/window/main_window.cpp.orig 2019-02-01 12:51:46 UTC +++ Telegram/SourceFiles/window/main_window.cpp -@@ -501,7 +501,7 @@ bool MainWindow::minimizeToTray() { +@@ -503,7 +503,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()) { -@@ -516,7 +516,7 @@ void MainWindow::reActivateWindow() { +@@ -518,7 +518,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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2018-11-23 01:03:16 UTC +--- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2018-12-31 01:05:58 UTC +++ Telegram/ThirdParty/libtgvoip/VoIPController.cpp -@@ -2709,7 +2709,7 @@ static void initMachTimestart() { +@@ -2840,7 +2840,7 @@ static void initMachTimestart() { #endif double VoIPController::GetCurrentTime(){ Modified: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioIO.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioIO.cpp Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioIO.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,4 +1,4 @@ ---- Telegram/ThirdParty/libtgvoip/audio/AudioIO.cpp.orig 2018-11-23 01:03:16 UTC +--- Telegram/ThirdParty/libtgvoip/audio/AudioIO.cpp.orig 2018-12-31 01:05:58 UTC +++ Telegram/ThirdParty/libtgvoip/audio/AudioIO.cpp @@ -31,7 +31,7 @@ #endif @@ -9,7 +9,7 @@ #ifndef WITHOUT_ALSA #include "../os/linux/AudioInputALSA.h" #include "../os/linux/AudioOutputALSA.h" -@@ -66,7 +66,7 @@ AudioIO* AudioIO::Create(){ +@@ -65,7 +65,7 @@ AudioIO* AudioIO::Create(std::string inputDevice, std: return new ContextlessAudioIO<AudioInputWave, AudioOutputWave>(inputDevice, outputDevice); #endif return new ContextlessAudioIO<AudioInputWASAPI, AudioOutputWASAPI>(inputDevice, outputDevice); Modified: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,4 +1,4 @@ ---- Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp.orig 2018-09-18 16:52:01 UTC +--- Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp.orig 2018-12-31 01:05:58 UTC +++ Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp @@ -26,7 +26,7 @@ #include "../os/windows/AudioInputWave.h" @@ -9,7 +9,7 @@ #ifndef WITHOUT_ALSA #include "../os/linux/AudioInputALSA.h" #endif -@@ -72,7 +72,7 @@ void AudioInput::EnumerateDevices(std::v +@@ -72,7 +72,7 @@ void AudioInput::EnumerateDevices(std::vector<AudioInp } #endif AudioInputWASAPI::EnumerateDevices(devs); Modified: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,4 +1,4 @@ ---- Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp.orig 2018-09-18 16:52:01 UTC +--- Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp.orig 2018-12-31 01:05:58 UTC +++ Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp @@ -29,7 +29,7 @@ #include "../os/windows/AudioOutputWave.h" @@ -9,7 +9,7 @@ #ifndef WITHOUT_ALSA #include "../os/linux/AudioOutputALSA.h" #endif -@@ -83,7 +83,7 @@ void AudioOutput::EnumerateDevices(std:: +@@ -83,7 +83,7 @@ void AudioOutput::EnumerateDevices(std::vector<AudioOu } #endif AudioOutputWASAPI::EnumerateDevices(devs); Modified: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_logging.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_logging.cpp Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_logging.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,4 +1,4 @@ ---- Telegram/ThirdParty/libtgvoip/logging.cpp.orig 2018-07-17 16:48:21 UTC +--- Telegram/ThirdParty/libtgvoip/logging.cpp.orig 2018-12-31 01:05:58 UTC +++ Telegram/ThirdParty/libtgvoip/logging.cpp @@ -13,7 +13,7 @@ @@ -9,7 +9,7 @@ #include <sys/utsname.h> #endif -@@ -51,7 +51,7 @@ void tgvoip_log_file_write_header(FILE* +@@ -51,7 +51,7 @@ void tgvoip_log_file_write_header(FILE* file){ #else char* systemVersion="Windows RT"; #endif 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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp.orig 2018-11-23 01:03:16 UTC +--- Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp.orig 2018-12-31 01:05:58 UTC +++ Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp -@@ -61,6 +61,7 @@ void NetworkSocketPosix::SetMaxPriority( +@@ -61,6 +61,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_PrecompiledHeader.cmake ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_gyp_PrecompiledHeader.cmake Tue Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_gyp_PrecompiledHeader.cmake Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/gyp/PrecompiledHeader.cmake.orig 2018-08-04 18:53:40 UTC +--- Telegram/gyp/PrecompiledHeader.cmake.orig 2019-02-01 12:51:46 UTC +++ Telegram/gyp/PrecompiledHeader.cmake -@@ -81,7 +81,7 @@ function(export_all_flags _filename _sou +@@ -81,7 +81,7 @@ function(export_all_flags _filename _source_name_for_f endfunction() function(add_precompiled_header _target _input) @@ -9,7 +9,7 @@ get_filename_component(_name ${_input} NAME) set(_pch_header "${CMAKE_CURRENT_SOURCE_DIR}/${_input}") set(_pch_binary_dir "${CMAKE_CURRENT_BINARY_DIR}/${_target}_pch") -@@ -114,7 +114,7 @@ function(add_precompiled_header _target +@@ -114,7 +114,7 @@ function(add_precompiled_header _target _input) set(_compiler_FLAGS "@${_pch_c_flags_file}") add_custom_command( OUTPUT "${_output_c}" @@ -18,7 +18,7 @@ DEPENDS "${_pchfile}" "${_pch_c_flags_file}" IMPLICIT_DEPENDS C "${_pch_header}" COMMENT "Precompiling ${_name} for ${_target} (C)") -@@ -125,7 +125,7 @@ function(add_precompiled_header _target +@@ -125,7 +125,7 @@ function(add_precompiled_header _target _input) set(_compiler_FLAGS "@${_pch_cpp_flags_file}") add_custom_command( OUTPUT "${_output_cxx}" @@ -27,7 +27,7 @@ DEPENDS "${_pchfile}" "${_pch_cpp_flags_file}" IMPLICIT_DEPENDS CXX "${_pch_header}" COMMENT "Precompiling header ${_name} for ${_target} (C++)") -@@ -163,5 +163,5 @@ function(add_precompiled_header _target +@@ -163,5 +163,5 @@ function(add_precompiled_header _target _input) OBJECT_DEPENDS "${_object_depends}") endif() endforeach() 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 Feb 5 13:59:34 2019 (r492231) +++ head/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt Tue Feb 5 14:05:36 2019 (r492232) @@ -1,6 +1,6 @@ ---- Telegram/gyp/telegram_sources.txt.orig 2018-12-24 08:16:05 UTC +--- Telegram/gyp/telegram_sources.txt.orig 2019-02-01 12:51:46 UTC +++ Telegram/gyp/telegram_sources.txt -@@ -805,14 +805,7 @@ +@@ -830,14 +830,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?201902051405.x15E5aYR017718>