Date: Fri, 13 Sep 2019 16:29: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: r511978 - in head/net-im/telegram-desktop: . files Message-ID: <201909131629.x8DGTawX088393@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Fri Sep 13 16:29:36 2019 New Revision: 511978 URL: https://svnweb.freebsd.org/changeset/ports/511978 Log: net-im/telegram-desktop: update to 1.8.4 PR: 240401 Submitted by: Henry Hu <henry.hu.sh@gmail.com> (maintainer) Added: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp (contents, props changed) Deleted: head/net-im/telegram-desktop/files/patch-issue6219 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/CMakeLists.inj head/net-im/telegram-desktop/files/gyp-patches 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_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_qt__functions.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_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_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_gyp_telegram__sources.txt (contents, props changed) Modified: head/net-im/telegram-desktop/Makefile ============================================================================== --- head/net-im/telegram-desktop/Makefile Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/Makefile Fri Sep 13 16:29:36 2019 (r511978) @@ -2,7 +2,7 @@ PORTNAME= telegram-desktop DISTVERSIONPREFIX= v -DISTVERSION= 1.7.14 +DISTVERSION= 1.8.4 CATEGORIES= net-im MAINTAINER= henry.hu.sh@gmail.com @@ -14,18 +14,19 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= powerpc powerpc64 powerpcspe NOT_FOR_ARCHS_REASON= Please add support for your architecture in base/build_config.h -BUILD_DEPENDS= dee>0:devel/dee \ +BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib \ + dee>0:devel/dee \ gyp:devel/py-gyp@${PY_FLAVOR} \ - range-v3>0:devel/range-v3 \ pulseaudio>0:audio/pulseaudio \ - alsa-lib>0:audio/alsa-lib + range-v3>0:devel/range-v3 LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ libminizip.so:archivers/minizip \ libopenal.so:audio/openal-soft \ libopus.so:audio/opus -USES= compiler:c++17-lang cmake:noninja desktop-file-utils gmake gnome pkgconfig python:2.7,build qt:5 ssl +USES= cmake:noninja compiler:c++17-lang desktop-file-utils gmake \ + gnome pkgconfig python:2.7,build qt:5 ssl xorg USE_GITHUB= yes GH_ACCOUNT= telegramdesktop @@ -33,13 +34,14 @@ 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:0e92a22:libtgvoip/Telegram/ThirdParty/libtgvoip \ - telegramdesktop:crl:9ea8700:crl/Telegram/ThirdParty/crl \ + telegramdesktop:libtgvoip:d4a0f71:libtgvoip/Telegram/ThirdParty/libtgvoip \ + telegramdesktop:crl:52baf11:crl/Telegram/ThirdParty/crl \ Cyan4973:xxHash:7cc9639:xxhash/Telegram/ThirdParty/xxHash \ - john-preston:rlottie:302b7f9:rlottie/Telegram/ThirdParty/rlottie \ + john-preston:rlottie:589db02:rlottie/Telegram/ThirdParty/rlottie \ lz4:lz4:9a2a9f2:lz4/Telegram/ThirdParty/lz4 USE_GNOME= glib20 -USE_QT= core gui imageformats network widgets buildtools_build qmake_build dbus +USE_QT= core dbus gui imageformats network widgets buildtools_build \ + qmake_build USE_XORG= x11 xcb CMAKE_SOURCE_PATH= ${WRKSRC}/out/Release @@ -49,14 +51,14 @@ CMAKE_SOURCE_PATH= ${WRKSRC}/out/Release # or create our own. TELEGRAM_API_ID= 17349 TELEGRAM_API_HASH= 344583e45741c457fe1862106095a5eb -GYP_DEFINES= TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME +GYP_DEFINES= TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_DISABLE_AUTOUPDATE,TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME # Telegram uses OpenAL for its audio, but libtgvoip (for voice calls) can use PulseAudio or ALSA. # It dynamically loads PulseAudio, and if this fails, it loads ALSA. # If both of them are not installed, then voice calls do not work, but other functionalities still work. -OPTIONS_MULTI= AUDIO +OPTIONS_MULTI= AUDIO OPTIONS_MULTI_AUDIO= ALSA PULSEAUDIO -OPTIONS_DEFINE= GTK +OPTIONS_DEFINE= GTK OPTIONS_DEFAULT= ALSA AUDIO_DESC= Audio backend for voice calls Modified: head/net-im/telegram-desktop/distinfo ============================================================================== --- head/net-im/telegram-desktop/distinfo Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/distinfo Fri Sep 13 16:29:36 2019 (r511978) @@ -1,19 +1,19 @@ -TIMESTAMP = 1564285102 -SHA256 (telegramdesktop-tdesktop-v1.7.14_GH0.tar.gz) = a52ab6efb4dc7579f05543df3fc3814baa09c0644e00ca30e37a9c6f99a5d164 -SIZE (telegramdesktop-tdesktop-v1.7.14_GH0.tar.gz) = 14296012 +TIMESTAMP = 1567889674 +SHA256 (telegramdesktop-tdesktop-v1.8.4_GH0.tar.gz) = 97f034d78447c99002b8742c75a3a436e709cdf2f5dff79f7ca04a8c76298627 +SIZE (telegramdesktop-tdesktop-v1.8.4_GH0.tar.gz) = 14367314 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-0e92a22_GH0.tar.gz) = 179c780bf199ff41984756d1b0b96287edf0fa1490f76a31eb9cbdc572ecce6f -SIZE (telegramdesktop-libtgvoip-0e92a22_GH0.tar.gz) = 1484785 -SHA256 (telegramdesktop-crl-9ea8700_GH0.tar.gz) = 68011a83a139d68bed4fd13b946c1aea6f7bea8bffc702a4795f2c0e23f9efd4 -SIZE (telegramdesktop-crl-9ea8700_GH0.tar.gz) = 21873 +SHA256 (telegramdesktop-libtgvoip-d4a0f71_GH0.tar.gz) = bff049b414bdaafe488f3d46d894e910c06ff5233bf33001d59fe50b7de3702a +SIZE (telegramdesktop-libtgvoip-d4a0f71_GH0.tar.gz) = 1484804 +SHA256 (telegramdesktop-crl-52baf11_GH0.tar.gz) = 04effcfcbcd1486619d93dba0a30ca16579bca5cc37273ed1908dd8b375e3e3b +SIZE (telegramdesktop-crl-52baf11_GH0.tar.gz) = 21842 SHA256 (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = f40801820e885f92bbe3d2434efeb39aa18eeaf878341982e8525b538468e3ed SIZE (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = 37534 -SHA256 (john-preston-rlottie-302b7f9_GH0.tar.gz) = ade35b77c10c2a733ecccbca261222c36755bbd0f0d03f2e2772bd7cc0ad3d2b -SIZE (john-preston-rlottie-302b7f9_GH0.tar.gz) = 7896441 +SHA256 (john-preston-rlottie-589db02_GH0.tar.gz) = 415a78d04836f5bf4e535b034a7d5cf540d55cce98b9be869c3178e1c251f361 +SIZE (john-preston-rlottie-589db02_GH0.tar.gz) = 7887733 SHA256 (lz4-lz4-9a2a9f2_GH0.tar.gz) = 437827e1a1a0eec752777d29ef7ac78b195c805438448fe08154d9b5b181b8ea SIZE (lz4-lz4-9a2a9f2_GH0.tar.gz) = 293999 Modified: head/net-im/telegram-desktop/files/CMakeLists.inj ============================================================================== --- head/net-im/telegram-desktop/files/CMakeLists.inj Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/CMakeLists.inj Fri Sep 13 16:29:36 2019 (r511978) @@ -12,6 +12,7 @@ add_precompiled_header(Telegram ../../Telegram/SourceF add_precompiled_header(lib_base ../../Telegram/SourceFiles/base/base_pch.h) add_precompiled_header(lib_export ../../Telegram/SourceFiles/export/export_pch.h) add_precompiled_header(lib_storage ../../Telegram/SourceFiles/storage/storage_pch.h) +add_precompiled_header(lib_mtproto ../../Telegram/SourceFiles/mtproto/mtp_pch.h) # vim: ft=cmake # -------------- debian/CMakeLists.inj end -------------- Modified: head/net-im/telegram-desktop/files/gyp-patches ============================================================================== --- head/net-im/telegram-desktop/files/gyp-patches Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/gyp-patches Fri Sep 13 16:29:36 2019 (r511978) @@ -1,4 +1,4 @@ ---- Telegram/gyp/codegen_rules.gypi.orig 2019-07-07 13:34:35 UTC +--- Telegram/gyp/codegen_rules.gypi.orig 2019-09-06 13:41:43 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-07-07 13:34:35 UTC +--- Telegram/gyp/lib_export.gyp.orig 2019-09-06 13:41:43 UTC +++ Telegram/gyp/lib_export.gyp @@ -46,7 +46,7 @@ 'include_dirs': [ @@ -36,18 +36,18 @@ '<(submodules_loc)/GSL/include', '<(submodules_loc)/variant/include', '<(submodules_loc)/crl/src', ---- Telegram/gyp/lib_scheme.gyp.orig 2019-07-07 13:34:35 UTC +--- Telegram/gyp/lib_scheme.gyp.orig 2019-09-06 13:41:43 UTC +++ Telegram/gyp/lib_scheme.gyp -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ '<(SHARED_INTERMEDIATE_DIR)/scheme.h', ], 'action': [ - 'python', '<(src_loc)/codegen/scheme/codegen_scheme.py', + '%%PYTHON_CMD%%', '<(src_loc)/codegen/scheme/codegen_scheme.py', - '-o', '<(SHARED_INTERMEDIATE_DIR)', '<(res_loc)/scheme.tl', - ], - 'message': 'codegen_scheme-ing scheme.tl..', ---- Telegram/gyp/qt_moc.gypi.orig 2019-07-07 13:34:35 UTC + '-o', '<(SHARED_INTERMEDIATE_DIR)', + '<(res_loc)/tl/mtproto.tl', + '<(res_loc)/tl/api.tl', +--- Telegram/gyp/qt_moc.gypi.orig 2019-09-06 13:41:43 UTC +++ Telegram/gyp/qt_moc.gypi @@ -15,12 +15,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-07-07 13:34:35 UTC +--- Telegram/gyp/qt_rcc.gypi.orig 2019-09-06 13:41:43 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-07-07 13:34:35 UTC +--- Telegram/gyp/qt.gypi.orig 2019-09-06 13:41:43 UTC +++ Telegram/gyp/qt.gypi @@ -14,25 +14,21 @@ [ 'build_macold', { @@ -233,7 +233,7 @@ '-pthread', '-rdynamic', ], ---- Telegram/gyp/telegram_linux.gypi.orig 2019-07-07 13:34:35 UTC +--- Telegram/gyp/telegram_linux.gypi.orig 2019-09-06 13:41:43 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-07-07 13:34:35 UTC +--- Telegram/gyp/Telegram.gyp.orig 2019-09-06 13:41:43 UTC +++ Telegram/gyp/Telegram.gyp @@ -51,7 +51,7 @@ 'pt-BR', @@ -358,7 +358,7 @@ '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip', 'crl.gyp:crl', 'lib_base.gyp:lib_base', -@@ -86,27 +85,18 @@ +@@ -87,27 +86,18 @@ ], 'defines': [ @@ -388,7 +388,7 @@ '<(emoji_suggestions_loc)', '<(submodules_loc)/GSL/include', '<(submodules_loc)/variant/include', -@@ -125,7 +115,7 @@ +@@ -126,7 +116,7 @@ '<(res_loc)/export_html/images/back@2x.png', ], 'sources!': [ @@ -397,7 +397,7 @@ ], 'conditions': [ [ '"<(official_build_target)" != ""', { ---- Telegram/gyp/tests/tests.gyp.orig 2019-07-07 13:34:35 UTC +--- Telegram/gyp/tests/tests.gyp.orig 2019-09-06 13:41:43 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 2019-06-24 11:42:33 UTC +--- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig 2019-07-15 12:59:17 UTC +++ Telegram/ThirdParty/libtgvoip/libtgvoip.gyp @@ -14,11 +14,12 @@ 'variables': { Added: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_chat__helpers_stickers__emoji__pack.cpp Fri Sep 13 16:29:36 2019 (r511978) @@ -0,0 +1,11 @@ +--- Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp.orig 2019-09-06 13:41:43 UTC ++++ Telegram/SourceFiles/chat_helpers/stickers_emoji_pack.cpp +@@ -103,7 +103,7 @@ constexpr auto kClearSourceTimeout = 10 * crl::time(10 + }, + 5, + }; +- static const auto list = std::array{ ++ static const auto list = std::array<const Lottie::ColorReplacements*, 5>{ + &color1, + &color2, + &color3, 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 Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp Fri Sep 13 16:29:36 2019 (r511978) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/core/launcher.cpp.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/core/launcher.cpp.orig 2019-09-06 13:41:43 UTC +++ Telegram/SourceFiles/core/launcher.cpp @@ -16,6 +16,8 @@ https://github.com/telegramdesktop/tdesktop/blob/maste #include "core/sandbox.h" @@ -9,7 +9,7 @@ namespace Core { namespace { -@@ -246,12 +248,13 @@ void Launcher::init() { +@@ -248,12 +250,13 @@ void Launcher::init() { #define TDESKTOP_LAUNCHER_FILENAME_TO_STRING_HELPER(V) #V #define TDESKTOP_LAUNCHER_FILENAME_TO_STRING(V) TDESKTOP_LAUNCHER_FILENAME_TO_STRING_HELPER(V) QApplication::setDesktopFileName(qsl(TDESKTOP_LAUNCHER_FILENAME_TO_STRING(TDESKTOP_LAUNCHER_FILENAME))); @@ -26,7 +26,7 @@ initHook(); } -@@ -268,6 +271,11 @@ int Launcher::exec() { +@@ -270,6 +273,11 @@ int Launcher::exec() { // both are finished in Sandbox::closeApplication Logs::start(this); // must be started before Platform is started Platform::start(); // must be started before Sandbox is created 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 Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp Fri Sep 13 16:29:36 2019 (r511978) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/core/update_checker.cpp.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/core/update_checker.cpp.orig 2019-09-06 13:41:43 UTC +++ Telegram/SourceFiles/core/update_checker.cpp -@@ -1461,6 +1461,9 @@ int UpdateChecker::size() const { +@@ -1463,6 +1463,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()) { -@@ -1513,6 +1516,9 @@ bool checkReadyUpdate() { +@@ -1515,6 +1518,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_export_data_export__data__types.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp Fri Sep 13 16:29:36 2019 (r511978) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/export/data/export_data_types.cpp.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/export/data/export_data_types.cpp.orig 2019-09-06 13:41:43 UTC +++ Telegram/SourceFiles/export/data/export_data_types.cpp -@@ -360,9 +360,9 @@ QString CleanDocumentName(QString name) { +@@ -362,9 +362,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 Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp Fri Sep 13 16:29:36 2019 (r511978) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2019-09-06 13:41:43 UTC +++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp -@@ -1411,13 +1411,13 @@ void InnerWidget::mouseActionFinish(const QPoint &scre +@@ -1425,13 +1425,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 Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp Fri Sep 13 16:29:36 2019 (r511978) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2019-09-06 13:41:43 UTC +++ Telegram/SourceFiles/history/history_inner_widget.cpp -@@ -1382,7 +1382,7 @@ void HistoryInner::mouseActionFinish( +@@ -1390,7 +1390,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()) { -@@ -1391,7 +1391,7 @@ void HistoryInner::mouseActionFinish( +@@ -1399,7 +1399,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 Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp Fri Sep 13 16:29:36 2019 (r511978) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2019-09-06 13:41:43 UTC +++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp -@@ -2042,7 +2042,7 @@ void ListWidget::mouseActionFinish( +@@ -2050,7 +2050,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)) { -@@ -2051,7 +2051,7 @@ void ListWidget::mouseActionFinish( +@@ -2059,7 +2059,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 Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp Fri Sep 13 16:29:36 2019 (r511978) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2019-09-06 13:41:43 UTC +++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp -@@ -25,7 +25,9 @@ bool noQtTrayIcon = false, tryAppIndicator = false; +@@ -26,7 +26,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; -@@ -291,7 +293,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { +@@ -292,7 +294,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); } -@@ -307,7 +311,9 @@ void MainWindow::workmodeUpdated(DBIWorkMode mode) { +@@ -308,7 +312,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); } -@@ -326,7 +332,9 @@ void MainWindow::psUpdateIndicator() { +@@ -327,7 +333,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; } -@@ -423,11 +431,15 @@ void MainWindow::LibsLoaded() { +@@ -424,11 +432,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; -@@ -463,6 +475,7 @@ void MainWindow::psCreateTrayIcon() { +@@ -464,6 +476,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(); -@@ -493,6 +506,7 @@ void MainWindow::psCreateTrayIcon() { +@@ -494,6 +507,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(); -@@ -617,10 +631,12 @@ MainWindow::~MainWindow() { +@@ -628,10 +642,12 @@ MainWindow::~MainWindow() { Libs::g_object_unref(_trayMenu); _trayMenu = nullptr; } Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp Fri Sep 13 16:29:36 2019 (r511978) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/qt_functions.cpp.orig 2018-08-05 22:39:05 UTC +--- Telegram/SourceFiles/qt_functions.cpp.orig 2019-09-07 21:39:10 UTC +++ Telegram/SourceFiles/qt_functions.cpp -@@ -0,0 +1,94 @@ +@@ -0,0 +1,96 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. @@ -33,6 +33,8 @@ +** $QT_END_LICENSE$ +** +****************************************************************************/ ++ ++#include <private/qtextengine_p.h> + +/* TODO: find a dynamic library with these symbols. */ + 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 Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications.cpp Fri Sep 13 16:29:36 2019 (r511978) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/settings/settings_notifications.cpp.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/settings/settings_notifications.cpp.orig 2019-09-06 13:41:43 UTC +++ Telegram/SourceFiles/settings/settings_notifications.cpp -@@ -480,11 +480,11 @@ void NotificationsCount::SampleWidget::destroyDelayed( +@@ -494,11 +494,11 @@ void NotificationsCount::SampleWidget::destroyDelayed( _deleted = true; // Ubuntu has a lag if deleteLater() called immediately. @@ -14,4 +14,4 @@ +#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || Q_OS_FREEBSD } - void SetupAdvancedNotifications(not_null<Ui::VerticalLayout*> container) { + void SetupAdvancedNotifications( 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 Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp Fri Sep 13 16:29:36 2019 (r511978) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/text/text.cpp.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/ui/text/text.cpp.orig 2019-09-06 13:41:43 UTC +++ Telegram/SourceFiles/ui/text/text.cpp -@@ -2016,11 +2016,11 @@ class Renderer { (private) +@@ -2018,11 +2018,11 @@ class Renderer { (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 Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp Fri Sep 13 16:29:36 2019 (r511978) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/text/text_block.cpp.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/ui/text/text_block.cpp.orig 2019-09-06 13:41:43 UTC +++ Telegram/SourceFiles/ui/text/text_block.cpp -@@ -335,6 +335,9 @@ TextBlock::TextBlock(const style::font &font, const QS +@@ -337,6 +337,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_window_main__window.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp Fri Sep 13 16:29:36 2019 (r511978) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/window/main_window.cpp.orig 2019-07-07 13:34:35 UTC +--- Telegram/SourceFiles/window/main_window.cpp.orig 2019-09-06 13:41:43 UTC +++ Telegram/SourceFiles/window/main_window.cpp -@@ -565,7 +565,7 @@ bool MainWindow::minimizeToTray() { +@@ -564,7 +564,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()) { -@@ -580,7 +580,7 @@ void MainWindow::reActivateWindow() { +@@ -579,7 +579,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 Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp Fri Sep 13 16:29:36 2019 (r511978) @@ -1,16 +1,5 @@ ---- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2019-06-24 11:42:33 UTC +--- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2019-07-15 12:59:17 UTC +++ Telegram/ThirdParty/libtgvoip/VoIPController.cpp -@@ -2389,8 +2389,8 @@ simpleAudioBlock random_id:long random_bytes:string ra - stm->decoder=NULL; - }else if(stm->type==STREAM_TYPE_VIDEO){ - if(!stm->packetReassembler){ -- stm->packetReassembler=make_shared<PacketReassembler>(); -- stm->packetReassembler->SetCallback(bind(&VoIPController::ProcessIncomingVideoFrame, this, placeholders::_1, placeholders::_2, placeholders::_3)); -+ //stm->packetReassembler=make_shared<PacketReassembler>(); -+ //stm->packetReassembler->SetCallback(bind(&VoIPController::ProcessIncomingVideoFrame, this, placeholders::_1, placeholders::_2, placeholders::_3)); - } - }else{ - LOGW("Unknown incoming stream type: %d", stm->type); @@ -3048,7 +3048,7 @@ static void initMachTimestart() { #endif 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 Fri Sep 13 15:46:26 2019 (r511977) +++ head/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt Fri Sep 13 16:29:36 2019 (r511978) @@ -1,6 +1,6 @@ ---- Telegram/gyp/telegram_sources.txt.orig 2019-07-07 13:34:35 UTC +--- Telegram/gyp/telegram_sources.txt.orig 2019-09-06 13:41:43 UTC +++ Telegram/gyp/telegram_sources.txt -@@ -577,8 +577,8 @@ +@@ -605,8 +605,8 @@ <(src_loc)/platform/linux/linux_libs.h <(src_loc)/platform/linux/file_utilities_linux.cpp <(src_loc)/platform/linux/file_utilities_linux.h @@ -11,7 +11,7 @@ <(src_loc)/platform/linux/launcher_linux.cpp <(src_loc)/platform/linux/launcher_linux.h <(src_loc)/platform/linux/main_window_linux.cpp -@@ -894,14 +894,7 @@ +@@ -923,14 +923,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?201909131629.x8DGTawX088393>