13 files changed, 25 insertions, 44 deletions

diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index d28e9d0d9815..13bcc17ad05e 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	telegram-desktop
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.12
+DISTVERSION=	1.3.14
 CATEGORIES=	net-im
 
 MAINTAINER=	henry.hu.sh@gmail.com
@@ -22,14 +22,14 @@ LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 		libopenal.so:audio/openal-soft \
 		libopus.so:audio/opus
 
-USES=		cmake:noninja,outsource desktop-file-utils gmake pkgconfig python:2.7,build qt:5 ssl
+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:5380aab:libtgvoip/Telegram/ThirdParty/libtgvoip \
+		telegramdesktop:libtgvoip:bfa1e6a: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
@@ -64,12 +64,11 @@ GYP_DEFINES:=	${GYP_DEFINES},TDESKTOP_DISABLE_GTK_INTEGRATION
 
 .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
-BROKEN=		Need C++17 support in compiler and runtime
+# Since 1.3.14, the clang compiler provided in 11.1 (4.0.0) gets a segmentation
+# fault.
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1102000
+CXXFLAGS+=	-DGSL_USE_STD_BYTE=0
+QMAKE_COMPILER=	clang
 .endif
 
 post-patch:
diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo
index 87b96c146aee..b879280ac96a 100644
--- a/net-im/telegram-desktop/distinfo
+++ b/net-im/telegram-desktop/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1533439370
-SHA256 (telegramdesktop-tdesktop-v1.3.12_GH0.tar.gz) = 4d19fdc85f0c792c6c073062dacf707fc976581a8d249fa91757015cceb7662b
-SIZE (telegramdesktop-tdesktop-v1.3.12_GH0.tar.gz) = 17180353
+TIMESTAMP = 1535586991
+SHA256 (telegramdesktop-tdesktop-v1.3.14_GH0.tar.gz) = 83daeded641f79bd370b5e83be88242ab57520e7754f1371a9e5c1f3d9863f2a
+SIZE (telegramdesktop-tdesktop-v1.3.14_GH0.tar.gz) = 17199969
 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-5380aab_GH0.tar.gz) = 6b3e49835a7705406a0161162a1ffb53be6d66b17a8faaca49e6df51a34ebe23
-SIZE (telegramdesktop-libtgvoip-5380aab_GH0.tar.gz) = 810123
+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
diff --git a/net-im/telegram-desktop/files/gyp-patches b/net-im/telegram-desktop/files/gyp-patches
index 074f33854ed6..2f7a9c017099 100644
--- a/net-im/telegram-desktop/files/gyp-patches
+++ b/net-im/telegram-desktop/files/gyp-patches
@@ -383,7 +383,7 @@
        '<(emoji_suggestions_loc)',
        '<(submodules_loc)/GSL/include',
        '<(submodules_loc)/variant/include',
-@@ -115,7 +105,7 @@
+@@ -116,7 +106,7 @@
        '<(res_loc)/export_html/images/back@2x.png',
      ],
      'sources!': [
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h
index bb0f0420c1e4..c7b684c45d0c 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_base_bytes.h
@@ -1,6 +1,6 @@
 --- ./Telegram/SourceFiles/base/bytes.h.orig	2018-08-04 14:53:40 UTC
 +++ ./Telegram/SourceFiles/base/bytes.h
-@@ -114,7 +114,7 @@ template <
+@@ -128,7 +128,7 @@ template <
  vector concatenate(Args &&...args) {
  	const auto size = details::spansLength(args...);
  	auto result = vector(size);
@@ -9,7 +9,7 @@
  	return result;
  }
  
-@@ -126,7 +126,7 @@ vector concatenate(SpanRange args) {
+@@ -140,7 +140,7 @@ vector concatenate(SpanRange args) {
  		size += bytes::make_span(arg).size();
  	}
  	auto result = vector(size);
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp
index fe1508712063..0ff0809a685e 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_export_data_export__data__types.cpp
@@ -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
-@@ -344,9 +344,9 @@ QString CleanDocumentName(QString name) 
+@@ -346,9 +346,9 @@ QString CleanDocumentName(QString name)
  		'|',
  #elif defined Q_OS_MAC // Q_OS_WIN
  		':',
diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp
index 49eeff46389d..e0c0ef292058 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_history_admin__log_history__admin__log__inner.cpp
@@ -1,6 +1,6 @@
 --- 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
-@@ -1389,13 +1389,13 @@ void InnerWidget::mouseActionFinish(cons
+@@ -1391,13 +1391,13 @@ void InnerWidget::mouseActionFinish(cons
  	_mouseSelectType = TextSelectType::Letters;
  	//_widget->noSelectingScroll(); // TODO
  
diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp
index ac7f0a00d6c6..1efc46772c6e 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_VoIPController.cpp
@@ -1,6 +1,6 @@
 --- Telegram/ThirdParty/libtgvoip/VoIPController.cpp.orig	2018-07-17 16:48:21 UTC
 +++ Telegram/ThirdParty/libtgvoip/VoIPController.cpp
-@@ -2046,7 +2046,7 @@ static void initMachTimestart() {
+@@ -2048,7 +2048,7 @@ static void initMachTimestart() {
  #endif
  
  double VoIPController::GetCurrentTime(){
diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp
index de5db0a3650f..55278dd786e1 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioInput.cpp
@@ -9,16 +9,7 @@
  #ifndef WITHOUT_ALSA
  #include "../os/linux/AudioInputALSA.h"
  #endif
-@@ -63,7 +63,7 @@ AudioInput::AudioInput(std::string devic
- 		return new AudioInputWave(deviceID);
- #endif
- 	return new AudioInputWASAPI(deviceID);
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__FreeBSD__)
- 	if(AudioInputPulse::IsAvailable()){
- 		AudioInputPulse* aip=new AudioInputPulse(deviceID);
- 		if(!aip->IsInitialized())
-@@ -96,7 +96,7 @@ void AudioInput::EnumerateDevices(std::v
+@@ -68,7 +68,7 @@ void AudioInput::EnumerateDevices(std::v
  	}
  #endif
  	AudioInputWASAPI::EnumerateDevices(devs);
diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp
index f048f947b4d3..dd0335601d14 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_audio_AudioOutput.cpp
@@ -9,16 +9,7 @@
  #ifndef WITHOUT_ALSA
  #include "../os/linux/AudioOutputALSA.h"
  #endif
-@@ -59,7 +59,7 @@ int32_t AudioOutput::estimatedDelay=60;
- 		return std::unique_ptr<AudioOutput>(new AudioOutputWave(deviceID));
- #endif
- 	return std::unique_ptr<AudioOutput>(new AudioOutputWASAPI(deviceID));
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__FreeBSD__)
- 	if(AudioOutputPulse::IsAvailable()){
- 		AudioOutputPulse* aop=new AudioOutputPulse(deviceID);
- 		if(!aop->IsInitialized())
-@@ -107,7 +107,7 @@ void AudioOutput::EnumerateDevices(std::
+@@ -79,7 +79,7 @@ void AudioOutput::EnumerateDevices(std::
  	}
  #endif
  	AudioOutputWASAPI::EnumerateDevices(devs);
diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioPulse.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioPulse.cpp
index 361a96eaca5e..81a2aa9f7dc1 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioPulse.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_linux_AudioPulse.cpp
@@ -10,7 +10,7 @@
  
  #define DECLARE_DL_FUNCTION(name) typeof(name)* AudioPulse::_import_##name=NULL
  #define CHECK_DL_ERROR(res, msg) if(!res){LOGE(msg ": %s", dlerror()); return false;}
-@@ -272,4 +275,4 @@ bool AudioPulse::DoOneOperation(std::fun
+@@ -283,4 +286,4 @@ bool AudioPulse::DoOneOperation(std::fun
  		}
  		pa_mainloop_iterate(ml, 1, NULL);
  	}
diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp
index 196cbd32bfd2..825126702b5d 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp
+++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_os_posix_NetworkSocketPosix.cpp
@@ -1,6 +1,6 @@
 --- Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp.orig	2018-07-17 16:48:21 UTC
 +++ Telegram/ThirdParty/libtgvoip/os/posix/NetworkSocketPosix.cpp
-@@ -53,6 +53,7 @@ void NetworkSocketPosix::SetMaxPriority(
+@@ -54,6 +54,7 @@ void NetworkSocketPosix::SetMaxPriority(
  	if(res<0){
  		LOGE("error setting darwin-specific net priority: %d / %s", errno, strerror(errno));
  	}
diff --git a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_threading.h b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_threading.h
index e1950bb82911..80c4dda23e24 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_threading.h
+++ b/net-im/telegram-desktop/files/patch-Telegram_ThirdParty_libtgvoip_threading.h
@@ -10,7 +10,7 @@
  
  namespace tgvoip{
  	class Mutex{
-@@ -112,7 +115,9 @@ namespace tgvoip{
+@@ -115,7 +118,9 @@ namespace tgvoip{
  		static void* ActualEntryPoint(void* arg){
  			Thread* self=reinterpret_cast<Thread*>(arg);
  			if(self->name){
diff --git a/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt b/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt
index 3499b593d481..f4f0dea67fdf 100644
--- a/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt
+++ b/net-im/telegram-desktop/files/patch-Telegram_gyp_telegram__sources.txt
@@ -1,6 +1,6 @@
 --- Telegram/gyp/telegram_sources.txt.orig	2018-08-04 18:53:40 UTC
 +++ Telegram/gyp/telegram_sources.txt
-@@ -797,14 +797,7 @@
+@@ -801,14 +801,7 @@
  <(emoji_suggestions_loc)/emoji_suggestions.cpp
  <(emoji_suggestions_loc)/emoji_suggestions.h