From nobody Fri Jun 7 17:43:06 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VwpSq03FKz5LwSm; Fri, 07 Jun 2024 17:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VwpSp6Y4Xz51D2; Fri, 7 Jun 2024 17:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717782186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ztshAxE1RM5CqO/8n7FWgwvyp5DzzPHfO4g8nJ7qA6E=; b=bLfb58fnwtdWAY4LAZyUuPpy8SoklMiXYyvOVAH1GvTYv0zSQLGers40rDFMrKjbNfJ6Oh GixAeJPHwVyPRF6iLImJMQkrDiGBshHKQ1vrh7Tk1hPhojLSwNlJnmcTrzZbglf+KiAVgh 6LwNiAtdh2WRFpFWfFrBlSzpwiVa6Oqg6JvtXhhtJNIfmXIxeFLLkK/Vf+0OfRkXNE5dMn Yt3h6Td/UDzQlbYeG7Y0/RACfz8LuZ/JhIaVm9LG39oWdUHNHFp8AQel1MDLCeorQPcVzD suH5W4471uh66t0pZ1z11+4sF3QzGI0rucppQRR6EpJ+sEb40FcAoQsqlV1LTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717782186; a=rsa-sha256; cv=none; b=D/zUPRcAFhngyQGrbJysbdWRmQNa0ZsAQUC5TcFM0ocCILWLx3DaBsjCB0uLvtm+izdpdR XjLaB86ZMB0/uSoCiAqCImJAk3jt3AIbzYGi/kj+Voom+duC+ObddAfgT3s4WzOoouvZdt D1D5V+vpCqQqR867akL7R+ZNV6xtrS72VhBlV0QkKSZJxR2L2FejYW/h9SaTfjAK52EVNV tqv/FAx4PbltWmZMJf5cAeoCAN/TysCfOFGwAHzm629/j1DGy/C9CdFLloO2GCULiYAyUe 2MdH+g2iOzx3sEm9ptxNOcDcEVBiKVQQcGSYSBly1tC+2bCx2h9+hJ1WNxGjKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717782186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ztshAxE1RM5CqO/8n7FWgwvyp5DzzPHfO4g8nJ7qA6E=; b=vTBMJWTSFxltjhWIT61OIqfaiLIn3vN7QK1OqbGpOls8cDuDOsMCmxpiL1GwczwYCG7/IL CssyphiI0S5+M8G0sbTr36SQFOzpmHV7cHBgQB3pVYVkrcMVVHBQ92+FskCx0JHHCx42KA DJacTroObiPLsHh510uLsSUjeHIjOK/MedDSr+KSM3knJ/BpE9ENp0jp87Ep4TGLnjdB92 6O9q5TrsljNWT4333fYzgK5p77ULIl1O4Z3HpAF58V+PPkf6Q607Mz3MIcDDchJHAGBFNO sp/Uuunk7OnacUWL3tP9gjLc9WP7GUXSPTXShMd06aeRayb2IPT2uBqvv98T1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VwpSp68rjzN6R; Fri, 7 Jun 2024 17:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 457Hh6LJ075236; Fri, 7 Jun 2024 17:43:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 457Hh60M075233; Fri, 7 Jun 2024 17:43:06 GMT (envelope-from git) Date: Fri, 7 Jun 2024 17:43:06 GMT Message-Id: <202406071743.457Hh60M075233@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: d476642d5321 - main - net-im/telegram-desktop: update 5.1.2 -> 5.1.5 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d476642d5321b4430d3f8098d3016f1aabe77f56 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=d476642d5321b4430d3f8098d3016f1aabe77f56 commit d476642d5321b4430d3f8098d3016f1aabe77f56 Author: Sergey A. Osokin AuthorDate: 2024-06-07 17:39:15 +0000 Commit: Sergey A. Osokin 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)