Browse Source

net-im/telegram-desktop: update from 5.5.5 to 5.6.3

master
Sergey Kiselev 2 months ago
parent
commit
850bd8f71b
  1. 12
      net-im/telegram-desktop/Makefile
  2. 6
      net-im/telegram-desktop/distinfo
  3. 16
      net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkitgtk__library.cpp
  4. 12
      net-im/telegram-desktop/files/patch-cmake_external_qt_CMakeLists.txt
  5. 4
      net-im/telegram-desktop/files/patch-cmake_external_qt_package.cmake

12
net-im/telegram-desktop/Makefile

@ -1,6 +1,5 @@
PORTNAME= telegram-desktop
DISTVERSION= 5.5.5
PORTREVISION= 2
DISTVERSION= 5.6.3
CATEGORIES= net-im
MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
DISTNAME= tdesktop-${DISTVERSION}-full
@ -116,18 +115,11 @@ TELEGRAM_API_ID= 601761
.include <bsd.port.options.mk>
.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
.if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE)
.if ${OPSYS} == FreeBSD && defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE)
CMAKE_ARGS+= -DCMAKE_CC_COMPILER_LAUNCHER="${LOCALBASE}/bin/ccache" \
-DCMAKE_CPP_COMPILER_LAUNCHER="${LOCALBASE}/bin/ccache" \
-DCMAKE_CXX_COMPILER_LAUNCHER="${LOCALBASE}/bin/ccache"
.endif
#.else
#USES+= compiler:c++20-lang
.endif
post-extract:
# Some of the third-party components already built, and

6
net-im/telegram-desktop/distinfo

@ -1,3 +1,3 @@
TIMESTAMP = 1726331526
SHA256 (tdesktop-5.5.5-full.tar.gz) = dc620831d16af9ee970325e32d689ff3272a7d2aa1966a3e2a1b87513c6f23eb
SIZE (tdesktop-5.5.5-full.tar.gz) = 70112426
TIMESTAMP = 1729038898
SHA256 (tdesktop-5.6.3-full.tar.gz) = e32628184aa571f1051e1f8ac75a67455a07c1753a3be47bfb013994c941db15
SIZE (tdesktop-5.6.3-full.tar.gz) = 70333924

16
net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkitgtk__library.cpp

@ -0,0 +1,16 @@
--- Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp.orig 2024-06-07 13:31:52 UTC
+++ Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp
@@ -12,10 +12,10 @@ namespace Webview::WebKitGTK::Library {
ResolveResult Resolve(bool wayland) {
const auto lib = (wayland
- ? base::Platform::LoadLibrary("libwebkitgtk-6.0.so.4", RTLD_NODELETE)
+ ? base::Platform::LoadLibrary("libwebkitgtk-6.0.so", RTLD_NODELETE)
: nullptr)
- ?: base::Platform::LoadLibrary("libwebkit2gtk-4.1.so.0", RTLD_NODELETE)
- ?: base::Platform::LoadLibrary("libwebkit2gtk-4.0.so.37", RTLD_NODELETE);
+ ?: base::Platform::LoadLibrary("libwebkit2gtk-4.1.so", RTLD_NODELETE)
+ ?: base::Platform::LoadLibrary("libwebkit2gtk-4.0.so", RTLD_NODELETE);
const auto result = lib
&& LOAD_LIBRARY_SYMBOL(lib, gtk_init_check)
&& LOAD_LIBRARY_SYMBOL(lib, gtk_widget_get_type)

12
net-im/telegram-desktop/files/patch-cmake_external_qt_CMakeLists.txt

@ -1,6 +1,6 @@
--- 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 @@
--- 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
@ -9,7 +9,7 @@
$<TARGET_NAME_IF_EXISTS:Qt::OpenGL>
Qt::Widgets
Qt::WidgetsPrivate
@@ -36,6 +38,7 @@
@@ -36,6 +38,7 @@ INTERFACE
${qt_loc}/include
${qt_loc}/include/QtCore
${qt_loc}/include/QtGui
@ -17,7 +17,7 @@
$<$<TARGET_EXISTS:Qt::OpenGL>:${qt_loc}/include/QtOpenGL>
${qt_loc}/include/QtWidgets
$<$<TARGET_EXISTS:Qt::OpenGLWidgets>:${qt_loc}/include/QtOpenGLWidgets>
@@ -46,9 +49,11 @@
@@ -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}
@ -29,7 +29,7 @@
${qt_loc}/include/QtWidgets/${QT_VERSION}/QtWidgets
)
@@ -97,6 +102,12 @@
@@ -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
)

4
net-im/telegram-desktop/files/patch-cmake_external_qt_package.cmake

@ -1,6 +1,6 @@
--- cmake/external/qt/package.cmake.orig 2024-05-16 08:52:10 UTC
--- cmake/external/qt/package.cmake.orig 2024-10-11 07:45:28 UTC
+++ cmake/external/qt/package.cmake
@@ -41,6 +41,8 @@ find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS
@@ -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)

Loading…
Cancel
Save