Attachment 197900 Details for Bug 232061 – patch for 1.4.0

[patch] patch for 1.4.0

telegram-desktop-1.4.0.patch (text/plain), 27.01 KB, created by Henry Hu on 2018-10-08 02:25:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Henry Hu

Created: 2018-10-08 02:25:30 UTC

Size: 27.01 KB

patch

obsolete

>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/distinfo ./distinfo
>--- /usr/ports/net-im/telegram-desktop/distinfo	2018-09-02 19:00:16.258741000 -0400
>+++ ./distinfo	2018-10-07 17:45:03.672428000 -0400
>@@ -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
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/CMakeLists.inj ./files/CMakeLists.inj
>--- /usr/ports/net-im/telegram-desktop/files/CMakeLists.inj	2018-08-25 16:34:53.425366000 -0400
>+++ ./files/CMakeLists.inj	2018-10-07 18:09:19.160130000 -0400
>@@ -9,7 +9,9 @@
> # 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 --------------
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/gyp-patches ./files/gyp-patches
>--- /usr/ports/net-im/telegram-desktop/files/gyp-patches	2018-09-02 19:00:16.490704000 -0400
>+++ ./files/gyp-patches	2018-10-07 19:26:55.886605000 -0400
>@@ -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 @@
>              },
>            ],
>            [
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt ./files/patch-Telegram_gyp_telegram__sources.txt
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt	2018-09-02 19:00:16.246848000 -0400
>+++ ./files/patch-Telegram_gyp_telegram__sources.txt	2018-10-07 19:26:55.855652000 -0400
>@@ -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
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h ./files/patch-Telegram_SourceFiles_base_bytes.h
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h	2018-09-02 19:00:16.285674000 -0400
>+++ ./files/patch-Telegram_SourceFiles_base_bytes.h	2018-10-07 19:26:55.797909000 -0400
>@@ -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);
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp ./files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp	2018-08-25 16:34:53.519782000 -0400
>+++ ./files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp	1969-12-31 19:00:00.000000000 -0500
>@@ -1,17 +0,0 @@
>---- Telegram/SourceFiles/boxes/notifications_box.cpp.orig	2018-08-04 18:53:40 UTC
>-+++ Telegram/SourceFiles/boxes/notifications_box.cpp
>-@@ -84,11 +84,11 @@ private:
>- 		_deleted = true;
>- 
>- 		// Ubuntu has a lag if deleteLater() called immediately.
>--#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64
>-+#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 || defined Q_OS_FREEBSD
>- 		QTimer::singleShot(1000, [this] { delete this; });
>--#else // Q_OS_LINUX32 || Q_OS_LINUX64
>-+#else // Q_OS_LINUX32 || Q_OS_LINUX64 || defined Q_OS_FREEBSD
>- 		deleteLater();
>--#endif // Q_OS_LINUX32 || Q_OS_LINUX64
>-+#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || defined Q_OS_FREEBSD
>- 	}
>- 
>- 	NotificationsBox *_owner;
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp ./files/patch-Telegram_SourceFiles_core_launcher.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp	2018-08-25 16:34:53.451976000 -0400
>+++ ./files/patch-Telegram_SourceFiles_core_launcher.cpp	2018-10-07 19:26:55.798927000 -0400
>@@ -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;
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h ./files/patch-Telegram_SourceFiles_core_utils.h
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h	2018-08-25 16:34:53.490768000 -0400
>+++ ./files/patch-Telegram_SourceFiles_core_utils.h	2018-10-07 19:26:55.800986000 -0400
>@@ -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,
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp ./files/patch-Telegram_SourceFiles_data_data__document.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp	2018-08-25 16:34:53.519974000 -0400
>+++ ./files/patch-Telegram_SourceFiles_data_data__document.cpp	2018-10-07 19:26:55.801994000 -0400
>@@ -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("_"));
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp ./files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp	2018-09-02 19:00:16.246266000 -0400
>+++ ./files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp	2018-10-07 19:26:55.803020000 -0400
>@@ -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
>  		':',
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp ./files/patch-Telegram_SourceFiles_logs.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp	2018-08-25 16:34:53.451400000 -0400
>+++ ./files/patch-Telegram_SourceFiles_logs.cpp	2018-10-07 19:26:55.808143000 -0400
>@@ -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;
>  		}
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_old__settings_settings__notifications__widget.cpp ./files/patch-Telegram_SourceFiles_old__settings_settings__notifications__widget.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_old__settings_settings__notifications__widget.cpp	1969-12-31 19:00:00.000000000 -0500
>+++ ./files/patch-Telegram_SourceFiles_old__settings_settings__notifications__widget.cpp	2018-10-07 19:26:55.809201000 -0400
>@@ -0,0 +1,14 @@
>+--- 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
>+ 		nativeNotificationsLabel = lang(lng_settings_use_windows);
>+-#elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 // Q_OS_WIN
>++#elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 || defined Q_OS_FREEBSD // Q_OS_WIN
>+ 		nativeNotificationsLabel = lang(lng_settings_use_native_notifications);
>+-#endif // Q_OS_WIN || Q_OS_LINUX64 || Q_OS_LINUX32
>++#endif // Q_OS_WIN || Q_OS_LINUX64 || Q_OS_LINUX32 || Q_OS_FREEBSD
>+ 	}
>+ 	if (!nativeNotificationsLabel.isEmpty()) {
>+ 		createChildRow(_nativeNotifications, margin, nativeNotificationsLabel, [this](bool) { onNativeNotifications(); }, Global::NativeNotifications());
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp ./files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp	2018-08-25 16:34:53.520924000 -0400
>+++ ./files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp	1969-12-31 19:00:00.000000000 -0500
>@@ -1,14 +0,0 @@
>---- Telegram/SourceFiles/settings/settings_notifications_widget.cpp.orig	2018-08-04 18:53:40 UTC
>-+++ Telegram/SourceFiles/settings/settings_notifications_widget.cpp
>-@@ -69,9 +69,9 @@ void NotificationsWidget::createNotifica
>- 	if (Platform::Notifications::Supported()) {
>- #ifdef Q_OS_WIN
>- 		nativeNotificationsLabel = lang(lng_settings_use_windows);
>--#elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 // Q_OS_WIN
>-+#elif defined Q_OS_LINUX64 || defined Q_OS_LINUX32 || defined Q_OS_FREEBSD // Q_OS_WIN
>- 		nativeNotificationsLabel = lang(lng_settings_use_native_notifications);
>--#endif // Q_OS_WIN || Q_OS_LINUX64 || Q_OS_LINUX32
>-+#endif // Q_OS_WIN || Q_OS_LINUX64 || Q_OS_LINUX32 || Q_OS_FREEBSD
>- 	}
>- 	if (!nativeNotificationsLabel.isEmpty()) {
>- 		createChildRow(_nativeNotifications, margin, nativeNotificationsLabel, [this](bool) { onNativeNotifications(); }, Global::NativeNotifications());
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_storage_storage__encrypted__file__tests.cpp ./files/patch-Telegram_SourceFiles_storage_storage__encrypted__file__tests.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_storage_storage__encrypted__file__tests.cpp	1969-12-31 19:00:00.000000000 -0500
>+++ ./files/patch-Telegram_SourceFiles_storage_storage__encrypted__file__tests.cpp	2018-10-07 19:26:55.823990000 -0400
>@@ -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
>+ 
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp ./files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp	2018-09-02 19:00:16.286581000 -0400
>+++ ./files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp	2018-10-07 19:26:55.833241000 -0400
>@@ -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);
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioIO.cpp ./files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioIO.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioIO.cpp	2018-08-25 16:34:53.492109000 -0400
>+++ ./files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioIO.cpp	2018-10-07 19:26:55.832215000 -0400
>@@ -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);
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp ./files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp	2018-09-02 19:00:16.246569000 -0400
>+++ ./files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp	2018-10-07 19:26:55.834253000 -0400
>@@ -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);
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_MediaStreamItf.cpp ./files/patch-Telegram_ThirdParty_libtgvoip_MediaStreamItf.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_MediaStreamItf.cpp	1969-12-31 19:00:00.000000000 -0500
>+++ ./files/patch-Telegram_ThirdParty_libtgvoip_MediaStreamItf.cpp	2018-10-07 19:26:55.830188000 -0400
>@@ -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){
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp ./files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp
>--- /usr/ports/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp	2018-09-02 19:00:16.490917000 -0400
>+++ ./files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp	2018-10-07 19:26:55.831203000 -0400
>@@ -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(){
>diff -ruN -x work -x sync-patch.sh -x gen-patch.sh -x update.txt -x check-diff.py -x files.bak /usr/ports/net-im/telegram-desktop/Makefile ./Makefile
>--- /usr/ports/net-im/telegram-desktop/Makefile	2018-09-09 19:52:44.820162000 -0400
>+++ ./Makefile	2018-10-07 17:35:03.095840000 -0400
>@@ -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
>@@ -29,8 +29,9 @@
> 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

Flags:

henry.hu.sh: maintainer-approval+

Actions: View | Diff

Attachments on bug 232061: 197900 | 197901