From d3f81d102b0c3c1ee05f66e6bd75066e45222a92 Mon Sep 17 00:00:00 2001 From: Sergey Kiselev Date: Fri, 27 Sep 2024 10:19:19 +0500 Subject: [PATCH] net-im/telegram-desktop: Update to version 5.5.5, port revision 2 --- net-im/telegram-desktop/Makefile | 9 +++---- net-im/telegram-desktop/distinfo | 6 ++--- .../patch-cmake_external_qt_CMakeLists.txt | 24 +++++++++---------- .../patch-cmake_external_qt_package.cmake | 10 ++++---- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index 8d2275f..6c9f7fb 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,6 +1,6 @@ PORTNAME= telegram-desktop -DISTVERSION= 5.1.7 -PORTREVISION= 1 +DISTVERSION= 5.5.5 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full @@ -26,6 +26,7 @@ BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ yasm:devel/yasm \ ${LOCALBASE}/lib/libtg_owt.a:net-im/tg_owt LIB_DEPENDS= libabsl_base.so:devel/abseil \ + libada.so:devel/libada \ libavformat.so:multimedia/ffmpeg \ libcrc32c.so:devel/crc32c \ libdbus-1.so:devel/dbus \ @@ -36,7 +37,7 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libopenh264.so:multimedia/openh264 \ libopus.so:audio/opus \ libpipewire-0.3.so:multimedia/pipewire \ - libprotobuf.so:devel/protobuf \ + libprotobuf-lite.so:devel/protobuf \ libqrcodegencpp.so:graphics/qr-code-generator \ librnnoise.so:audio/rnnoise \ libsrtp2.so:net/libsrtp2 \ @@ -115,7 +116,7 @@ TELEGRAM_API_ID= 601761 .include -.if ${OPSYS} == FreeBSD && ((${OSVERSION} >= 1400000 && ${OSVERSION} < 1400091) || ${OSVERSION} < 1302507) +.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400091) #EXTRA_PATCHES= ${PATCHDIR}/extra-patch-CMakeLists.txt USES+= llvm:min=16,build USES:= ${USES:Ncompiler\:*} # XXX avoid warnings diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo index 0d70199..86d968a 100644 --- a/net-im/telegram-desktop/distinfo +++ b/net-im/telegram-desktop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1701706520 -SHA256 (tdesktop-4.12.2-full.tar.gz) = 7e9e51ae9c40d5b8c964bcfe0e252e35980c6668327934d2270144405c519914 -SIZE (tdesktop-4.12.2-full.tar.gz) = 67796891 +TIMESTAMP = 1726331526 +SHA256 (tdesktop-5.5.5-full.tar.gz) = dc620831d16af9ee970325e32d689ff3272a7d2aa1966a3e2a1b87513c6f23eb +SIZE (tdesktop-5.5.5-full.tar.gz) = 70112426 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 index 3604617..861c87c 100644 --- a/net-im/telegram-desktop/files/patch-cmake_external_qt_CMakeLists.txt +++ b/net-im/telegram-desktop/files/patch-cmake_external_qt_CMakeLists.txt @@ -1,6 +1,6 @@ ---- cmake/external/qt/CMakeLists.txt.orig 2023-09-13 17:06:28 UTC -+++ cmake/external/qt/CMakeLists.txt -@@ -16,6 +16,8 @@ if (DESKTOP_APP_USE_PACKAGED) +--- cmake/external/qt/CMakeLists.txt.orig 2024-07-06 19:02:01.004763000 +0000 ++++ cmake/external/qt/CMakeLists.txt 2024-07-06 19:02:09.327771000 +0000 +@@ -16,6 +16,8 @@ Qt::CorePrivate Qt::Gui Qt::GuiPrivate @@ -9,7 +9,7 @@ $ Qt::Widgets Qt::WidgetsPrivate -@@ -36,6 +38,7 @@ INTERFACE +@@ -36,6 +38,7 @@ ${qt_loc}/include ${qt_loc}/include/QtCore ${qt_loc}/include/QtGui @@ -17,19 +17,19 @@ $<$:${qt_loc}/include/QtOpenGL> ${qt_loc}/include/QtWidgets $<$:${qt_loc}/include/QtOpenGLWidgets> -@@ -46,9 +49,11 @@ INTERFACE +@@ -46,9 +49,11 @@ $<$:${qt_loc}/include/QtWaylandCompositor> - ${qt_loc}/include/QtCore/${qt_version} - ${qt_loc}/include/QtGui/${qt_version} + ${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/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 + ${qt_loc}/include/QtWidgets/${QT_VERSION}/QtWidgets ) -@@ -92,6 +97,12 @@ set(common_qt_libs +@@ -97,6 +102,12 @@ lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}Gui lib/${qt_lib_prefix}Qt${QT_VERSION_MAJOR}Core ) 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 index 9c9fe0c..a8a901c 100644 --- a/net-im/telegram-desktop/files/patch-cmake_external_qt_package.cmake +++ b/net-im/telegram-desktop/files/patch-cmake_external_qt_package.cmake @@ -1,11 +1,11 @@ ---- cmake/external/qt/package.cmake.orig 2023-09-13 17:06:28 UTC +--- cmake/external/qt/package.cmake.orig 2024-05-16 08:52:10 UTC +++ cmake/external/qt/package.cmake -@@ -45,6 +45,8 @@ if (QT_VERSION_MAJOR GREATER_EQUAL 6) - set(qt_version_6_5_or_greater 1) - endif() +@@ -41,6 +41,8 @@ find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS + + 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() - # QtWaylandScanner cmake integration from Qt 6 is used + if (LINUX)