Attachment #213866 for bug #245980

Lines 1-7 Link Here

(-)b/net-im/telegram-desktop/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= telegram-desktop	3	PORTNAME= telegram-desktop
4	DISTVERSION= 2.0.1	4	DISTVERSION= 2.1.0
5	CATEGORIES= net-im	5	CATEGORIES= net-im
6	MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/	6	MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
7	DISTNAME= tdesktop-${DISTVERSION}-full	7	DISTNAME= tdesktop-${DISTVERSION}-full

Lines 1-3 Link Here

(-)b/net-im/telegram-desktop/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1585708370	1	TIMESTAMP = 1587747983
2	SHA256 (tdesktop-2.0.1-full.tar.gz) = ced19f5bc15e26d7bf76e47841422425f664110f1aada111b9f525ab18e1723c	2	SHA256 (tdesktop-2.1.0-full.tar.gz) = 86d2acc2dfd426ea222ae94984d81e60774f16f3ecc3405578377d90f809a950
3	SIZE (tdesktop-2.0.1-full.tar.gz) = 26106949	3	SIZE (tdesktop-2.1.0-full.tar.gz) = 26133964




--- Telegram/SourceFiles/logs.cpp.orig	2020-02-18 08:28:06 UTC
+++ Telegram/SourceFiles/logs.cpp
@@ -342,7 +342,7 @@ void start(not_null<Core::Launcher*> launcher) {
 	if (cAlphaVersion()) {
 		workingDirChosen = true;
 	} else {
 
-#if defined Q_OS_MAC || defined Q_OS_LINUX
+#if defined Q_OS_MAC || defined Q_OS_LINUX || defined Q_OS_FREEBSD
 
 		if (!cWorkingDir().isEmpty()) {
 			// This value must come from TelegramForcePortable
@@ -357,16 +357,16 @@ void start(not_null<Core::Launcher*> launcher) {

 
-#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
 
 		cForceWorkingDir(psAppDataPath());
 		workingDirChosen = true;
 
-#elif defined OS_WIN_STORE // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT
+#elif defined OS_WIN_STORE // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || Q_OS_FREEBSD
 
 #ifdef _DEBUG
 		cForceWorkingDir(cExeDir());
 #else // _DEBUG
@@ -383,7 +383,7 @@ void start(not_null<Core::Launcher*> launcher) {
 			workingDirChosen = true;
 		}
 
-#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || OS_WIN_STORE
+#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WINRT || OS_WIN_STORE || Q_OS_FREEBSD
 
 	}
 
 	LogsData = new LogsDataFields();

Removed Link Here

(-)a/net-im/telegram-desktop/files/patch-cmake_external_opus_CMakeLists.txt (-11 lines)
1	--- cmake/external/opus/CMakeLists.txt.orig 2020-02-18 08:27:33 UTC
2	+++ cmake/external/opus/CMakeLists.txt
3	@@ -11,7 +11,7 @@ if (DESKTOP_APP_USE_PACKAGED)
4	find_package(PkgConfig REQUIRED)
5	pkg_check_modules(OPUS opus)
6
7	- target_include_directories(external_opus INTERFACE ${OPUS_INCLUDE_DIRS})
8	+ target_include_directories(external_opus INTERFACE ${OPUS_INCLUDEDIR})
9	else()
10	target_include_directories(external_opus SYSTEM
11	INTERFACE

Return to bug 245980

Lines 1-12 Link Here

(-)b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp (-5 / +5 lines)
1	--- Telegram/SourceFiles/logs.cpp.orig 2020-02-18 08:28:06 UTC	1	--- Telegram/SourceFiles/logs.cpp.orig 2020-02-18 08:28:06 UTC
2	+++ Telegram/SourceFiles/logs.cpp	2	+++ Telegram/SourceFiles/logs.cpp
3	@@ -342,7 +342,7 @@ void start(not_null<Core::Launcher*> launcher) {	3	@@ -342,7 +342,7 @@ void start(not_null<Core::Launcher*> launcher) {
4	if (cAlphaVersion()) {
5	workingDirChosen = true;	4	workingDirChosen = true;
		5	} else {
6		6
7	-#if defined Q_OS_MAC \|\| defined Q_OS_LINUX	7	-#if defined Q_OS_MAC \|\| defined Q_OS_LINUX
8	+#if defined Q_OS_MAC \|\| defined Q_OS_LINUX \|\| defined Q_OS_FREEBSD	8	+#if defined Q_OS_MAC \|\| defined Q_OS_LINUX \|\| defined Q_OS_FREEBSD
9	} else {	9
10	if (!cWorkingDir().isEmpty()) {	10	if (!cWorkingDir().isEmpty()) {
11	// This value must come from TelegramForcePortable	11	// This value must come from TelegramForcePortable
12	@@ -357,16 +357,16 @@ void start(not_null<Core::Launcher*> launcher) {	12	@@ -357,16 +357,16 @@ void start(not_null<Core::Launcher*> launcher) {
Lines 21-41 Link Here
21		21
22	-#elif defined Q_OS_WINRT // Q_OS_MAC \|\| Q_OS_LINUX	22	-#elif defined Q_OS_WINRT // Q_OS_MAC \|\| Q_OS_LINUX
23	+#elif defined Q_OS_WINRT // Q_OS_MAC \|\| Q_OS_LINUX \|\| Q_OS_FREEBSD	23	+#elif defined Q_OS_WINRT // Q_OS_MAC \|\| Q_OS_LINUX \|\| Q_OS_FREEBSD
24	} else {	24
25	cForceWorkingDir(psAppDataPath());	25	cForceWorkingDir(psAppDataPath());
26	workingDirChosen = true;	26	workingDirChosen = true;
27		27
28	-#elif defined OS_WIN_STORE // Q_OS_MAC \|\| Q_OS_LINUX \|\| Q_OS_WINRT	28	-#elif defined OS_WIN_STORE // Q_OS_MAC \|\| Q_OS_LINUX \|\| Q_OS_WINRT
29	+#elif defined OS_WIN_STORE // Q_OS_MAC \|\| Q_OS_LINUX \|\| Q_OS_WINRT \|\| Q_OS_FREEBSD	29	+#elif defined OS_WIN_STORE // Q_OS_MAC \|\| Q_OS_LINUX \|\| Q_OS_WINRT \|\| Q_OS_FREEBSD
		30
30	#ifdef _DEBUG	31	#ifdef _DEBUG
31	cForceWorkingDir(cExeDir());	32	cForceWorkingDir(cExeDir());
32	#else // _DEBUG
33	@@ -383,7 +383,7 @@ void start(not_null<Core::Launcher*> launcher) {	33	@@ -383,7 +383,7 @@ void start(not_null<Core::Launcher*> launcher) {
34	workingDirChosen = true;	34	workingDirChosen = true;
35	}	35	}
36		36
37	-#endif // Q_OS_MAC \|\| Q_OS_LINUX \|\| Q_OS_WINRT \|\| OS_WIN_STORE	37	-#endif // Q_OS_MAC \|\| Q_OS_LINUX \|\| Q_OS_WINRT \|\| OS_WIN_STORE
38	+#endif // Q_OS_MAC \|\| Q_OS_LINUX \|\| Q_OS_WINRT \|\| OS_WIN_STORE \|\| Q_OS_FREEBSD	38	+#endif // Q_OS_MAC \|\| Q_OS_LINUX \|\| Q_OS_WINRT \|\| OS_WIN_STORE \|\| Q_OS_FREEBSD
		39
39	}	40	}
40		41
41	LogsData = new LogsDataFields();