diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index 03b0860b213a..2ca507a22e7b 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,126 +1,120 @@ PORTNAME= telegram-desktop -DISTVERSION= 4.8.4 -PORTREVISION= 4 +DISTVERSION= 4.9.3 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= ports@FreeBSD.org COMMENT= Telegram Desktop messaging app WWW= https://desktop.telegram.org/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= does not build, webrtc related BROKEN_SSL= openssl30 openssl31 BROKEN_SSL_REASON= undefined symbol: ERR_load_BIO_strings NOT_FOR_ARCHS= powerpc powerpc64 powerpcspe NOT_FOR_ARCHS_REASON= Only little endian is supported BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ microsoft-gsl>0:devel/microsoft-gsl \ range-v3>0:devel/range-v3 \ tl-expected>0:devel/tl-expected \ v4l_compat>0:multimedia/v4l_compat \ yasm:devel/yasm \ ${LOCALBASE}/lib/libtg_owt.a:net-im/tg_owt LIB_DEPENDS= libabsl_base.so:devel/abseil \ libavformat.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ libdispatch.so:devel/libdispatch \ libfmt.so:devel/libfmt \ libhunspell-1.7.so:textproc/hunspell \ liblz4.so:archivers/liblz4 \ libopenh264.so:multimedia/openh264 \ libopus.so:audio/opus \ libpipewire-0.3.so:multimedia/pipewire \ libprotobuf.so:devel/protobuf \ libqrcodegencpp.so:graphics/qr-code-generator \ librnnoise.so:audio/rnnoise \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxkbcommon.so:x11/libxkbcommon \ libxxhash.so:devel/xxhash \ libvpx.so:multimedia/libvpx FLAVORS= qt5 qt6 FLAVOR?= ${FLAVORS:[1]} qt5_PKGNAMESUFFIX= qt6_PKGNAMESUFFIX= -qt6 qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 qt6_CONFLICTS_INSTALL= ${PORTNAME} USES= cmake desktop-file-utils gl gnome jpeg localbase \ minizip openal pkgconfig python:build ssl xorg -USE_CXXSTD= c++17 USE_GITHUB= nodefault GH_ACCOUNT= telegramdesktop GH_PROJECT= tdesktop .if ${FLAVOR} == qt5 USES+= kde:5 qt:5 USE_QT= buildtools:build core dbus gui imageformats network qmake:build \ svg wayland widgets USE_KDE= coreaddons kimageformats .else USES+= qt:6 USE_QT= 5compat base imageformats lottie shadertools svg tools:build wayland .endif USE_GL= gl USE_GNOME= glib20 glibmm26 introspection USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst CMAKE_ARGS= -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \ DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION # Since cmake 3.25.0, BSDs are no longer recognised as Linux (in this port). CMAKE_ARGS+= -DLINUX=true # libdispatch components LDFLAGS+= -lBlocksRuntime # 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_DEFINE= SYSTEM_FONTS OPTIONS_DEFAULT= ALSA OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO AUDIO_DESC= Audio backend for voice calls SYSTEM_FONTS_DESC= Use system fonts instead of bundled patched ones ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio ALSA_CMAKE_BOOL_OFF= LIBTGVOIP_DISABLE_ALSA PULSEAUDIO_CMAKE_BOOL_OFF= LIBTGVOIP_DISABLE_PULSEAUDIO SYSTEM_FONTS_CMAKE_BOOL_OFF= DESKTOP_APP_USE_PACKAGED_FONTS # Telegram asks each custom build to have its own API ID and hash. TELEGRAM_API_HASH= 20a3432aab43f24bb4460fceac5ba38d TELEGRAM_API_ID= 601761 .include -.if ${OSVERSION} > 1400000 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079 USES+= llvm:build -CC= ${_LLVM_MK_PREFIX}/bin/clang -CPP= ${_LLVM_MK_PREFIX}/bin/clang-cpp -CXX= ${_LLVM_MK_PREFIX}/bin/clang++ -#LD?= ${_LLVM_MK_PREFIX}/bin/ld .else -USES+= compiler:c++17-lang +USES+= compiler:c++20-lang .endif post-patch: # XXX fix the following on every source file # warning: unknown warning option '-Wno-maybe-uninitialized' # warning: argument unused during compilation: '-fstack-clash-protection' ${REINPLACE_CMD} -e /-Wno-maybe-uninitialized/d -e /-fstack-clash-protection/d \ ${WRKSRC}/cmake/options_linux.cmake .include diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo index f343cf8ca583..ee9cbae15235 100644 --- a/net-im/telegram-desktop/distinfo +++ b/net-im/telegram-desktop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687099818 -SHA256 (tdesktop-4.8.4-full.tar.gz) = 4328296df07557786e1b9cf22f6675200dbdf29c75d2efeb635c6b7f3f951e8d -SIZE (tdesktop-4.8.4-full.tar.gz) = 69090626 +TIMESTAMP = 1695648456 +SHA256 (tdesktop-4.9.3-full.tar.gz) = 2ef462651d397d807576f5df3a5d3de2764accf8d155a0b4d576a354a614d107 +SIZE (tdesktop-4.9.3-full.tar.gz) = 69517868 diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__system__media__controls__linux.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__system__media__controls__linux.cpp deleted file mode 100644 index 0f126e486ec7..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__system__media__controls__linux.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- Telegram/lib_base/base/platform/linux/base_system_media_controls_linux.cpp.orig 2023-06-03 03:29:41 UTC -+++ Telegram/lib_base/base/platform/linux/base_system_media_controls_linux.cpp -@@ -16,11 +16,12 @@ - #include - #include - --using namespace gi::repository; -- - namespace base::Platform { - - namespace { -+ -+using namespace gi::repository; -+namespace GObject = gi::repository::GObject; - - // QString to GLib::Variant. - inline auto Q2V(const QString &s) { diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_CMakeLists.txt b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_CMakeLists.txt deleted file mode 100644 index 41ca852809b2..000000000000 --- a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake/external/glib/cppgir/CMakeLists.txt.orig 2023-05-17 06:10:31 UTC -+++ cmake/external/glib/cppgir/CMakeLists.txt -@@ -65,8 +65,8 @@ target_compile_definitions(cppgir PRIVATE - -DDEFAULT_GIRPATH=${GI_DEFAULT_GIRPATH}) - target_compile_definitions(cppgir PRIVATE - -DDEFAULT_IGNORE_FILE=${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE}:${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE_PLATFORM}) --target_link_libraries(cppgir Boost::program_options stdc++fs ${FORMAT_LIBRARIES}) --set_property(TARGET cppgir PROPERTY CXX_STANDARD 14) -+target_link_libraries(cppgir Boost::program_options ${FORMAT_LIBRARIES}) -+set_property(TARGET cppgir PROPERTY CXX_STANDARD 17) - - add_library(gi INTERFACE) - target_include_directories(gi INTERFACE diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_cppgir.cpp b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_cppgir.cpp deleted file mode 100644 index 41e57cfe1ef5..000000000000 --- a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_cppgir.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake/external/glib/cppgir/tools/cppgir.cpp.orig 2023-06-15 00:49:41 UTC -+++ cmake/external/glib/cppgir/tools/cppgir.cpp -@@ -3,8 +3,8 @@ - #include "genns.hpp" - #include "repository.hpp" - --#include --namespace fs = std::experimental::filesystem; -+#include -+namespace fs = std::filesystem; - - #include - #include diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_function.hpp b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_function.hpp deleted file mode 100644 index 6875de52fc6a..000000000000 --- a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_function.hpp +++ /dev/null @@ -1,8 +0,0 @@ ---- cmake/external/glib/cppgir/tools/function.hpp.orig 2023-06-15 00:41:50 UTC -+++ cmake/external/glib/cppgir/tools/function.hpp -@@ -1,3 +1,5 @@ -+#include -+ - #ifndef FUNCTION_HPP - #define FUNCTION_HPP - diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genbase.cpp b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genbase.cpp deleted file mode 100644 index ef2e474ce9ff..000000000000 --- a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genbase.cpp +++ /dev/null @@ -1,8 +0,0 @@ ---- cmake/external/glib/cppgir/tools/genbase.cpp.orig 2023-06-15 00:42:39 UTC -+++ cmake/external/glib/cppgir/tools/genbase.cpp -@@ -1,3 +1,5 @@ -+#include -+ - #include "genbase.hpp" - - static std::string diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genns.cpp b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genns.cpp deleted file mode 100644 index 8262affc33f2..000000000000 --- a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genns.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake/external/glib/cppgir/tools/genns.cpp.orig 2023-06-15 00:40:47 UTC -+++ cmake/external/glib/cppgir/tools/genns.cpp -@@ -5,8 +5,8 @@ - #include - #include - --#include --namespace fs = std::experimental::filesystem; -+#include -+namespace fs = std::filesystem; - - #include - diff --git a/net-im/telegram-desktop/pkg-plist b/net-im/telegram-desktop/pkg-plist index 106d6671dbba..e3e83819267c 100644 --- a/net-im/telegram-desktop/pkg-plist +++ b/net-im/telegram-desktop/pkg-plist @@ -1,10 +1,11 @@ bin/telegram-desktop share/applications/org.telegram.desktop.desktop +share/dbus-1/services/org.telegram.desktop.service share/icons/hicolor/128x128/apps/telegram.png share/icons/hicolor/16x16/apps/telegram.png share/icons/hicolor/256x256/apps/telegram.png share/icons/hicolor/32x32/apps/telegram.png share/icons/hicolor/48x48/apps/telegram.png share/icons/hicolor/512x512/apps/telegram.png share/icons/hicolor/64x64/apps/telegram.png share/metainfo/org.telegram.desktop.metainfo.xml