From owner-svn-ports-all@freebsd.org Wed Aug 22 16:09:52 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 832B4108D1D1; Wed, 22 Aug 2018 16:09:52 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 388817BC24; Wed, 22 Aug 2018 16:09:52 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1955115404; Wed, 22 Aug 2018 16:09:52 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7MG9pHt054987; Wed, 22 Aug 2018 16:09:51 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7MG9hSN054939; Wed, 22 Aug 2018 16:09:43 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201808221609.w7MG9hSN054939@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Wed, 22 Aug 2018 16:09:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477796 - in head/net-im/telegram-desktop: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/net-im/telegram-desktop: . files X-SVN-Commit-Revision: 477796 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Aug 2018 16:09:53 -0000 Author: swills Date: Wed Aug 22 16:09:42 2018 New Revision: 477796 URL: https://svnweb.freebsd.org/changeset/ports/477796 Log: net-im/telegram-desktop: update to 1.3.12 PR: 230398 Submitted by: Henry Hu (maintainer) Added: 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_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_window_main__window.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_os_linux_AudioPulse.cpp (contents, props changed) Deleted: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_lambda.h head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_config.h head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.h head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioInputPulse.cpp head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputPulse.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_Resources_qrc_telegram__linux.qrc (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles___other_packer.cpp (contents, props changed) 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_boxes_notifications__box.cpp (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_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_layout.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__audio.h (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__launcher.h (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__main__window.h (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h (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__functions.cpp (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.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.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_ThirdParty_libtgvoip_VoIPController.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_linux_AudioInputALSA.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioOutputALSA.cpp (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_PulseAudioLoader.h (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_ThirdParty_libtgvoip_threading.h (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_webrtc__dsp_webrtc_base_stringutils.h (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_common.gypi (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_gyp_settings__linux.gypi (contents, props changed) head/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt (contents, props changed) head/net-im/telegram-desktop/files/patch-lib_xdg_tg.protocol (contents, props changed) Modified: head/net-im/telegram-desktop/Makefile ============================================================================== --- head/net-im/telegram-desktop/Makefile Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/Makefile Wed Aug 22 16:09:42 2018 (r477796) @@ -2,8 +2,7 @@ PORTNAME= telegram-desktop DISTVERSIONPREFIX= v -DISTVERSION= 1.2.17 -PORTREVISION= 1 +DISTVERSION= 1.3.12 CATEGORIES= net-im MAINTAINER= henry.hu.sh@gmail.com @@ -29,12 +28,13 @@ GH_ACCOUNT= telegramdesktop GH_PROJECT= tdesktop GH_TUPLE= catchorg:Catch2:5ca44b68:catch/Telegram/ThirdParty/Catch \ mapbox:variant:550ac2f:variant/Telegram/ThirdParty/variant \ - Microsoft:GSL:9d65e74:gsl/Telegram/ThirdParty/GSL \ - telegramdesktop:libtgvoip:6e0e102:libtgvoip/Telegram/ThirdParty/libtgvoip \ - telegramdesktop:crl:344cbde9:crl/Telegram/ThirdParty/crl -USE_GNOME= glib20 gtk30 + Microsoft:GSL:d846fe5:gsl/Telegram/ThirdParty/GSL \ + telegramdesktop:libtgvoip:5380aab:libtgvoip/Telegram/ThirdParty/libtgvoip \ + telegramdesktop:crl:527ad27:crl/Telegram/ThirdParty/crl +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 @@ -45,12 +45,22 @@ GYP_DEFINES= TDESKTOP_DISABLE_CRASH_REPORTS,TDESKTOP_D # If both of them are not installed, then voice calls do not work, but other functionalities still work. OPTIONS_MULTI= AUDIO OPTIONS_MULTI_AUDIO= ALSA PULSEAUDIO +OPTIONS_DEFINE= GTK OPTIONS_DEFAULT= ALSA AUDIO_DESC= Audio backend for voice calls +GTK_DESC= Gtk integration (Use Gtk dialogs, etc.) ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio + +.include + +.if ${PORT_OPTIONS:MGTK} +USE_GNOME+= gtk30 +.else +GYP_DEFINES:= ${GYP_DEFINES},TDESKTOP_DISABLE_GTK_INTEGRATION +.endif .include Modified: head/net-im/telegram-desktop/distinfo ============================================================================== --- head/net-im/telegram-desktop/distinfo Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/distinfo Wed Aug 22 16:09:42 2018 (r477796) @@ -1,13 +1,13 @@ -TIMESTAMP = 1523832839 -SHA256 (telegramdesktop-tdesktop-v1.2.17_GH0.tar.gz) = 775614e70372b2e18ef1b2940fa043599240975597e4c5e4431c6deb041a613d -SIZE (telegramdesktop-tdesktop-v1.2.17_GH0.tar.gz) = 16916625 +TIMESTAMP = 1533439370 +SHA256 (telegramdesktop-tdesktop-v1.3.12_GH0.tar.gz) = 4d19fdc85f0c792c6c073062dacf707fc976581a8d249fa91757015cceb7662b +SIZE (telegramdesktop-tdesktop-v1.3.12_GH0.tar.gz) = 17180353 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-9d65e74_GH0.tar.gz) = c2270ade74bd74831e2e854970c04db77f00e0dfdb0a3c3bce356da6019dd18d -SIZE (Microsoft-GSL-9d65e74_GH0.tar.gz) = 57320 -SHA256 (telegramdesktop-libtgvoip-6e0e102_GH0.tar.gz) = 53f2d27f8bc76d454cd933fe0d598155d091967e9cb98b095cd44f2a70137220 -SIZE (telegramdesktop-libtgvoip-6e0e102_GH0.tar.gz) = 411964 -SHA256 (telegramdesktop-crl-344cbde9_GH0.tar.gz) = ec7d04bc36ed6dda88574e317e78d332b36cbd3378c3a8218ac5a3f37ee6d90f -SIZE (telegramdesktop-crl-344cbde9_GH0.tar.gz) = 18308 +SHA256 (Microsoft-GSL-d846fe5_GH0.tar.gz) = 4c463f93ca3b1dcb0b8d73b54309c1d31145761c457f1a6fd53554a6d469b468 +SIZE (Microsoft-GSL-d846fe5_GH0.tar.gz) = 58930 +SHA256 (telegramdesktop-libtgvoip-5380aab_GH0.tar.gz) = 6b3e49835a7705406a0161162a1ffb53be6d66b17a8faaca49e6df51a34ebe23 +SIZE (telegramdesktop-libtgvoip-5380aab_GH0.tar.gz) = 810123 +SHA256 (telegramdesktop-crl-527ad27_GH0.tar.gz) = 6ab03b09ea2f501f3602acfd06d6a5d174db6a25259268978323552a69b37622 +SIZE (telegramdesktop-crl-527ad27_GH0.tar.gz) = 20081 Modified: head/net-im/telegram-desktop/files/CMakeLists.inj ============================================================================== --- head/net-im/telegram-desktop/files/CMakeLists.inj Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/CMakeLists.inj Wed Aug 22 16:09:42 2018 (r477796) @@ -9,6 +9,7 @@ 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_export ../../Telegram/SourceFiles/export/export_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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/gyp-patches Wed Aug 22 16:09:42 2018 (r477796) @@ -1,15 +1,53 @@ ---- Telegram/gyp/qt_rcc.gypi.orig 2018-01-03 10:46:01 UTC -+++ Telegram/gyp/qt_rcc.gypi +--- Telegram/gyp/codegen_rules.gypi.orig 2018-08-04 18:53:40 UTC ++++ Telegram/gyp/codegen_rules.gypi @@ -15,7 +15,7 @@ - '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/qrc/qrc_<(RULE_INPUT_ROOT).cpp', + '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp', ], 'action': [ -- '<(qt_loc)/bin/rcc<(exe_ext)', -+ '%%QT_BINDIR%%/rcc', - '-name', '<(RULE_INPUT_ROOT)', - '-no-compress', - '<(RULE_INPUT_PATH)', ---- Telegram/gyp/qt_moc.gypi.orig 2018-01-03 10:46:01 UTC +- 'python', '<(DEPTH)/update_dependent.py', '--styles', ++ '%%PYTHON_CMD%%', '<(DEPTH)/update_dependent.py', '--styles', + '-I', '<(res_loc)', '-I', '<(src_loc)', + '-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp', + '<@(style_files)', +@@ -26,13 +26,13 @@ + 'inputs': [ + '<(DEPTH)/update_dependent.py', + '<@(qrc_files)', +- ' /dev/null --libs <@(pkgconfig_libs))', ], 'cflags_cc': [ -@@ -67,7 +59,6 @@ +@@ -71,7 +64,6 @@ 'ldflags': [ '-Wl,-wrap,aligned_alloc', '-Wl,-wrap,secure_getenv', @@ -259,29 +309,24 @@ '-Wl,--no-as-needed,-lrt', ], 'configurations': { -@@ -86,7 +77,7 @@ +@@ -79,13 +71,16 @@ + 'cflags_c': [ + '-Ofast', + '-fno-strict-aliasing', ++ %%CFLAGS%% + ], + 'cflags_cc': [ + '-Ofast', + '-fno-strict-aliasing', ++ %%CXXFLAGS%% + ], + 'ldflags': [ + '-Ofast', ++ %%LDFLAGS%% + ], }, }, - 'conditions': [ -- [ '" Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles___other_packer.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles___other_packer.cpp Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles___other_packer.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/_other/packer.cpp.orig 2018-02-06 05:52:28 UTC +--- Telegram/SourceFiles/_other/packer.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/_other/packer.cpp @@ -233,7 +233,7 @@ int main(int argc, char *argv[]) } 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_build__config.h Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/base/build_config.h.orig 2018-02-06 05:52:11 UTC +--- Telegram/SourceFiles/base/build_config.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/base/build_config.h @@ -13,7 +13,7 @@ https://github.com/telegramdesktop/tdesk Added: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h Wed Aug 22 16:09:42 2018 (r477796) @@ -0,0 +1,20 @@ +--- ./Telegram/SourceFiles/base/bytes.h.orig 2018-08-04 14:53:40 UTC ++++ ./Telegram/SourceFiles/base/bytes.h +@@ -114,7 +114,7 @@ template < + vector concatenate(Args &&...args) { + const auto size = details::spansLength(args...); + auto result = vector(size); +- details::spansAppend(make_span(result), args...); ++ details::spansAppend(bytes::make_span(result), args...); + return result; + } + +@@ -126,7 +126,7 @@ vector concatenate(SpanRange args) { + size += bytes::make_span(arg).size(); + } + auto result = vector(size); +- auto buffer = make_span(result); ++ auto buffer = bytes::make_span(result); + for (const auto &arg : args) { + const auto part = bytes::make_span(arg); + bytes::copy(buffer, part); Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_notifications__box.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/boxes/notifications_box.cpp.orig 2018-02-06 06:26:42 UTC +--- 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; 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_launcher.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,7 +1,7 @@ ---- Telegram/SourceFiles/core/launcher.cpp.orig 2018-01-03 10:46:01 UTC +--- Telegram/SourceFiles/core/launcher.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/core/launcher.cpp -@@ -13,6 +13,8 @@ https://github.com/telegramdesktop/tdesk - #include "core/main_queue_processor.h" +@@ -14,6 +14,8 @@ https://github.com/telegramdesktop/tdesk + #include "core/update_checker.h" #include "application.h" +#include "FREEBSD_QT_PLUGINDIR.h" @@ -9,7 +9,7 @@ namespace Core { std::unique_ptr Launcher::Create(int argc, char *argv[]) { -@@ -31,9 +33,10 @@ void Launcher::init() { +@@ -38,9 +40,10 @@ void Launcher::init() { QCoreApplication::setApplicationName(qsl("TelegramDesktop")); @@ -22,7 +22,7 @@ initHook(); } -@@ -51,6 +54,11 @@ int Launcher::exec() { +@@ -58,6 +61,11 @@ int Launcher::exec() { Logs::start(this); // must be started before Platform is started Platform::start(); // must be started before QApplication is created @@ -34,12 +34,11 @@ auto result = executeApplication(); DEBUG_LOG(("Telegram finished, result: %1").arg(result)); -@@ -136,6 +144,10 @@ void Launcher::prepareSettings() { - gUpdateURL = QUrl(qsl("http://tdesktop.com/linux32/tupdates/current")); +@@ -139,6 +147,9 @@ void Launcher::prepareSettings() { + case dbipLinux32: gPlatformString = qsl("Linux32bit"); break; + case dbipFreeBSD: -+ gUpdateURL = QUrl(qsl("")); + gPlatformString = qsl("FreeBSD"); + break; } Added: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_update__checker.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -0,0 +1,22 @@ +--- Telegram/SourceFiles/core/update_checker.cpp.orig 2018-08-04 18:53:40 UTC ++++ Telegram/SourceFiles/core/update_checker.cpp +@@ -2016,6 +2016,9 @@ int UpdateChecker::size() const { + //} + + bool checkReadyUpdate() { ++#ifdef Q_OS_FREEBSD ++ return false; ++#endif + 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() { + #elif defined Q_OS_LINUX // Q_OS_MAC + QString curUpdater = (cExeDir() + qsl("Updater")); + QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater")); ++#elif defined Q_OS_FREEBSD ++ QString curUpdater; ++ QFileInfo updater; + #endif // Q_OS_LINUX + if (!updater.exists()) { + QFileInfo current(curUpdater); 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_core_utils.h Wed Aug 22 16:09:42 2018 (r477796) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/core/utils.h.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/core/utils.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/core/utils.h -@@ -451,6 +451,7 @@ enum DBIPlatform { +@@ -433,6 +433,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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_data_data__document.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/data/data_document.cpp.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/data/data_document.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/data/data_document.cpp -@@ -76,7 +76,7 @@ QString FileNameUnsafe( +@@ -77,7 +77,7 @@ QString FileNameUnsafe( name = name.replace(QRegularExpression(qsl("[\\\\\\/\\:\\*\\?\\\"\\<\\>\\|]")), qsl("_")); #elif defined Q_OS_MAC name = name.replace(QRegularExpression(qsl("[\\:]")), qsl("_")); Added: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -0,0 +1,14 @@ +--- Telegram/SourceFiles/export/data/export_data_types.cpp.orig 2018-08-04 18:53:40 UTC ++++ Telegram/SourceFiles/export/data/export_data_types.cpp +@@ -344,9 +344,9 @@ QString CleanDocumentName(QString name) + '|', + #elif defined Q_OS_MAC // Q_OS_WIN + ':', +-#elif defined Q_OS_LINUX // Q_OS_WIN || Q_OS_MAC ++#elif defined Q_OS_LINUX || defined Q_OS_FREEBSD // Q_OS_WIN || Q_OS_MAC + '/', +-#endif // Q_OS_WIN || Q_OS_MAC || Q_OS_LINUX ++#endif // Q_OS_WIN || Q_OS_MAC || Q_OS_LINUX || Q_OS_FREEBSD + }; + for (const auto ch : controls) { + name = std::move(name).replace(ch, '_'); 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp -@@ -1388,13 +1388,13 @@ void InnerWidget::mouseActionFinish(cons +@@ -1389,13 +1389,13 @@ void InnerWidget::mouseActionFinish(cons _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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_history__inner__widget.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/history/history_inner_widget.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/history/history_inner_widget.cpp -@@ -1336,7 +1336,7 @@ void HistoryInner::mouseActionFinish( +@@ -1344,7 +1344,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()) { -@@ -1345,7 +1345,7 @@ void HistoryInner::mouseActionFinish( +@@ -1353,7 +1353,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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_view_history__view__list__widget.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2018-04-15 23:31:46 UTC +--- Telegram/SourceFiles/history/view/history_view_list_widget.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/history/view/history_view_list_widget.cpp -@@ -2014,7 +2014,7 @@ void ListWidget::mouseActionFinish( +@@ -2017,7 +2017,7 @@ void ListWidget::mouseActionFinish( _mouseSelectType = TextSelectType::Letters; //_widget->noSelectingScroll(); // #TODO select scroll @@ -9,3 +9,12 @@ if (_selectedTextItem && _selectedTextRange.from != _selectedTextRange.to) { if (const auto view = viewForItem(_selectedTextItem)) { +@@ -2026,7 +2026,7 @@ void ListWidget::mouseActionFinish( + QClipboard::Selection); + } + } +-#endif // Q_OS_LINUX32 || Q_OS_LINUX64 ++#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || Q_OS_FREEBSD + } + + void ListWidget::mouseActionUpdate() { Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_layout.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_layout.cpp Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_layout.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/layout.cpp.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/layout.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/layout.cpp @@ -206,16 +206,16 @@ bool documentIsExecutableName(const QStr *result = qsl("\ Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,22 +1,23 @@ ---- Telegram/SourceFiles/logs.cpp.orig 2018-02-06 05:51:11 UTC +--- Telegram/SourceFiles/logs.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/logs.cpp -@@ -321,7 +321,7 @@ void start(not_null lau +@@ -333,7 +333,7 @@ void start(not_null lau if (cBetaVersion()) { - cSetDebug(true); + SetDebugEnabled(true); 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()); -@@ -335,15 +335,15 @@ void start(not_null lau +@@ -347,15 +347,15 @@ void start(not_null lau #endif // !_DEBUG workingDirChosen = true; -#if defined Q_OS_LINUX && !defined _DEBUG // fix first version +#if (defined Q_OS_LINUX || defined Q_OS_FREEBSD) && !defined _DEBUG // fix first version moveOldDataFrom = initialWorkingDir; - #endif // Q_OS_LINUX && !_DEBUG +-#endif // Q_OS_LINUX && !_DEBUG ++#endif // (Q_OS_LINUX || Q_OS_FREEBSD) && !_DEBUG -#elif defined Q_OS_WINRT // Q_OS_MAC || Q_OS_LINUX +#elif defined Q_OS_WINRT // Q_OS_MAC || Q_OS_LINUX || Q_OS_FREEBSD @@ -28,7 +29,7 @@ #ifdef _DEBUG cForceWorkingDir(cExeDir()); #else // _DEBUG -@@ -357,7 +357,7 @@ void start(not_null lau +@@ -369,7 +369,7 @@ void start(not_null lau cForceWorkingDir(cWorkingDir()); 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2018-02-06 05:57:25 UTC +--- Telegram/SourceFiles/platform/linux/linux_libs.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/linux/linux_libs.cpp @@ -121,6 +121,7 @@ bool setupGtkBase(QLibrary &lib_gtk) { return true; 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_linux__libs.h Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/linux/linux_libs.h.orig 2018-02-06 05:56:56 UTC +--- Telegram/SourceFiles/platform/linux/linux_libs.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/linux/linux_libs.h @@ -10,14 +10,16 @@ https://github.com/telegramdesktop/tdesk #ifndef TDESKTOP_DISABLE_GTK_INTEGRATION 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_main__window__linux.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/platform/linux/main_window_linux.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/linux/main_window_linux.cpp @@ -25,7 +25,9 @@ bool noQtTrayIcon = false, tryAppIndicat bool useGtkBase = false, useAppIndicator = false, useStatusIcon = false, trayIconChecked = false, useUnityCount = false; Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__audio.h ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__audio.h Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__audio.h Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/platform_audio.h.orig 2018-02-06 05:55:32 UTC +--- Telegram/SourceFiles/platform/platform_audio.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/platform_audio.h @@ -19,7 +19,7 @@ void DeInit(); Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__file__utilities.h Wed Aug 22 16:09:42 2018 (r477796) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/platform_file_utilities.h.orig 2018-02-06 05:55:41 UTC +--- Telegram/SourceFiles/platform/platform_file_utilities.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/platform_file_utilities.h -@@ -38,8 +38,8 @@ bool Get(QStringList &files, QByteArray +@@ -45,8 +45,8 @@ bool Get( #ifdef Q_OS_MAC #include "platform/mac/file_utilities_mac.h" Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__launcher.h ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__launcher.h Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__launcher.h Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/platform_launcher.h.orig 2018-02-07 00:52:41 UTC +--- Telegram/SourceFiles/platform/platform_launcher.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/platform_launcher.h @@ -23,8 +23,8 @@ namespace Platform { Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__main__window.h ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__main__window.h Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__main__window.h Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/platform_main_window.h.orig 2018-02-06 05:55:51 UTC +--- Telegram/SourceFiles/platform/platform_main_window.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/platform_main_window.h @@ -19,8 +19,8 @@ class MainWindow; Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__notifications__manager.h Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/platform_notifications_manager.h.orig 2018-02-06 05:55:59 UTC +--- Telegram/SourceFiles/platform/platform_notifications_manager.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/platform_notifications_manager.h @@ -26,8 +26,8 @@ void FlashBounce(); 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__specific.h Wed Aug 22 16:09:42 2018 (r477796) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/platform/platform_specific.h.orig 2018-02-06 05:56:11 UTC +--- Telegram/SourceFiles/platform/platform_specific.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/platform_specific.h -@@ -32,8 +32,8 @@ void finish(); +@@ -34,8 +34,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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_platform__window__title.h Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/platform/platform_window_title.h.orig 2018-02-06 05:56:19 UTC +--- Telegram/SourceFiles/platform/platform_window_title.h.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/platform/platform_window_title.h @@ -25,7 +25,7 @@ void PreviewWindowFramePaint(QImage &pre #include "platform/mac/window_title_mac.h" 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__functions.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/qt_functions.cpp.orig 2018-02-06 05:16:48 UTC +--- Telegram/SourceFiles/qt_functions.cpp.orig 2018-08-05 22:39:05 UTC +++ Telegram/SourceFiles/qt_functions.cpp @@ -0,0 +1,94 @@ +/**************************************************************************** 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_qt__static__plugins.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/qt_static_plugins.cpp.orig 2018-01-03 10:46:01 UTC +--- Telegram/SourceFiles/qt_static_plugins.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/qt_static_plugins.cpp @@ -14,14 +14,5 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugi Q_IMPORT_PLUGIN(QWebpPlugin) Modified: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp ============================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/settings.cpp.orig 2018-02-06 06:26:16 UTC +--- Telegram/SourceFiles/settings.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/settings.cpp -@@ -83,6 +83,8 @@ DBIPlatform gPlatform = dbipMac; +@@ -81,6 +81,8 @@ DBIPlatform gPlatform = dbipMac; DBIPlatform gPlatform = dbipLinux64; #elif defined Q_OS_LINUX32 DBIPlatform gPlatform = dbipLinux32; Modified: 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings__notifications__widget.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/settings/settings_notifications_widget.cpp.orig 2018-02-06 06:27:16 UTC +--- 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()) { 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/text/text.cpp.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/ui/text/text.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/ui/text/text.cpp -@@ -1748,11 +1748,11 @@ private: +@@ -1750,11 +1750,11 @@ 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_text_text__block.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ ---- Telegram/SourceFiles/ui/text/text_block.cpp.orig 2018-04-08 17:34:33 UTC +--- Telegram/SourceFiles/ui/text/text_block.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/ui/text/text_block.cpp @@ -332,6 +332,9 @@ TextBlock::TextBlock(const style::font & 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_twidget.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/twidget.cpp.orig 2018-01-03 10:46:01 UTC +--- Telegram/SourceFiles/ui/twidget.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/ui/twidget.cpp -@@ -235,9 +235,9 @@ void sendSynteticMouseEvent(QWidget *wid +@@ -233,9 +233,9 @@ void sendSynteticMouseEvent(QWidget *wid , 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_ui_widgets_labels.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,6 +1,6 @@ ---- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2018-02-06 06:28:03 UTC +--- Telegram/SourceFiles/ui/widgets/labels.cpp.orig 2018-08-04 18:53:40 UTC +++ Telegram/SourceFiles/ui/widgets/labels.cpp -@@ -359,11 +359,11 @@ Text::StateResult FlatLabel::dragActionF +@@ -364,11 +364,11 @@ Text::StateResult FlatLabel::dragActionF } } Added: head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_main__window.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -0,0 +1,20 @@ +--- Telegram/SourceFiles/window/main_window.cpp.orig 2018-08-04 18:53:40 UTC ++++ Telegram/SourceFiles/window/main_window.cpp +@@ -421,7 +421,7 @@ bool MainWindow::minimizeToTray() { + } + + void MainWindow::reActivateWindow() { +-#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 ++#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64 || defined Q_OS_FREEBSD + const auto reActivate = [=] { + if (const auto w = App::wnd()) { + if (auto f = QApplication::focusWidget()) { +@@ -436,7 +436,7 @@ void MainWindow::reActivateWindow() { + }; + crl::on_main(this, reActivate); + App::CallDelayed(200, this, reActivate); +-#endif // Q_OS_LINUX32 || Q_OS_LINUX64 ++#endif // Q_OS_LINUX32 || Q_OS_LINUX64 || Q_OS_FREEBSD + } + + void MainWindow::showRightColumn(object_ptr widget) { 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,6 +1,6 @@ ---- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2018-02-07 04:45:28 UTC +--- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig 2018-07-17 16:48:21 UTC +++ Telegram/ThirdParty/libtgvoip/VoIPController.cpp -@@ -1954,7 +1954,7 @@ static void initMachTimestart() { +@@ -2046,7 +2046,7 @@ static void initMachTimestart() { #endif double VoIPController::GetCurrentTime(){ Added: head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioIO.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioIO.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -0,0 +1,20 @@ +--- Telegram/ThirdParty/libtgvoip/audio/AudioIO.cpp.orig 2018-07-17 16:48:21 UTC ++++ Telegram/ThirdParty/libtgvoip/audio/AudioIO.cpp +@@ -29,7 +29,7 @@ + #endif + #include "../os/windows/AudioInputWASAPI.h" + #include "../os/windows/AudioOutputWASAPI.h" +-#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) ++#elif defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) + #ifndef WITHOUT_ALSA + #include "../os/linux/AudioInputALSA.h" + #include "../os/linux/AudioOutputALSA.h" +@@ -62,7 +62,7 @@ shared_ptr AudioIO::Create(){ + return std::make_shared>(inputDevice, outputDevice); + #endif + return std::make_shared>(inputDevice, outputDevice); +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__FreeBSD__) + #ifndef WITHOUT_ALSA + #ifndef WITHOUT_PULSE + if(AudioPulse::Load()){ 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,15 +1,15 @@ ---- Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp.orig 2017-12-27 18:47:58 UTC +--- Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp.orig 2018-07-17 16:48:21 UTC +++ Telegram/ThirdParty/libtgvoip/audio/AudioInput.cpp -@@ -19,7 +19,7 @@ +@@ -24,7 +24,7 @@ #include "../os/windows/AudioInputWave.h" #endif #include "../os/windows/AudioInputWASAPI.h" --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD__) +-#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) ++#elif defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) + #ifndef WITHOUT_ALSA #include "../os/linux/AudioInputALSA.h" - #include "../os/linux/AudioInputPulse.h" - #else -@@ -54,7 +54,7 @@ AudioInput *AudioInput::Create(std::stri + #endif +@@ -63,7 +63,7 @@ AudioInput::AudioInput(std::string devic return new AudioInputWave(deviceID); #endif return new AudioInputWASAPI(deviceID); @@ -18,12 +18,12 @@ if(AudioInputPulse::IsAvailable()){ AudioInputPulse* aip=new AudioInputPulse(deviceID); if(!aip->IsInitialized()) -@@ -87,7 +87,7 @@ void AudioInput::EnumerateDevices(std::v +@@ -96,7 +96,7 @@ void AudioInput::EnumerateDevices(std::v } #endif AudioInputWASAPI::EnumerateDevices(devs); -#elif defined(__linux__) && !defined(__ANDROID__) +#elif (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) - if(!AudioInputPulse::IsAvailable() || !AudioInputPulse::EnumerateDevices(devs)) + #if !defined(WITHOUT_PULSE) && !defined(WITHOUT_ALSA) + if(!AudioInputPulse::EnumerateDevices(devs)) AudioInputALSA::EnumerateDevices(devs); - #endif 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,29 +1,29 @@ ---- Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp.orig 2017-12-27 18:47:58 UTC +--- Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp.orig 2018-07-17 16:48:21 UTC +++ Telegram/ThirdParty/libtgvoip/audio/AudioOutput.cpp -@@ -20,7 +20,7 @@ +@@ -27,7 +27,7 @@ #include "../os/windows/AudioOutputWave.h" #endif #include "../os/windows/AudioOutputWASAPI.h" --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD__) +-#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) ++#elif defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) + #ifndef WITHOUT_ALSA #include "../os/linux/AudioOutputALSA.h" - #include "../os/linux/AudioOutputPulse.h" - #else -@@ -52,7 +52,7 @@ AudioOutput *AudioOutput::Create(std::st - return new AudioOutputWave(deviceID); #endif - return new AudioOutputWASAPI(deviceID); +@@ -59,7 +59,7 @@ int32_t AudioOutput::estimatedDelay=60; + return std::unique_ptr(new AudioOutputWave(deviceID)); + #endif + return std::unique_ptr(new AudioOutputWASAPI(deviceID)); -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) if(AudioOutputPulse::IsAvailable()){ AudioOutputPulse* aop=new AudioOutputPulse(deviceID); if(!aop->IsInitialized()) -@@ -101,7 +101,7 @@ void AudioOutput::EnumerateDevices(std:: +@@ -107,7 +107,7 @@ void AudioOutput::EnumerateDevices(std:: } #endif AudioOutputWASAPI::EnumerateDevices(devs); -#elif defined(__linux__) && !defined(__ANDROID__) +#elif (defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) - if(!AudioOutputPulse::IsAvailable() || !AudioOutputPulse::EnumerateDevices(devs)) + #if !defined(WITHOUT_PULSE) && !defined(WITHOUT_ALSA) + if(!AudioOutputPulse::EnumerateDevices(devs)) AudioOutputALSA::EnumerateDevices(devs); - #endif 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 Wed Aug 22 16:04:13 2018 (r477795) +++ head/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_logging.cpp Wed Aug 22 16:09:42 2018 (r477796) @@ -1,4 +1,4 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***