Date: Tue, 9 Oct 2018 02:01:19 +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: r481593 - in head/net-im/telegram-desktop: . files Message-ID: <201810090201.w9921JNh029412@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue Oct 9 02:01:19 2018 New Revision: 481593 URL: https://svnweb.freebsd.org/changeset/ports/481593 Log: net-im/telegram-desktop: update to 1.4.0 PR: 232061 Submitted by: Henry Hu <henry.hu.sh@gmail.com> (maintainer) Added: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_old__settings_settings__notifications__widget.cpp (contents, props changed) - copied, changed from r481592, head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp 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_ThirdParty_libtgvoip_MediaStreamItf.cpp (contents, props changed) Deleted: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp 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_base_bytes.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_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_logs.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_gyp_telegram__sources.txt (contents, props changed) Modified: head/net-im/telegram-desktop/Makefile ============================================================================== --- head/net-im/telegram-desktop/Makefile Tue Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/Makefile Tue Oct 9 02:01:19 2018 (r481593) @@ -2,7 +2,7 @@ PORTNAME= telegram-desktop DISTVERSIONPREFIX= v -DISTVERSION= 1.3.14 +DISTVERSION= 1.4.0 CATEGORIES= net-im MAINTAINER= henry.hu.sh@gmail.com @@ -23,18 +23,19 @@ LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libopus.so:audio/opus USES= compiler:c++17-lang cmake:noninja,outsource desktop-file-utils gmake pkgconfig python:2.7,build qt:5 ssl + USE_GITHUB= yes GH_ACCOUNT= telegramdesktop 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:bfa1e6a:libtgvoip/Telegram/ThirdParty/libtgvoip \ - telegramdesktop:crl:527ad27:crl/Telegram/ThirdParty/crl + telegramdesktop:libtgvoip:9b292fd:libtgvoip/Telegram/ThirdParty/libtgvoip \ + telegramdesktop:crl:4291015: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 USE_XORG= x11 xcb -INSTALLS_ICONS= yes CMAKE_SOURCE_PATH= ${WRKSRC}/out/Release @@ -64,13 +65,12 @@ GYP_DEFINES:= ${GYP_DEFINES},TDESKTOP_DISABLE_GTK_INTE .include <bsd.port.pre.mk> - # This port needs C++17 libs/compiler. # Currently, this is not supported by USES=compiler # Using clang does not work: libc++ in base does not support C++17. # Using gcc does not work: using both libc++ and libstdc++ causes crashes. .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -IGNORE= Need C++17 support in compiler and runtime +IGNORE= need C++17 support in compiler and runtime .endif # Since 1.3.14, the clang compiler provided in 11.1 (4.0.0) gets a segmentation Modified: head/net-im/telegram-desktop/distinfo ============================================================================== --- head/net-im/telegram-desktop/distinfo Tue Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/distinfo Tue Oct 9 02:01:19 2018 (r481593) @@ -1,13 +1,15 @@ -TIMESTAMP = 1535586991 -SHA256 (telegramdesktop-tdesktop-v1.3.14_GH0.tar.gz) = 83daeded641f79bd370b5e83be88242ab57520e7754f1371a9e5c1f3d9863f2a -SIZE (telegramdesktop-tdesktop-v1.3.14_GH0.tar.gz) = 17199969 +TIMESTAMP = 1538948703 +SHA256 (telegramdesktop-tdesktop-v1.4.0_GH0.tar.gz) = e3ee54461dae5552b41b6b56f12225a4d546118b2e2d4d864442e4462da97a9b +SIZE (telegramdesktop-tdesktop-v1.4.0_GH0.tar.gz) = 17318129 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-bfa1e6a_GH0.tar.gz) = 355ab6bf2d5c2a8edcd1e6263aaec43af67d7085f4ddacfab3f3f942cff8c1b5 -SIZE (telegramdesktop-libtgvoip-bfa1e6a_GH0.tar.gz) = 796409 -SHA256 (telegramdesktop-crl-527ad27_GH0.tar.gz) = 6ab03b09ea2f501f3602acfd06d6a5d174db6a25259268978323552a69b37622 -SIZE (telegramdesktop-crl-527ad27_GH0.tar.gz) = 20081 +SHA256 (telegramdesktop-libtgvoip-9b292fd_GH0.tar.gz) = 0545b3cdadb65f74d69bf11d9fd39f1ad15f5045cd819d64e8d40ef536b22a7e +SIZE (telegramdesktop-libtgvoip-9b292fd_GH0.tar.gz) = 803095 +SHA256 (telegramdesktop-crl-4291015_GH0.tar.gz) = 25f461f0e575cfa2b55959f735115acac1f515d923a85b2a7a7a886dd6f0c395 +SIZE (telegramdesktop-crl-4291015_GH0.tar.gz) = 21322 +SHA256 (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = f40801820e885f92bbe3d2434efeb39aa18eeaf878341982e8525b538468e3ed +SIZE (Cyan4973-xxHash-7cc9639_GH0.tar.gz) = 37534 Modified: head/net-im/telegram-desktop/files/CMakeLists.inj ============================================================================== --- head/net-im/telegram-desktop/files/CMakeLists.inj Tue Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/files/CMakeLists.inj Tue Oct 9 02:01:19 2018 (r481593) @@ -9,7 +9,9 @@ set_target_properties(Telegram PROPERTIES SKIP_BUILD_R # lines. include(../../Telegram/gyp/PrecompiledHeader.cmake) add_precompiled_header(Telegram ../../Telegram/SourceFiles/stdafx.h) +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) # vim: ft=cmake # -------------- debian/CMakeLists.inj end -------------- Modified: head/net-im/telegram-desktop/files/gyp-patches ============================================================================== --- head/net-im/telegram-desktop/files/gyp-patches Tue Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/files/gyp-patches Tue Oct 9 02:01:19 2018 (r481593) @@ -1,4 +1,4 @@ ---- Telegram/gyp/codegen_rules.gypi.orig 2018-08-04 18:53:40 UTC +--- Telegram/gyp/codegen_rules.gypi.orig 2018-09-28 13:08:38 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 2018-08-04 18:53:40 UTC +--- Telegram/gyp/lib_export.gyp.orig 2018-09-28 13:08:38 UTC +++ Telegram/gyp/lib_export.gyp @@ -48,7 +48,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 2018-08-04 18:53:40 UTC +--- Telegram/gyp/lib_scheme.gyp.orig 2018-09-28 13:08:38 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-08-04 18:53:40 UTC +--- Telegram/gyp/qt_moc.gypi.orig 2018-09-28 13:08:38 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-08-04 18:53:40 UTC +--- Telegram/gyp/qt_rcc.gypi.orig 2018-09-28 13:08:38 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-08-04 18:53:40 UTC +--- Telegram/gyp/qt.gypi.orig 2018-09-28 13:08:38 UTC +++ Telegram/gyp/qt.gypi @@ -14,25 +14,21 @@ [ 'build_macold', { @@ -233,7 +233,7 @@ '-pthread', '-rdynamic', ], ---- Telegram/gyp/telegram_linux.gypi.orig 2018-08-04 18:53:40 UTC +--- Telegram/gyp/telegram_linux.gypi.orig 2018-09-28 13:08:38 UTC +++ Telegram/gyp/telegram_linux.gypi @@ -10,7 +10,7 @@ 'variables': { @@ -338,7 +338,7 @@ ], }] ], ---- Telegram/gyp/Telegram.gyp.orig 2018-08-04 18:53:40 UTC +--- Telegram/gyp/Telegram.gyp.orig 2018-09-28 13:08:38 UTC +++ Telegram/gyp/Telegram.gyp @@ -51,7 +51,7 @@ 'pt-BR', @@ -349,20 +349,22 @@ 'pch_source': '<(src_loc)/stdafx.cpp', 'pch_header': '<(src_loc)/stdafx.h', }, -@@ -74,31 +74,21 @@ +@@ -75,7 +75,6 @@ 'codegen.gyp:codegen_numbers', 'codegen.gyp:codegen_style', 'tests/tests.gyp:tests', - 'utils.gyp:Updater', '../ThirdParty/libtgvoip/libtgvoip.gyp:libtgvoip', 'crl.gyp:crl', - 'lib_export.gyp:lib_export', + 'lib_base.gyp:lib_base', +@@ -84,25 +83,16 @@ ], 'defines': [ - 'AL_LIBTYPE_STATIC', 'AL_ALEXT_PROTOTYPES', 'TGVOIP_USE_CXX11_LIB', + 'XXH_INLINE_ALL', - '<!@(python -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")', + '<!@(%%PYTHON_CMD%% -c "for s in \'<(build_defines)\'.split(\',\'): print(s)")', ], @@ -383,7 +385,7 @@ '<(emoji_suggestions_loc)', '<(submodules_loc)/GSL/include', '<(submodules_loc)/variant/include', -@@ -116,7 +106,7 @@ +@@ -121,7 +111,7 @@ '<(res_loc)/export_html/images/back@2x.png', ], 'sources!': [ @@ -392,7 +394,7 @@ ], 'conditions': [ [ '"<(official_build_target)" != ""', { ---- Telegram/gyp/tests/tests.gyp.orig 2018-08-04 18:53:40 UTC +--- Telegram/gyp/tests/tests.gyp.orig 2018-09-28 13:08:38 UTC +++ Telegram/gyp/tests/tests.gyp @@ -13,7 +13,7 @@ 'src_loc': '../../SourceFiles', @@ -403,7 +405,7 @@ }, 'targets': [{ 'target_name': 'tests', ---- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig 2018-07-17 16:48:21 UTC +--- Telegram/ThirdParty/libtgvoip/libtgvoip.gyp.orig 2018-09-18 16:52:01 UTC +++ Telegram/ThirdParty/libtgvoip/libtgvoip.gyp @@ -13,11 +13,12 @@ 'variables': { @@ -428,7 +430,7 @@ 'sources/': [['exclude', '<(tgvoip_src_loc)/os/linux/']], }, ], -@@ -382,12 +383,15 @@ +@@ -383,12 +384,15 @@ }, ], [ Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h Tue Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h Tue Oct 9 02:01:19 2018 (r481593) @@ -1,6 +1,6 @@ ---- ./Telegram/SourceFiles/base/bytes.h.orig 2018-08-04 14:53:40 UTC -+++ ./Telegram/SourceFiles/base/bytes.h -@@ -128,7 +128,7 @@ template < +--- Telegram/SourceFiles/base/bytes.h.orig 2018-09-28 13:08:38 UTC ++++ Telegram/SourceFiles/base/bytes.h +@@ -135,7 +135,7 @@ template < vector concatenate(Args &&...args) { const auto size = details::spansLength(args...); auto result = vector(size); @@ -9,7 +9,7 @@ return result; } -@@ -140,7 +140,7 @@ vector concatenate(SpanRange args) { +@@ -147,7 +147,7 @@ vector concatenate(SpanRange args) { size += bytes::make_span(arg).size(); } auto result = vector(size); 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 Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp Tue Oct 9 02:01:19 2018 (r481593) @@ -1,7 +1,7 @@ ---- Telegram/SourceFiles/core/launcher.cpp.orig 2018-08-04 18:53:40 UTC +--- Telegram/SourceFiles/core/launcher.cpp.orig 2018-09-28 13:08:38 UTC +++ Telegram/SourceFiles/core/launcher.cpp -@@ -14,6 +14,8 @@ https://github.com/telegramdesktop/tdesk - #include "core/update_checker.h" +@@ -15,6 +15,8 @@ https://github.com/telegramdesktop/tdesk + #include "base/concurrent_timer.h" #include "application.h" +#include "FREEBSD_QT_PLUGINDIR.h" @@ -9,7 +9,7 @@ namespace Core { std::unique_ptr<Launcher> Launcher::Create(int argc, char *argv[]) { -@@ -38,9 +40,10 @@ void Launcher::init() { +@@ -39,9 +41,10 @@ void Launcher::init() { QCoreApplication::setApplicationName(qsl("TelegramDesktop")); @@ -22,7 +22,7 @@ initHook(); } -@@ -58,6 +61,11 @@ int Launcher::exec() { +@@ -59,6 +62,11 @@ int Launcher::exec() { Logs::start(this); // must be started before Platform is started Platform::start(); // must be started before QApplication is created @@ -34,7 +34,7 @@ auto result = executeApplication(); DEBUG_LOG(("Telegram finished, result: %1").arg(result)); -@@ -139,6 +147,9 @@ void Launcher::prepareSettings() { +@@ -140,6 +148,9 @@ void Launcher::prepareSettings() { case dbipLinux32: gPlatformString = qsl("Linux32bit"); break; 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 Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h Tue Oct 9 02:01:19 2018 (r481593) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/core/utils.h.orig 2018-08-04 18:53:40 UTC +--- Telegram/SourceFiles/core/utils.h.orig 2018-09-28 13:08:38 UTC +++ Telegram/SourceFiles/core/utils.h -@@ -433,6 +433,7 @@ enum DBIPlatform { +@@ -411,6 +411,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 Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp Tue Oct 9 02:01:19 2018 (r481593) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/data/data_document.cpp.orig 2018-08-04 18:53:40 UTC +--- Telegram/SourceFiles/data/data_document.cpp.orig 2018-09-28 13:08:38 UTC +++ Telegram/SourceFiles/data/data_document.cpp -@@ -77,7 +77,7 @@ QString FileNameUnsafe( +@@ -78,7 +78,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 Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp Tue Oct 9 02:01:19 2018 (r481593) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/export/data/export_data_types.cpp.orig 2018-08-04 18:53:40 UTC +--- Telegram/SourceFiles/export/data/export_data_types.cpp.orig 2018-09-28 13:08:38 UTC +++ Telegram/SourceFiles/export/data/export_data_types.cpp -@@ -346,9 +346,9 @@ QString CleanDocumentName(QString name) +@@ -363,9 +363,9 @@ QString CleanDocumentName(QString name) '|', #elif defined Q_OS_MAC // Q_OS_WIN ':', Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp Tue Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp Tue Oct 9 02:01:19 2018 (r481593) @@ -1,15 +1,15 @@ ---- Telegram/SourceFiles/logs.cpp.orig 2018-08-04 18:53:40 UTC +--- Telegram/SourceFiles/logs.cpp.orig 2018-09-28 13:08:38 UTC +++ Telegram/SourceFiles/logs.cpp -@@ -333,7 +333,7 @@ void start(not_null<Core::Launcher*> lau - if (cBetaVersion()) { - SetDebugEnabled(true); +@@ -332,7 +332,7 @@ void start(not_null<Core::Launcher*> lau + + if (cAlphaVersion()) { workingDirChosen = true; -#if defined Q_OS_MAC || defined Q_OS_LINUX +#if defined Q_OS_MAC || defined Q_OS_LINUX || defined Q_OS_FREEBSD } else { #ifdef _DEBUG cForceWorkingDir(cExeDir()); -@@ -347,15 +347,15 @@ void start(not_null<Core::Launcher*> lau +@@ -346,15 +346,15 @@ void start(not_null<Core::Launcher*> lau #endif // !_DEBUG workingDirChosen = true; @@ -29,7 +29,7 @@ #ifdef _DEBUG cForceWorkingDir(cExeDir()); #else // _DEBUG -@@ -369,7 +369,7 @@ void start(not_null<Core::Launcher*> lau +@@ -368,7 +368,7 @@ void start(not_null<Core::Launcher*> lau cForceWorkingDir(cWorkingDir()); workingDirChosen = true; } Copied and modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_old__settings_settings__notifications__widget.cpp (from r481592, head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp) ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp Tue Oct 9 01:40:00 2018 (r481592, copy source) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_old__settings_settings__notifications__widget.cpp Tue Oct 9 02:01:19 2018 (r481593) @@ -1,5 +1,5 @@ ---- Telegram/SourceFiles/settings/settings_notifications_widget.cpp.orig 2018-08-04 18:53:40 UTC -+++ Telegram/SourceFiles/settings/settings_notifications_widget.cpp +--- Telegram/SourceFiles/old_settings/settings_notifications_widget.cpp.orig 2018-09-28 13:08:38 UTC ++++ Telegram/SourceFiles/old_settings/settings_notifications_widget.cpp @@ -69,9 +69,9 @@ void NotificationsWidget::createNotifica if (Platform::Notifications::Supported()) { #ifdef Q_OS_WIN Added: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_storage_storage__encrypted__file__tests.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_storage_storage__encrypted__file__tests.cpp Tue Oct 9 02:01:19 2018 (r481593) @@ -0,0 +1,11 @@ +--- Telegram/SourceFiles/storage/storage_encrypted_file_tests.cpp.orig 2018-09-28 13:08:38 UTC ++++ Telegram/SourceFiles/storage/storage_encrypted_file_tests.cpp +@@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesk + #include <thread> + #ifdef Q_OS_MAC + #include <mach-o/dyld.h> +-#elif defined Q_OS_LINUX // Q_OS_MAC ++#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_MAC + #include <unistd.h> + #endif // Q_OS_MAC || Q_OS_LINUX + Added: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_MediaStreamItf.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_MediaStreamItf.cpp Tue Oct 9 02:01:19 2018 (r481593) @@ -0,0 +1,11 @@ +--- Telegram/ThirdParty/libtgvoip/MediaStreamItf.cpp.orig 2018-09-18 16:52:01 UTC ++++ Telegram/ThirdParty/libtgvoip/MediaStreamItf.cpp +@@ -22,7 +22,7 @@ void MediaStreamItf::SetCallback(size_t + size_t MediaStreamItf::InvokeCallback(unsigned char *data, size_t length){ + if(callback) + return (*callback)(data, length, callbackParam); +- return NULL; ++ return 0; + } + + AudioMixer::AudioMixer() : bufferPool(960*2, 16), processedQueue(16), semaphore(16, 0){ 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 Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp Tue Oct 9 02:01:19 2018 (r481593) @@ -1,6 +1,6 @@ ---- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2018-07-17 16:48:21 UTC +--- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2018-09-18 16:52:01 UTC +++ Telegram/ThirdParty/libtgvoip/VoIPController.cpp -@@ -2048,7 +2048,7 @@ static void initMachTimestart() { +@@ -2056,7 +2056,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 Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioIO.cpp Tue Oct 9 02:01:19 2018 (r481593) @@ -1,6 +1,6 @@ ---- Telegram/ThirdParty/libtgvoip/audio/AudioIO.cpp.orig 2018-07-17 16:48:21 UTC +--- Telegram/ThirdParty/libtgvoip/audio/AudioIO.cpp.orig 2018-09-18 16:52:01 UTC +++ Telegram/ThirdParty/libtgvoip/audio/AudioIO.cpp -@@ -29,7 +29,7 @@ +@@ -31,7 +31,7 @@ #endif #include "../os/windows/AudioInputWASAPI.h" #include "../os/windows/AudioOutputWASAPI.h" @@ -9,7 +9,7 @@ #ifndef WITHOUT_ALSA #include "../os/linux/AudioInputALSA.h" #include "../os/linux/AudioOutputALSA.h" -@@ -62,7 +62,7 @@ shared_ptr<AudioIO> AudioIO::Create(){ +@@ -66,7 +66,7 @@ shared_ptr<AudioIO> AudioIO::Create(){ return std::make_shared<ContextlessAudioIO<AudioInputWave, AudioOutputWave>>(inputDevice, outputDevice); #endif return std::make_shared<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 Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp Tue Oct 9 02:01:19 2018 (r481593) @@ -1,6 +1,6 @@ ---- Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp.orig 2018-07-17 16:48:21 UTC +--- Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp.orig 2018-09-18 16:52:01 UTC +++ Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp -@@ -24,7 +24,7 @@ +@@ -26,7 +26,7 @@ #include "../os/windows/AudioInputWave.h" #endif #include "../os/windows/AudioInputWASAPI.h" @@ -9,7 +9,7 @@ #ifndef WITHOUT_ALSA #include "../os/linux/AudioInputALSA.h" #endif -@@ -68,7 +68,7 @@ void AudioInput::EnumerateDevices(std::v +@@ -72,7 +72,7 @@ void AudioInput::EnumerateDevices(std::v } #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 Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp Tue Oct 9 02:01:19 2018 (r481593) @@ -1,6 +1,6 @@ ---- Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp.orig 2018-07-17 16:48:21 UTC +--- Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp.orig 2018-09-18 16:52:01 UTC +++ Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp -@@ -27,7 +27,7 @@ +@@ -29,7 +29,7 @@ #include "../os/windows/AudioOutputWave.h" #endif #include "../os/windows/AudioOutputWASAPI.h" @@ -9,7 +9,7 @@ #ifndef WITHOUT_ALSA #include "../os/linux/AudioOutputALSA.h" #endif -@@ -79,7 +79,7 @@ void AudioOutput::EnumerateDevices(std:: +@@ -83,7 +83,7 @@ void AudioOutput::EnumerateDevices(std:: } #endif AudioOutputWASAPI::EnumerateDevices(devs); 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 Oct 9 01:40:00 2018 (r481592) +++ head/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt Tue Oct 9 02:01:19 2018 (r481593) @@ -1,6 +1,6 @@ ---- Telegram/gyp/telegram_sources.txt.orig 2018-08-04 18:53:40 UTC +--- Telegram/gyp/telegram_sources.txt.orig 2018-09-28 13:08:38 UTC +++ Telegram/gyp/telegram_sources.txt -@@ -801,14 +801,7 @@ +@@ -755,14 +755,7 @@ <(emoji_suggestions_loc)/emoji_suggestions.cpp <(emoji_suggestions_loc)/emoji_suggestions.h @@ -14,5 +14,5 @@ -<(minizip_loc)/unzip.h +<(src_loc)/qt_functions.cpp - platforms: mac - <(sp_media_key_tap_loc)/SPMediaKeyTap.m + platforms: win + <(res_loc)/winrc/Telegram.rc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810090201.w9921JNh029412>