diff options
Diffstat (limited to 'net-im/telegram-desktop')
6 files changed, 12 insertions, 92 deletions
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index 3735ffaed5f4..d3f68c246e88 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,6 +1,5 @@ PORTNAME= telegram-desktop -DISTVERSION= 5.13.1 -PORTREVISION= 7 +DISTVERSION= 5.15.4 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full @@ -25,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 \ @@ -35,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 \ @@ -62,8 +64,11 @@ 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 \ +# 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_JEMALLOC \ + DESKTOP_APP_DISABLE_QT_PLUGINS \ DESKTOP_APP_DISABLE_SCUDO # Since cmake 3.25.0, BSDs are no longer recognised as Linux (in this port). diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo index 21a0070d466b..c0a80c6f5808 100644 --- a/net-im/telegram-desktop/distinfo +++ b/net-im/telegram-desktop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743084723 -SHA256 (tdesktop-5.13.1-full.tar.gz) = caa37bbf7d9fcdfecdb5f596f02a44becbe468ea5c6af7f3c670b61952744a80 -SIZE (tdesktop-5.13.1-full.tar.gz) = 72699182 +TIMESTAMP = 1749848341 +SHA256 (tdesktop-5.15.4-full.tar.gz) = 3705dc2ecf51e9290a565b7a06dcdfc5ecbac13ec536afe582f3411653ad50d9 +SIZE (tdesktop-5.15.4-full.tar.gz) = 76872146 diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__linux__xdp__utilities.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__linux__xdp__utilities.cpp deleted file mode 100644 index 25db4543f4ef..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__linux__xdp__utilities.cpp +++ /dev/null @@ -1,30 +0,0 @@ -Fix build with Qt >= 6.9.0 - -Backported from: https://github.com/desktop-app/lib_base/pull/268 - ---- Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp.orig 2025-02-25 06:14:47 UTC -+++ Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp -@@ -16,7 +16,11 @@ - #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) - #include <qpa/qplatformintegration.h> - #include <private/qguiapplication_p.h> -+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) -+#include <private/qdesktopunixservices_p.h> -+#else // Qt >= 6.9.0 - #include <private/qgenericunixservices_p.h> -+#endif // Qt < 6.9.0 - #endif // Qt >= 6.5.0 - - #include <sstream> -@@ -39,7 +43,10 @@ std::string ParentWindowID(QWindow *window) { - } - - #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) -- if (const auto services = dynamic_cast<QGenericUnixServices*>( -+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0) -+ using QDesktopUnixServices = QGenericUnixServices; -+#endif // Qt < 6.9.0 -+ if (const auto services = dynamic_cast<QDesktopUnixServices*>( - QGuiApplicationPrivate::platformIntegration()->services())) { - return services->portalWindowIdentifier(window).toStdString(); - } 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 aa1b987526cb..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 2024-10-11 07:45:28 UTC -+++ cmake/external/qt/package.cmake -@@ -66,6 +66,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/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 |