From da7178089f1c92618f1fdf8183aa4a85fdcd76d1 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 31 Dec 2019 17:52:15 +0300 Subject: [PATCH] Version 1.9.3: Fix build for OS X 10.10-10.11. --- .../SourceFiles/history/view/media/history_view_media.cpp | 4 +++- Telegram/SourceFiles/mtproto/type_utils.h | 1 - Telegram/cmake/lib_tgvoip.cmake | 2 +- cmake | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.cpp b/Telegram/SourceFiles/history/view/media/history_view_media.cpp index e2b51e604..fac775f8b 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_media.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_media.cpp @@ -26,8 +26,10 @@ namespace { auto ok1 = true; auto ok2 = true; auto ok3 = true; + auto minutes = minutes1.toString(); + minutes += minutes2; const auto result = (hours.isEmpty() ? 0 : hours.toInt(&ok1)) * 3600 - + (minutes1 + minutes2).toInt(&ok2) * 60 + + minutes.toInt(&ok2) * 60 + seconds.toInt(&ok3); return (ok1 && ok2 && ok3) ? result : -1; } diff --git a/Telegram/SourceFiles/mtproto/type_utils.h b/Telegram/SourceFiles/mtproto/type_utils.h index 77e2478e8..182431fc2 100644 --- a/Telegram/SourceFiles/mtproto/type_utils.h +++ b/Telegram/SourceFiles/mtproto/type_utils.h @@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#include "scheme.h" #include "base/flags.h" inline MTPbool MTP_bool(bool v) { diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake index e0c76aa7e..38fa632a4 100644 --- a/Telegram/cmake/lib_tgvoip.cmake +++ b/Telegram/cmake/lib_tgvoip.cmake @@ -775,10 +775,10 @@ PUBLIC ${tgvoip_loc} PRIVATE ${tgvoip_loc}/webrtc_dsp - ${libs_loc}/opus/include ) target_link_libraries(lib_tgvoip PRIVATE desktop-app::external_openssl + desktop-app::external_opus ) diff --git a/cmake b/cmake index b08c57c8d..449066752 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit b08c57c8d0de79f7d569c4261a72c1dbeb28d602 +Subproject commit 449066752048a9b5e64f8b9bbad7af8b0e53e8b2