View | Details | Raw Unified | Return to bug 250393 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-3 / +5 lines)
Lines 1-8 Link Here
1
# $FreeBSD: head/net-im/telegram-desktop/Makefile 552150 2020-10-12 21:02:11Z makc $
1
# $FreeBSD: head/net-im/telegram-desktop/Makefile 552150 2020-10-12 21:02:11Z makc $
2
2
3
PORTNAME=	telegram-desktop
3
PORTNAME=	telegram-desktop
4
DISTVERSION=	2.3.2
4
DISTVERSION=	2.4.4
5
PORTREVISION=	1
6
CATEGORIES=	net-im
5
CATEGORIES=	net-im
7
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}/
8
DISTNAME=	tdesktop-${DISTVERSION}-full
7
DISTNAME=	tdesktop-${DISTVERSION}-full
Lines 50-56 Link Here
50
USE_GITHUB=	nodefault
49
USE_GITHUB=	nodefault
51
GH_ACCOUNT=	telegramdesktop
50
GH_ACCOUNT=	telegramdesktop
52
GH_PROJECT=	tdesktop
51
GH_PROJECT=	tdesktop
53
GH_TUPLE=	desktop-app:tg_owt:fc49a0e:tg_owt/tg_owt
52
GH_TUPLE=	desktop-app:tg_owt:c73a471:tg_owt/tg_owt
54
USE_GNOME=	glib20
53
USE_GNOME=	glib20
55
USE_QT=		core dbus gui imageformats network widgets buildtools_build \
54
USE_QT=		core dbus gui imageformats network widgets buildtools_build \
56
		qmake_build wayland
55
		qmake_build wayland
Lines 66-71 Link Here
66
		-DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \
65
		-DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \
67
		-Ddisable_autoupdate=1 \
66
		-Ddisable_autoupdate=1 \
68
		-DDESKTOP_APP_WEBRTC_LOCATION=${WRKSRC}/tg_owt/src
67
		-DDESKTOP_APP_WEBRTC_LOCATION=${WRKSRC}/tg_owt/src
68
69
# Disable DCHECKs, otherwise video calls will crash.
70
CXXFLAGS+=	-DNDEBUG
69
71
70
# Telegram asks each custom build to have its own API ID and hash.
72
# Telegram asks each custom build to have its own API ID and hash.
71
TELEGRAM_API_ID=	601761
73
TELEGRAM_API_ID=	601761
(-)./distinfo (-5 / +5 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1598842893
1
TIMESTAMP = 1603766669
2
SHA256 (tdesktop-2.3.2-full.tar.gz) = 292631bcac4b30f778879ecd2cebf4c6f569ab5be01230c8e62b924b4211a259
2
SHA256 (tdesktop-2.4.4-full.tar.gz) = 88799708daedaf5c132752259945b4e1b5dcbb62385661e2cca7b8e5d58c9026
3
SIZE (tdesktop-2.3.2-full.tar.gz) = 36402335
3
SIZE (tdesktop-2.4.4-full.tar.gz) = 36220573
4
SHA256 (desktop-app-tg_owt-fc49a0e_GH0.tar.gz) = bb17463246eeacf9f7bc97b04d0ff60f5f207f69a19482094e3a1cc14b46f4e4
4
SHA256 (desktop-app-tg_owt-c73a471_GH0.tar.gz) = d1886a3ba6966fef257f63a3dd39f53d01ff8db0177fcd6de1b64916cd4076e1
5
SIZE (desktop-app-tg_owt-fc49a0e_GH0.tar.gz) = 18379679
5
SIZE (desktop-app-tg_owt-c73a471_GH0.tar.gz) = 18383113
(-)./files/patch-Telegram_lib__base_base_platform_linux_base__info__linux.cpp (-6 / +6 lines)
Lines 1-14 Link Here
1
--- Telegram/lib_base/base/platform/linux/base_info_linux.cpp.orig	2020-08-10 11:25:13 UTC
1
--- Telegram/lib_base/base/platform/linux/base_info_linux.cpp.orig	2020-10-20 16:29:09 UTC
2
+++ Telegram/lib_base/base/platform/linux/base_info_linux.cpp
2
+++ Telegram/lib_base/base/platform/linux/base_info_linux.cpp
3
@@ -13,7 +13,6 @@
3
@@ -11,7 +11,6 @@
4
 #include <QtCore/QVersionNumber>
4
 #include <QtCore/QVersionNumber>
5
 #include <QtCore/QDate>
5
 #include <QtCore/QDate>
6
 #include <QtGui/QGuiApplication>
6
 #include <QtGui/QGuiApplication>
7
-#include <gnu/libc-version.h>
7
-#include <gnu/libc-version.h>
8
 
8
 
9
 namespace Platform {
9
 namespace Platform {
10
 namespace {
10
 
11
@@ -72,11 +71,9 @@ QString SystemVersionPretty() {
11
@@ -32,11 +31,9 @@ QString SystemVersionPretty() {
12
 	const auto value = result ? QString::fromLatin1(result) : QString();
12
 	const auto value = result ? QString::fromLatin1(result) : QString();
13
 	const auto list = value.split(':', QString::SkipEmptyParts);
13
 	const auto list = value.split(':', QString::SkipEmptyParts);
14
 
14
 
Lines 22-28 Link Here
22
 }
22
 }
23
 
23
 
24
 QString SystemCountry() {
24
 QString SystemCountry() {
25
@@ -94,10 +91,6 @@ QString SystemLanguage() {
25
@@ -54,10 +51,6 @@ QString SystemLanguage() {
26
 QDate WhenSystemBecomesOutdated() {
26
 QDate WhenSystemBecomesOutdated() {
27
 	if (IsLinux32Bit()) {
27
 	if (IsLinux32Bit()) {
28
 		return QDate(2020, 9, 1);
28
 		return QDate(2020, 9, 1);
Lines 33-39 Link Here
33
 	}
33
 	}
34
 	return QDate();
34
 	return QDate();
35
 }
35
 }
36
@@ -118,14 +111,6 @@ QString AutoUpdateKey() {
36
@@ -78,14 +71,6 @@ QString AutoUpdateKey() {
37
 	} else {
37
 	} else {
38
 		Unexpected("Platform in AutoUpdateKey.");
38
 		Unexpected("Platform in AutoUpdateKey.");
39
 	}
39
 	}
(-)./files/patch-cmake_external_rlottie_CMakeLists.txt (+11 lines)
Line 0 Link Here
1
--- cmake/external/rlottie/CMakeLists.txt.orig	2020-10-23 14:48:52 UTC
2
+++ cmake/external/rlottie/CMakeLists.txt
3
@@ -7,7 +7,7 @@
4
 add_library(external_rlottie INTERFACE IMPORTED GLOBAL)
5
 add_library(desktop-app::external_rlottie ALIAS external_rlottie)
6
 
7
-if (DESKTOP_APP_USE_PACKAGED)
8
+if (0) # DESKTOP_APP_USE_PACKAGED
9
     find_package(rlottie QUIET)
10
 
11
     if (rlottie_FOUND)
(-)./files/patch-cmake_external_webrtc_CMakeLists.txt (-14 / +29 lines)
Lines 1-17 Link Here
1
--- cmake/external/webrtc/CMakeLists.txt.orig	2020-08-20 13:59:10 UTC
1
--- cmake/external/webrtc/CMakeLists.txt.orig	2020-10-23 14:48:52 UTC
2
+++ cmake/external/webrtc/CMakeLists.txt
2
+++ cmake/external/webrtc/CMakeLists.txt
3
@@ -76,7 +76,7 @@ if (APPLE)
3
@@ -7,11 +7,11 @@
4
 add_library(external_webrtc INTERFACE IMPORTED GLOBAL)
5
 add_library(desktop-app::external_webrtc ALIAS external_webrtc)
6
 
7
-if (DESKTOP_APP_USE_PACKAGED)
8
+if (0) # DESKTOP_APP_USE_PACKAGED
9
     find_package(tg_owt REQUIRED)
10
     target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt)
11
 else()
12
-    set(webrtc_loc ${libs_loc}/tg_owt/src)
13
+    set(webrtc_loc ${DESKTOP_APP_WEBRTC_LOCATION})
14
     set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<CONFIG>)
15
 
16
     target_compile_definitions(external_webrtc
17
@@ -75,7 +75,7 @@ else()
18
         )
19
     endif()
20
     foreach (lib ${webrtc_libs})
21
-        list(APPEND webrtc_libs_list "${webrtc_build_loc}/${lib}${webrtc_lib_suffix}")
22
+        list(APPEND webrtc_libs_list "${DESKTOP_APP_WEBRTC_LOCATION}/../out/$<CONFIG>/${lib}${webrtc_lib_suffix}")
23
     endforeach()
24
 
25
     if (WIN32)
26
@@ -98,5 +98,6 @@ else()
27
     INTERFACE
28
         ${webrtc_libs_list}
29
         desktop-app::external_openssl
30
+        jpeg
4
     )
31
     )
5
 endif()
32
 endif()
6
 foreach (lib ${webrtc_libs})
7
-    list(APPEND webrtc_libs_list "${webrtc_build_loc}/${lib}${webrtc_lib_suffix}")
8
+    list(APPEND webrtc_libs_list "${DESKTOP_APP_WEBRTC_LOCATION}/../out/$<CONFIG>/${lib}${webrtc_lib_suffix}")
9
 endforeach()
10
 
11
 if (WIN32)
12
@@ -99,4 +99,5 @@ target_link_libraries(external_webrtc
13
 INTERFACE
14
     ${webrtc_libs_list}
15
     desktop-app::external_openssl
16
+    jpeg
17
 )
(-)./files/patch-tg__owt_CMakeLists.txt (-12 / +12 lines)
Lines 1-4 Link Here
1
--- tg_owt/CMakeLists.txt.orig	2020-08-30 09:41:57 UTC
1
--- tg_owt/CMakeLists.txt.orig	2020-10-07 14:11:02 UTC
2
+++ tg_owt/CMakeLists.txt
2
+++ tg_owt/CMakeLists.txt
3
@@ -38,7 +38,6 @@ include(cmake/libopenh264.cmake)
3
@@ -38,7 +38,6 @@ include(cmake/libopenh264.cmake)
4
 include(cmake/libpffft.cmake)
4
 include(cmake/libpffft.cmake)
Lines 8-26 Link Here
8
 include(cmake/libvpx.cmake)
8
 include(cmake/libvpx.cmake)
9
 include(cmake/libwebrtcbuild.cmake)
9
 include(cmake/libwebrtcbuild.cmake)
10
 include(cmake/libyuv.cmake)
10
 include(cmake/libyuv.cmake)
11
@@ -61,7 +60,6 @@ PRIVATE
11
@@ -62,7 +61,6 @@ if (is_x86 OR is_x64)
12
     tg_owt::libpffft
12
         tg_owt::libpffft
13
     tg_owt::librnnoise
13
         tg_owt::librnnoise
14
     tg_owt::libsrtp
14
         tg_owt::libsrtp
15
-    tg_owt::libusrsctp
15
-        tg_owt::libusrsctp
16
     tg_owt::libvpx
16
         tg_owt::libvpx
17
     tg_owt::libvpx_mmx
17
         tg_owt::libvpx_mmx
18
     tg_owt::libvpx_sse2
18
         tg_owt::libvpx_sse2
19
@@ -1757,7 +1755,6 @@ TARGETS
19
@@ -1839,7 +1837,6 @@ TARGETS
20
     libpffft
20
     libpffft
21
     librnnoise
21
     librnnoise
22
     libsrtp
22
     libsrtp
23
-    libusrsctp
23
-    libusrsctp
24
     libvpx
24
     libvpx
25
     libvpx_mmx
25
     ${vpx_export}
26
     libvpx_sse2
26
     libwebrtcbuild
(-)./files/patch-tg__owt_cmake_init__target.cmake (-11 lines)
Lines 1-11 Link Here
1
--- tg_owt/cmake/init_target.cmake.orig	2020-08-30 09:41:57 UTC
2
+++ tg_owt/cmake/init_target.cmake
3
@@ -10,7 +10,7 @@ function(init_target target_name) # init_target(my_tar
4
     elseif (APPLE)
5
         target_compile_features(${target_name} PUBLIC cxx_std_14)
6
     else()
7
-        target_compile_features(${target_name} PUBLIC cxx_std_20)
8
+        target_compile_features(${target_name} PUBLIC cxx_std_17)
9
     endif()
10
     if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
11
         set_target_properties(${target_name} PROPERTIES

Return to bug 250393