diff options
Diffstat (limited to 'net-im/telegram-desktop')
7 files changed, 13 insertions, 99 deletions
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index c9787ff7d773..424c1c568688 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,14 +1,10 @@ PORTNAME= telegram-desktop -DISTVERSION= 5.14.1 -PORTREVISION= 1 +DISTVERSION= 6.1.2 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -PATCH_SITES= https://github.com/telegramdesktop/tdesktop/commit/ -PATCHFILES= f676d32f96e70874d9d8e78788c37b82b1e3324a.patch:-p1 - MAINTAINER= ports@FreeBSD.org COMMENT= Telegram Desktop messaging app WWW= https://desktop.telegram.org/ @@ -28,6 +24,7 @@ BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ tl-expected>0:devel/tl-expected \ v4l_compat>0:multimedia/v4l_compat \ yasm:devel/yasm \ + ${LOCALBASE}/lib/libtde2e.a:net-im/tde2e \ ${LOCALBASE}/lib/libtg_owt.a:net-im/tg_owt LIB_DEPENDS= libabsl_base.so:devel/abseil \ libada.so:devel/libada \ @@ -38,7 +35,9 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libfmt.so:devel/libfmt \ libgeoclue-2.so:net/geoclue \ libgeocode-glib-2.so:net/geocode-glib2 \ + libheif.so:graphics/libheif \ libhunspell-1.7.so:textproc/hunspell \ + libjxl.so:graphics/libjxl \ liblz4.so:archivers/liblz4 \ libopenh264.so:multimedia/openh264 \ libopus.so:audio/opus \ @@ -47,7 +46,6 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libqrcodegencpp.so:graphics/qr-code-generator \ librnnoise.so:audio/rnnoise \ libsrtp2.so:net/libsrtp2 \ - libtde2e.so:net-im/tdlib \ libxxhash.so:devel/xxhash \ libvpx.so:multimedia/libvpx @@ -66,9 +64,10 @@ USE_GNOME= glib20 glibmm26 introspection CMAKE_ARGS= -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \ -DQT_VERSION_MAJOR=6 -CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \ - DESKTOP_APP_DISABLE_JEMALLOC \ - DESKTOP_APP_DISABLE_SCUDO +# The order of the variables is important here due to complex combination validation +CMAKE_ON= DESKTOP_APP_USE_PACKAGED \ + DESKTOP_APP_DISABLE_CRASH_REPORTS \ + DESKTOP_APP_DISABLE_QT_PLUGINS # Since cmake 3.25.0, BSDs are no longer recognised as Linux (in this port). CMAKE_ARGS+= -DLINUX=true @@ -92,14 +91,11 @@ 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 -WAYLAND_CMAKE_BOOL_OFF= DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION WAYLAND_USE= qt=wayland X11_CMAKE_BOOL_OFF= DESKTOP_APP_DISABLE_X11_INTEGRATION X11_USES= xorg -X11_USE= xorg=x11,xcb,xcomposite,xdamage,xext,xfixes,xrandr,xrender,xtst +X11_USE= xorg=x11,xcb,xcomposite,xdamage,xext,xfixes,xrandr,xtst X11_LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms \ libxkbcommon.so:x11/libxkbcommon diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo index 397a77ea5471..2b48eb066d94 100644 --- a/net-im/telegram-desktop/distinfo +++ b/net-im/telegram-desktop/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1746300493 -SHA256 (tdesktop-5.14.1-full.tar.gz) = 42d3130292b21928f04e39539f4e7358206bde913ea6e5171b0ffdeb38b9872e -SIZE (tdesktop-5.14.1-full.tar.gz) = 72779847 -SHA256 (f676d32f96e70874d9d8e78788c37b82b1e3324a.patch) = a3b6ad6badcbfeb9af01a3d7591c433779c2fea99d57c735ed8a6beed549e5ce -SIZE (f676d32f96e70874d9d8e78788c37b82b1e3324a.patch) = 862 +TIMESTAMP = 1757077918 +SHA256 (tdesktop-6.1.2-full.tar.gz) = efb92b09d7531ca7e29f27adef472e5207fe2b66e18499fa74d1b693211cfcce +SIZE (tdesktop-6.1.2-full.tar.gz) = 75265146 diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_webview__data__stream__memory.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_webview__data__stream__memory.cpp deleted file mode 100644 index 4fb6549d2bce..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_webview__data__stream__memory.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- Telegram/lib_webview/webview/webview_data_stream_memory.cpp.orig 2025-02-13 17:00:08 UTC -+++ Telegram/lib_webview/webview/webview_data_stream_memory.cpp -@@ -8,6 +8,7 @@ - - #if !defined Q_OS_WIN && !defined Q_OS_MAC - #include <sys/mman.h> -+#include <unistd.h> - #endif // !Q_OS_WIN && !Q_OS_MAC - - namespace Webview { diff --git a/net-im/telegram-desktop/files/patch-cmake_external_qt_CMakeLists.txt b/net-im/telegram-desktop/files/patch-cmake_external_qt_CMakeLists.txt deleted file mode 100644 index 89ab8b613ef6..000000000000 --- a/net-im/telegram-desktop/files/patch-cmake_external_qt_CMakeLists.txt +++ /dev/null @@ -1,44 +0,0 @@ ---- cmake/external/qt/CMakeLists.txt.orig 2024-10-11 07:45:28 UTC -+++ cmake/external/qt/CMakeLists.txt -@@ -16,6 +16,8 @@ if (DESKTOP_APP_USE_PACKAGED) - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate -+ $<TARGET_NAME_IF_EXISTS:Qt::ServiceSupport> -+ $<TARGET_NAME_IF_EXISTS:Qt::ServiceSupportPrivate> - $<TARGET_NAME_IF_EXISTS:Qt::OpenGL> - Qt::Widgets - Qt::WidgetsPrivate -@@ -36,6 +38,7 @@ INTERFACE - ${qt_loc}/include - ${qt_loc}/include/QtCore - ${qt_loc}/include/QtGui -+ $<$<TARGET_EXISTS:Qt::ServiceSupport>:${qt_loc}/include/QtServiceSupport> - $<$<TARGET_EXISTS:Qt::OpenGL>:${qt_loc}/include/QtOpenGL> - ${qt_loc}/include/QtWidgets - $<$<TARGET_EXISTS:Qt::OpenGLWidgets>:${qt_loc}/include/QtOpenGLWidgets> -@@ -46,9 +49,11 @@ INTERFACE - $<$<TARGET_EXISTS:Qt::WaylandCompositor>:${qt_loc}/include/QtWaylandCompositor> - ${qt_loc}/include/QtCore/${QT_VERSION} - ${qt_loc}/include/QtGui/${QT_VERSION} -+ ${qt_loc}/include/QtServiceSupport/${qt_version} - ${qt_loc}/include/QtWidgets/${QT_VERSION} - ${qt_loc}/include/QtCore/${QT_VERSION}/QtCore - ${qt_loc}/include/QtGui/${QT_VERSION}/QtGui -+ ${qt_loc}/include/QtServiceSupport/${qt_version}/QtServiceSupport - ${qt_loc}/include/QtWidgets/${QT_VERSION}/QtWidgets - ) - -@@ -97,6 +102,12 @@ set(common_qt_libs - lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}Gui - lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}Core - ) -+ -+if (TARGET Qt::ServiceSupport) -+ list(PREPEND common_qt_libs -+ lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}ServiceSupport -+ ) -+endif() - - if (TARGET Qt::OpenGL) - list(PREPEND common_qt_libs diff --git a/net-im/telegram-desktop/files/patch-cmake_external_qt_package.cmake b/net-im/telegram-desktop/files/patch-cmake_external_qt_package.cmake deleted file mode 100644 index 06e5d4af10e9..000000000000 --- a/net-im/telegram-desktop/files/patch-cmake_external_qt_package.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/external/qt/package.cmake.orig 2025-05-01 07:59:09 UTC -+++ cmake/external/qt/package.cmake -@@ -69,6 +69,8 @@ if (QT_VERSION_MAJOR GREATER_EQUAL 6) - - if (QT_VERSION_MAJOR GREATER_EQUAL 6) - find_package(Qt${QT_VERSION_MAJOR} COMPONENTS OpenGL OpenGLWidgets REQUIRED) -+else() -+ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ServiceSupport REQUIRED) - endif() - - if (LINUX) diff --git a/net-im/telegram-desktop/files/patch-cmake_external_td_CMakeLists.txt b/net-im/telegram-desktop/files/patch-cmake_external_td_CMakeLists.txt deleted file mode 100644 index 6bee7cb39b28..000000000000 --- a/net-im/telegram-desktop/files/patch-cmake_external_td_CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- cmake/external/td/CMakeLists.txt.orig 2025-05-01 07:59:09 UTC -+++ cmake/external/td/CMakeLists.txt -@@ -7,6 +7,12 @@ add_library(desktop-app::external_td ALIAS external_td - add_library(external_td INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_td ALIAS external_td) - -+if (DESKTOP_APP_USE_PACKAGED) -+ find_package(Td REQUIRED) -+ target_link_libraries(external_td INTERFACE Td::tde2e) -+ return() -+endif() -+ - set(td_loc ${libs_loc}/td) - set(td_build_loc ${td_loc}/out/$<IF:$<CONFIG:Debug>,Debug,Release>) - if (WIN32) diff --git a/net-im/telegram-desktop/pkg-plist b/net-im/telegram-desktop/pkg-plist index eb0a5baffd4d..6b7179b9038e 100644 --- a/net-im/telegram-desktop/pkg-plist +++ b/net-im/telegram-desktop/pkg-plist @@ -1,4 +1,4 @@ -bin/telegram-desktop +bin/Telegram share/applications/org.telegram.desktop.desktop share/dbus-1/services/org.telegram.desktop.service share/icons/hicolor/128x128/apps/org.telegram.desktop.png |