Index: head/net-im/telegram-desktop/Makefile =================================================================== --- head/net-im/telegram-desktop/Makefile (revision 554413) +++ head/net-im/telegram-desktop/Makefile (revision 554414) @@ -1,109 +1,111 @@ # $FreeBSD$ PORTNAME= telegram-desktop -DISTVERSION= 2.3.2 -PORTREVISION= 1 +DISTVERSION= 2.4.4 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= henry.hu.sh@gmail.com COMMENT= Telegram Desktop messaging app LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= powerpc powerpc64 powerpcspe NOT_FOR_ARCHS_REASON= Only little endian is supported BROKEN_i386= Does not build, webrtc related. BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib \ dee>0:devel/dee \ microsoft-gsl>0:devel/microsoft-gsl \ pulseaudio>0:audio/pulseaudio \ range-v3>0:devel/range-v3 \ tl-expected>0:devel/tl-expected \ v4l_compat>0:multimedia/v4l_compat \ yasm:devel/yasm LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ libdbusmenu-qt5.so:devel/libdbusmenu-qt \ libenchant-2.so:textproc/enchant2 \ libhunspell-1.7.so:textproc/hunspell \ libjpeg.so:graphics/jpeg-turbo \ liblz4.so:archivers/liblz4 \ libminizip.so:archivers/minizip \ libopenal.so:audio/openal-soft \ libopus.so:audio/opus \ libqrcodegencpp.so:graphics/qr-code-generator \ libusrsctp.so:net/libusrsctp \ libxkbcommon.so:x11/libxkbcommon \ libxxhash.so:devel/xxhash USES= cmake compiler:c++17-lang desktop-file-utils gl \ gnome pkgconfig python:3.7,build qt:5 ssl xorg # see Bugzilla #245452 for details NO_CCACHE= yes USE_GITHUB= nodefault GH_ACCOUNT= telegramdesktop GH_PROJECT= tdesktop -GH_TUPLE= desktop-app:tg_owt:fc49a0e:tg_owt/tg_owt +GH_TUPLE= desktop-app:tg_owt:c73a471:tg_owt/tg_owt USE_GNOME= glib20 USE_QT= core dbus gui imageformats network widgets buildtools_build \ qmake_build wayland USE_XORG= x11 xcb USE_GL= gl CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \ TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION CMAKE_OFF= DESKTOP_APP_USE_PACKAGED_RLOTTIE DESKTOP_APP_USE_PACKAGED_VARIANT \ DESKTOP_APP_USE_GLIBC_WRAPS TDESKTOP_USE_PACKAGED_TGVOIP \ DESKTOP_APP_USE_PACKAGED_FONTS CMAKE_ARGS= -DDESKTOP_APP_SPECIAL_TARGET="" -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \ -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \ -Ddisable_autoupdate=1 \ -DDESKTOP_APP_WEBRTC_LOCATION=${WRKSRC}/tg_owt/src + +# Disable DCHECKs, otherwise video calls will crash. +CXXFLAGS+= -DNDEBUG # Telegram asks each custom build to have its own API ID and hash. TELEGRAM_API_ID= 601761 TELEGRAM_API_HASH= 20a3432aab43f24bb4460fceac5ba38d # Telegram uses OpenAL for its audio, but libtgvoip (for voice calls) can use PulseAudio or ALSA. # It dynamically loads PulseAudio, and if this fails, it loads ALSA. # 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 GTK_CMAKE_BOOL_OFF= TDESKTOP_DISABLE_GTK_INTEGRATION INSTALLS_ICONS= yes .include .if ${PORT_OPTIONS:MGTK} USE_GNOME+= gtk30 .endif .include pre-configure: @cd ${WRKSRC}/tg_owt && \ ${MKDIR} out/${CMAKE_BUILD_TYPE} && \ cd out/${CMAKE_BUILD_TYPE} && \ ${CMAKE_BIN} ${CMAKE_ARGS} ${WRKSRC}/tg_owt pre-build: @cd ${WRKSRC}/tg_owt/out/${CMAKE_BUILD_TYPE} && ${DO_MAKE_BUILD} .include Index: head/net-im/telegram-desktop/distinfo =================================================================== --- head/net-im/telegram-desktop/distinfo (revision 554413) +++ head/net-im/telegram-desktop/distinfo (revision 554414) @@ -1,5 +1,5 @@ -TIMESTAMP = 1598842893 -SHA256 (tdesktop-2.3.2-full.tar.gz) = 292631bcac4b30f778879ecd2cebf4c6f569ab5be01230c8e62b924b4211a259 -SIZE (tdesktop-2.3.2-full.tar.gz) = 36402335 -SHA256 (desktop-app-tg_owt-fc49a0e_GH0.tar.gz) = bb17463246eeacf9f7bc97b04d0ff60f5f207f69a19482094e3a1cc14b46f4e4 -SIZE (desktop-app-tg_owt-fc49a0e_GH0.tar.gz) = 18379679 +TIMESTAMP = 1603766669 +SHA256 (tdesktop-2.4.4-full.tar.gz) = 88799708daedaf5c132752259945b4e1b5dcbb62385661e2cca7b8e5d58c9026 +SIZE (tdesktop-2.4.4-full.tar.gz) = 36220573 +SHA256 (desktop-app-tg_owt-c73a471_GH0.tar.gz) = d1886a3ba6966fef257f63a3dd39f53d01ff8db0177fcd6de1b64916cd4076e1 +SIZE (desktop-app-tg_owt-c73a471_GH0.tar.gz) = 18383113 Index: head/net-im/telegram-desktop/files/patch-tg__owt_cmake_init__target.cmake =================================================================== --- head/net-im/telegram-desktop/files/patch-tg__owt_cmake_init__target.cmake (revision 554413) +++ head/net-im/telegram-desktop/files/patch-tg__owt_cmake_init__target.cmake (nonexistent) @@ -1,11 +0,0 @@ ---- tg_owt/cmake/init_target.cmake.orig 2020-08-30 09:41:57 UTC -+++ tg_owt/cmake/init_target.cmake -@@ -10,7 +10,7 @@ function(init_target target_name) # init_target(my_tar - elseif (APPLE) - target_compile_features(${target_name} PUBLIC cxx_std_14) - else() -- target_compile_features(${target_name} PUBLIC cxx_std_20) -+ target_compile_features(${target_name} PUBLIC cxx_std_17) - endif() - if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - set_target_properties(${target_name} PROPERTIES Property changes on: head/net-im/telegram-desktop/files/patch-tg__owt_cmake_init__target.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__info__linux.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__info__linux.cpp (revision 554413) +++ head/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__info__linux.cpp (revision 554414) @@ -1,50 +1,50 @@ ---- Telegram/lib_base/base/platform/linux/base_info_linux.cpp.orig 2020-08-10 11:25:13 UTC +--- Telegram/lib_base/base/platform/linux/base_info_linux.cpp.orig 2020-10-20 16:29:09 UTC +++ Telegram/lib_base/base/platform/linux/base_info_linux.cpp -@@ -13,7 +13,6 @@ +@@ -11,7 +11,6 @@ #include #include #include -#include namespace Platform { - namespace { -@@ -72,11 +71,9 @@ QString SystemVersionPretty() { + +@@ -32,11 +31,9 @@ QString SystemVersionPretty() { const auto value = result ? QString::fromLatin1(result) : QString(); const auto list = value.split(':', QString::SkipEmptyParts); - return "Linux " + return "FreeBSD " + (list.isEmpty() ? QString() : list[0] + ' ') - + (IsWayland() ? "Wayland " : "X11 ") - + "glibc " - + GetGlibCVersion(); + + (IsWayland() ? "Wayland " : "X11 "); } QString SystemCountry() { -@@ -94,10 +91,6 @@ QString SystemLanguage() { +@@ -54,10 +51,6 @@ QString SystemLanguage() { QDate WhenSystemBecomesOutdated() { if (IsLinux32Bit()) { return QDate(2020, 9, 1); - } else if (const auto version = GetGlibCVersion(); !version.isEmpty()) { - if (QVersionNumber::fromString(version) < QVersionNumber(2, 23)) { - return QDate(2020, 9, 1); // Older than Ubuntu 16.04. - } } return QDate(); } -@@ -118,14 +111,6 @@ QString AutoUpdateKey() { +@@ -78,14 +71,6 @@ QString AutoUpdateKey() { } else { Unexpected("Platform in AutoUpdateKey."); } -} - -QString GetGlibCVersion() { - static const auto result = [&] { - const auto version = QString::fromLatin1(gnu_get_libc_version()); - return QVersionNumber::fromString(version).isNull() ? QString() : version; - }(); - return result; } bool IsWayland() { Index: head/net-im/telegram-desktop/files/patch-cmake_external_rlottie_CMakeLists.txt =================================================================== --- head/net-im/telegram-desktop/files/patch-cmake_external_rlottie_CMakeLists.txt (nonexistent) +++ head/net-im/telegram-desktop/files/patch-cmake_external_rlottie_CMakeLists.txt (revision 554414) @@ -0,0 +1,11 @@ +--- cmake/external/rlottie/CMakeLists.txt.orig 2020-10-23 14:48:52 UTC ++++ cmake/external/rlottie/CMakeLists.txt +@@ -7,7 +7,7 @@ + add_library(external_rlottie INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_rlottie ALIAS external_rlottie) + +-if (DESKTOP_APP_USE_PACKAGED) ++if (0) # DESKTOP_APP_USE_PACKAGED + find_package(rlottie QUIET) + + if (rlottie_FOUND) Property changes on: head/net-im/telegram-desktop/files/patch-cmake_external_rlottie_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/net-im/telegram-desktop/files/patch-cmake_external_webrtc_CMakeLists.txt =================================================================== --- head/net-im/telegram-desktop/files/patch-cmake_external_webrtc_CMakeLists.txt (revision 554413) +++ head/net-im/telegram-desktop/files/patch-cmake_external_webrtc_CMakeLists.txt (revision 554414) @@ -1,17 +1,32 @@ ---- cmake/external/webrtc/CMakeLists.txt.orig 2020-08-20 13:59:10 UTC +--- cmake/external/webrtc/CMakeLists.txt.orig 2020-10-23 14:48:52 UTC +++ cmake/external/webrtc/CMakeLists.txt -@@ -76,7 +76,7 @@ if (APPLE) +@@ -7,11 +7,11 @@ + add_library(external_webrtc INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_webrtc ALIAS external_webrtc) + +-if (DESKTOP_APP_USE_PACKAGED) ++if (0) # DESKTOP_APP_USE_PACKAGED + find_package(tg_owt REQUIRED) + target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt) + else() +- set(webrtc_loc ${libs_loc}/tg_owt/src) ++ set(webrtc_loc ${DESKTOP_APP_WEBRTC_LOCATION}) + set(webrtc_build_loc ${libs_loc}/tg_owt/out/$) + + target_compile_definitions(external_webrtc +@@ -75,7 +75,7 @@ else() + ) + endif() + foreach (lib ${webrtc_libs}) +- list(APPEND webrtc_libs_list "${webrtc_build_loc}/${lib}${webrtc_lib_suffix}") ++ list(APPEND webrtc_libs_list "${DESKTOP_APP_WEBRTC_LOCATION}/../out/$/${lib}${webrtc_lib_suffix}") + endforeach() + + if (WIN32) +@@ -98,5 +98,6 @@ else() + INTERFACE + ${webrtc_libs_list} + desktop-app::external_openssl ++ jpeg ) endif() - foreach (lib ${webrtc_libs}) -- list(APPEND webrtc_libs_list "${webrtc_build_loc}/${lib}${webrtc_lib_suffix}") -+ list(APPEND webrtc_libs_list "${DESKTOP_APP_WEBRTC_LOCATION}/../out/$/${lib}${webrtc_lib_suffix}") - endforeach() - - if (WIN32) -@@ -99,4 +99,5 @@ target_link_libraries(external_webrtc - INTERFACE - ${webrtc_libs_list} - desktop-app::external_openssl -+ jpeg - ) Index: head/net-im/telegram-desktop/files/patch-tg__owt_CMakeLists.txt =================================================================== --- head/net-im/telegram-desktop/files/patch-tg__owt_CMakeLists.txt (revision 554413) +++ head/net-im/telegram-desktop/files/patch-tg__owt_CMakeLists.txt (revision 554414) @@ -1,26 +1,26 @@ ---- tg_owt/CMakeLists.txt.orig 2020-08-30 09:41:57 UTC +--- tg_owt/CMakeLists.txt.orig 2020-10-07 14:11:02 UTC +++ tg_owt/CMakeLists.txt @@ -38,7 +38,6 @@ include(cmake/libopenh264.cmake) include(cmake/libpffft.cmake) include(cmake/librnnoise.cmake) include(cmake/libsrtp.cmake) -include(cmake/libusrsctp.cmake) include(cmake/libvpx.cmake) include(cmake/libwebrtcbuild.cmake) include(cmake/libyuv.cmake) -@@ -61,7 +60,6 @@ PRIVATE - tg_owt::libpffft - tg_owt::librnnoise - tg_owt::libsrtp -- tg_owt::libusrsctp - tg_owt::libvpx - tg_owt::libvpx_mmx - tg_owt::libvpx_sse2 -@@ -1757,7 +1755,6 @@ TARGETS +@@ -62,7 +61,6 @@ if (is_x86 OR is_x64) + tg_owt::libpffft + tg_owt::librnnoise + tg_owt::libsrtp +- tg_owt::libusrsctp + tg_owt::libvpx + tg_owt::libvpx_mmx + tg_owt::libvpx_sse2 +@@ -1839,7 +1837,6 @@ TARGETS libpffft librnnoise libsrtp - libusrsctp libvpx - libvpx_mmx - libvpx_sse2 + ${vpx_export} + libwebrtcbuild