Index: head/net-im/telegram-desktop/Makefile =================================================================== --- head/net-im/telegram-desktop/Makefile (revision 533694) +++ head/net-im/telegram-desktop/Makefile (revision 533695) @@ -1,82 +1,82 @@ # $FreeBSD$ PORTNAME= telegram-desktop -DISTVERSION= 2.0.1 +DISTVERSION= 2.1.0 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full 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 BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib \ dee>0:devel/dee \ pulseaudio>0:audio/pulseaudio \ range-v3>0:devel/range-v3 \ microsoft-gsl>0:devel/microsoft-gsl \ tl-expected>0:devel/tl-expected LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ libminizip.so:archivers/minizip \ libopenal.so:audio/openal-soft \ libopus.so:audio/opus \ libdbusmenu-qt5.so:devel/libdbusmenu-qt \ libhunspell-1.7.so:textproc/hunspell \ libxxhash.so:devel/xxhash \ libenchant-2.so:textproc/enchant2 \ liblz4.so:archivers/liblz4 USES= cmake compiler:c++17-lang desktop-file-utils \ gnome pkgconfig python:3.7,build qt:5 ssl xorg # see Bugzilla #245452 for details NO_CCACHE= yes GH_ACCOUNT= telegramdesktop GH_PROJECT= tdesktop USE_GNOME= glib20 USE_QT= core dbus gui imageformats network widgets buildtools_build \ qmake_build USE_XORG= x11 xcb 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 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 # 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 .include .if ${PORT_OPTIONS:MGTK} USE_GNOME+= gtk30 .endif .include Index: head/net-im/telegram-desktop/distinfo =================================================================== --- head/net-im/telegram-desktop/distinfo (revision 533694) +++ head/net-im/telegram-desktop/distinfo (revision 533695) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585708370 -SHA256 (tdesktop-2.0.1-full.tar.gz) = ced19f5bc15e26d7bf76e47841422425f664110f1aada111b9f525ab18e1723c -SIZE (tdesktop-2.0.1-full.tar.gz) = 26106949 +TIMESTAMP = 1587747983 +SHA256 (tdesktop-2.1.0-full.tar.gz) = 86d2acc2dfd426ea222ae94984d81e60774f16f3ecc3405578377d90f809a950 +SIZE (tdesktop-2.1.0-full.tar.gz) = 26133964 Index: head/net-im/telegram-desktop/files/patch-cmake_external_opus_CMakeLists.txt =================================================================== --- head/net-im/telegram-desktop/files/patch-cmake_external_opus_CMakeLists.txt (revision 533694) +++ head/net-im/telegram-desktop/files/patch-cmake_external_opus_CMakeLists.txt (nonexistent) @@ -1,11 +0,0 @@ ---- cmake/external/opus/CMakeLists.txt.orig 2020-02-18 08:27:33 UTC -+++ cmake/external/opus/CMakeLists.txt -@@ -11,7 +11,7 @@ if (DESKTOP_APP_USE_PACKAGED) - find_package(PkgConfig REQUIRED) - pkg_check_modules(OPUS opus) - -- target_include_directories(external_opus INTERFACE ${OPUS_INCLUDE_DIRS}) -+ target_include_directories(external_opus INTERFACE ${OPUS_INCLUDEDIR}) - else() - target_include_directories(external_opus SYSTEM - INTERFACE Property changes on: head/net-im/telegram-desktop/files/patch-cmake_external_opus_CMakeLists.txt ___________________________________________________________________ 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_SourceFiles_logs.cpp =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp (revision 533694) +++ head/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_logs.cpp (revision 533695) @@ -1,41 +1,41 @@ --- Telegram/SourceFiles/logs.cpp.orig 2020-02-18 08:28:06 UTC +++ Telegram/SourceFiles/logs.cpp @@ -342,7 +342,7 @@ void start(not_null 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 - } else { + if (!cWorkingDir().isEmpty()) { // This value must come from TelegramForcePortable @@ -357,16 +357,16 @@ void start(not_null launcher) { } workingDirChosen = true; -#if defined Q_OS_LINUX && !defined _DEBUG // fix first version +#if (defined Q_OS_LINUX || defined Q_OS_FREEBSD) && !defined _DEBUG // fix first version moveOldDataFrom = initialWorkingDir; -#endif // Q_OS_LINUX && !_DEBUG +#endif // (Q_OS_LINUX || Q_OS_FREEBSD) && !_DEBUG -#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 - } else { + 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 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(); Index: head/net-im/telegram-desktop/files/patch-Telegram_cmake_lib__tgvoip.cmake =================================================================== --- head/net-im/telegram-desktop/files/patch-Telegram_cmake_lib__tgvoip.cmake (nonexistent) +++ head/net-im/telegram-desktop/files/patch-Telegram_cmake_lib__tgvoip.cmake (revision 533695) @@ -0,0 +1,20 @@ +--- Telegram/cmake/lib_tgvoip.cmake.orig 2020-04-30 01:34:51 UTC ++++ Telegram/cmake/lib_tgvoip.cmake +@@ -778,11 +778,17 @@ else() + ) + endif() + ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(PULSE REQUIRED IMPORTED_TARGET libpulse) ++ pkg_check_modules(ALSA REQUIRED IMPORTED_TARGET alsa) ++ + target_include_directories(lib_tgvoip + PUBLIC + ${tgvoip_loc} + PRIVATE + ${tgvoip_loc}/webrtc_dsp ++ ${PULSE_INCLUDE_DIRS} ++ ${ALSA_INCLUDE_DIRS} + ) + + target_link_libraries(lib_tgvoip Property changes on: head/net-im/telegram-desktop/files/patch-Telegram_cmake_lib__tgvoip.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property