git: d476642d5321 - main - net-im/telegram-desktop: update 5.1.2 -> 5.1.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 07 Jun 2024 17:43:06 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d476642d5321b4430d3f8098d3016f1aabe77f56
commit d476642d5321b4430d3f8098d3016f1aabe77f56
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2024-06-07 17:39:15 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2024-06-07 17:43:02 +0000
net-im/telegram-desktop: update 5.1.2 -> 5.1.5
Update existing Qt package related patch.
Add webview patch. (*)
Obtained from: OpenBSD net/tdesktop port (*)
---
net-im/telegram-desktop/Makefile | 2 +-
net-im/telegram-desktop/distinfo | 6 +++---
...platform_linux_webview__linux__webkitgtk__library.cpp | 16 ++++++++++++++++
.../files/patch-cmake_external_qt_package.cmake | 10 +++++-----
4 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index cf4faa5eb82a..24fbfa60e75c 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -1,5 +1,5 @@
PORTNAME= telegram-desktop
-DISTVERSION= 5.1.2
+DISTVERSION= 5.1.5
CATEGORIES= net-im
MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
DISTNAME= tdesktop-${DISTVERSION}-full
diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo
index f0354ebe72ce..fc101086e395 100644
--- a/net-im/telegram-desktop/distinfo
+++ b/net-im/telegram-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1717449719
-SHA256 (tdesktop-5.1.2-full.tar.gz) = fcc1cb93e77c26b2575e3a2aa57bcea0c9e1ab4c9ce333849755c656394f6ac1
-SIZE (tdesktop-5.1.2-full.tar.gz) = 69535161
+TIMESTAMP = 1717767039
+SHA256 (tdesktop-5.1.5-full.tar.gz) = 3e542c6c90a153a0d225b1a4bc533ccb8a684f5fa3dc74512d86fb8b12af9cf2
+SIZE (tdesktop-5.1.5-full.tar.gz) = 69533393
diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkitgtk__library.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkitgtk__library.cpp
new file mode 100644
index 000000000000..9b56c747b4ee
--- /dev/null
+++ b/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)
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 9c9fe0c93f1d..a8a901c443d5 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)