From nobody Thu Sep 28 15:50:06 2023 X-Original-To: dev-commits-ports-main@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 4RxHxB63pvz4txm8; Thu, 28 Sep 2023 15:50:06 +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 4RxHxB5VYNz4JP4; Thu, 28 Sep 2023 15:50:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695916206; 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=tubfm8b6k71JGggIhn6LbcPxpDJiZnvlwb3pMlha0KU=; b=uj9xuNpP/MH0EsTPYF7RGtO7S/d4Yru2MuwkEDWsPj0S0Rdjbq+eDjMA4Eb6FkuLZrOA6b 13rh0Gohu2R3hhIUWVQHtaYjRXh1yo3OLo0BSrDbS+jzA2TLaszkypqX7jYutpaitfV06N euEbIJJ3Z2mTJW5mHnL6BoSTypJaV0Tc8St8mRXEFbkQLl8BzMS/D+4CtsXoy7P4KKiWpN mM3uB7s7ATgV1NxUAFbaZUpKgnm1MyYJNpSqw3kFMW4EfT3b0FMVqXCHvBV1KIT431w+jN mI1fnSiMG3dge9Lj6gntIPTtNc40s0RQYAv+vammXL+oCK+PMvDG1AaszWYCKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695916206; a=rsa-sha256; cv=none; b=qNy2CAJ0xDBDri5OS6u+7VOq7LFpgGOk3DGHPnMP6y5n7mPjFYKxpPx7V+IF6epTOk6FPh oCx4qCMX0HLzWr6MBVrIiJCFdk2CfXVPvlHrvQZTiRK62Df/v5TGRhPIx0AJ8icXyyq3/E BpdujYFpJe1kn9CGbSu0iohudBm8G+ai3bAmXtFYpaTtTNOrDjANQBGzaDjgzTiSIfum9O XI2AGrbevLBtLbwB6gtSkIfykaJlSQ9dC2FNRi2nKEoL/s6D/TmP0ugks5RaGQ2eHvN2OT CoZ9Tsl7s97DrIofCp/dMxv03AukpaJUoFU5O2dX0hxPHwZhGQVW7jqd8on1QQ== 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=1695916206; 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=tubfm8b6k71JGggIhn6LbcPxpDJiZnvlwb3pMlha0KU=; b=IDAXglLWwlYLJ66w2CWk7WsUbrsHROYoqN+SnuczpJITamzlKK9sJcFPrHcDcs8nB+ZBuV KLWGvznsFsU2XNBxB2qgN72XplfO47qQEDkLMem2OZ6COH6d0qAXyHwRDX1lMCNeAfw9xk XXm4TdBK07VzHeD34EoqUqwGhX4/4Llhs8NQicY9s5pROurnEd6kWAt5on/LgDg3RUD/5E LLszExVoG5V+FNphl5lGYb5/qDiD9FgbuOp//uivTRxMdNxP8lksm2RaAS51OSf2vU6MX0 I3YKbDKnRRX/IQsW5ofdUXewh6gTqPKPMajfwwFOZjrgWmZ6PjRBwQSvYU34hA== 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 4RxHxB4Y20zCmP; Thu, 28 Sep 2023 15:50: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 38SFo6bk008602; Thu, 28 Sep 2023 15:50:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38SFo64e008597; Thu, 28 Sep 2023 15:50:06 GMT (envelope-from git) Date: Thu, 28 Sep 2023 15:50:06 GMT Message-Id: <202309281550.38SFo64e008597@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: bb380e5977be - main - net-im/telegram-desktop: update to 4.9.8 release List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb380e5977be982aa76428ba052632036cd51d32 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb380e5977be982aa76428ba052632036cd51d32 commit bb380e5977be982aa76428ba052632036cd51d32 Author: Dima Panov AuthorDate: 2023-09-28 15:43:15 +0000 Commit: Dima Panov CommitDate: 2023-09-28 15:49:49 +0000 net-im/telegram-desktop: update to 4.9.8 release * Backport webview patches from upstream * Fix build with qt5, required #include is still provided by QtServiceSupport module but moved to QtGui in Qt6 PR: 274143 --- net-im/telegram-desktop/Makefile | 7 ++-- net-im/telegram-desktop/distinfo | 6 +-- ...w_platform_linux_webview__linux__compositor.cpp | 14 +++++++ ...ew_platform_linux_webview__linux__webkitgtk.cpp | 48 ++++++++++++++++++++++ .../files/patch-cmake_external_qt_CMakeLists.txt | 44 ++++++++++++++++++++ .../files/patch-cmake_external_qt_package.cmake | 11 +++++ 6 files changed, 123 insertions(+), 7 deletions(-) diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index 83722a378102..d104f840c0a7 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,6 +1,5 @@ PORTNAME= telegram-desktop -DISTVERSION= 4.9.3 -PORTREVISION= 1 +DISTVERSION= 4.9.8 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full @@ -60,7 +59,7 @@ GH_PROJECT= tdesktop .if ${FLAVOR} == qt5 USES+= kde:5 qt:5 -USE_QT= buildtools:build core dbus gui imageformats network qmake:build \ +USE_QT= buildtools:build core dbus declarative gui imageformats network qmake:build \ svg wayland widgets USE_KDE= coreaddons kimageformats .else @@ -106,7 +105,7 @@ TELEGRAM_API_ID= 601761 .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079 -USES+= llvm:build +USES+= llvm:max=15,build .else USES+= compiler:c++20-lang .endif diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo index ee9cbae15235..69c861bf77d0 100644 --- a/net-im/telegram-desktop/distinfo +++ b/net-im/telegram-desktop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1695648456 -SHA256 (tdesktop-4.9.3-full.tar.gz) = 2ef462651d397d807576f5df3a5d3de2764accf8d155a0b4d576a354a614d107 -SIZE (tdesktop-4.9.3-full.tar.gz) = 69517868 +TIMESTAMP = 1695904525 +SHA256 (tdesktop-4.9.8-full.tar.gz) = af041ecb623ee7603781e0ff2b262e15bb8de2858a9a42982a10396bc9014d53 +SIZE (tdesktop-4.9.8-full.tar.gz) = 73655253 diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__compositor.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__compositor.cpp new file mode 100644 index 000000000000..c46fa3c11634 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__compositor.cpp @@ -0,0 +1,14 @@ +--- Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.cpp.orig 2023-09-22 07:01:01 UTC ++++ Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.cpp +@@ -199,8 +199,9 @@ Compositor::Compositor() + const auto output = new Output(this, xdgSurface); + + output->chrome().surfaceCompleted() | rpl::start_with_next([=] { +- const auto parent = qvariant_cast( +- popup->parentXdgSurface()->property("output"))->window(); ++ const auto parent = (*static_cast( ++ popup->parentXdgSurface()->property("output").constData() ++ ))->window(); + if (_private->widget + && parent == _private->widget->quickWindow()) { + output->window()->setTransientParent( diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkitgtk.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkitgtk.cpp new file mode 100644 index 000000000000..3a97b98103f6 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_lib__webview_webview_platform_linux_webview__linux__webkitgtk.cpp @@ -0,0 +1,48 @@ +--- Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk.cpp.orig 2023-09-22 07:01:01 UTC ++++ Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk.cpp +@@ -33,6 +33,13 @@ constexpr auto kHelperObjectPath = "/org/desktop_app/G + constexpr auto kMasterObjectPath = "/org/desktop_app/GtkIntegration/Webview/Master"; + constexpr auto kHelperObjectPath = "/org/desktop_app/GtkIntegration/Webview/Helper"; + ++void (* const SetGraphicsApi)(QSGRendererInterface::GraphicsApi) = ++#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) ++ QQuickWindow::setGraphicsApi; ++#else // Qt >= 6.0.0 ++ QQuickWindow::setSceneGraphBackend; ++#endif // Qt < 6.0.0 ++ + std::string SocketPath; + + inline std::string SocketPathToDBusAddress(const std::string &socketPath) { +@@ -116,12 +123,10 @@ Instance::Instance(bool remoting) + Ui::GL::CheckCapabilities(nullptr)); + switch (backend) { + case Ui::GL::Backend::Raster: +- QQuickWindow::setGraphicsApi( +- QSGRendererInterface::Software); ++ SetGraphicsApi(QSGRendererInterface::Software); + break; + case Ui::GL::Backend::OpenGL: +- QQuickWindow::setGraphicsApi( +- QSGRendererInterface::OpenGL); ++ SetGraphicsApi(QSGRendererInterface::OpenGL); + break; + } + return true; +@@ -637,11 +642,11 @@ void Instance::setOpaqueBg(QColor opaqueBg) { + return; + } + +- GdkRGBA rgba{ +- opaqueBg.redF(), +- opaqueBg.greenF(), +- opaqueBg.blueF(), +- opaqueBg.alphaF(), ++ const GdkRGBA rgba{ ++ float(opaqueBg.redF()), ++ float(opaqueBg.greenF()), ++ float(opaqueBg.blueF()), ++ float(opaqueBg.alphaF()), + }; + webkit_web_view_set_background_color( + WEBKIT_WEB_VIEW(_webview), 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 new file mode 100644 index 000000000000..3604617e930c --- /dev/null +++ b/net-im/telegram-desktop/files/patch-cmake_external_qt_CMakeLists.txt @@ -0,0 +1,44 @@ +--- 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) + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate ++ $ ++ $ + $ + Qt::Widgets + Qt::WidgetsPrivate +@@ -36,6 +38,7 @@ INTERFACE + ${qt_loc}/include + ${qt_loc}/include/QtCore + ${qt_loc}/include/QtGui ++ $<$:${qt_loc}/include/QtServiceSupport> + $<$:${qt_loc}/include/QtOpenGL> + ${qt_loc}/include/QtWidgets + $<$:${qt_loc}/include/QtOpenGLWidgets> +@@ -46,9 +49,11 @@ INTERFACE + $<$:${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 + ) + +@@ -92,6 +97,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 new file mode 100644 index 000000000000..9c9fe0c93f1d --- /dev/null +++ b/net-im/telegram-desktop/files/patch-cmake_external_qt_package.cmake @@ -0,0 +1,11 @@ +--- cmake/external/qt/package.cmake.orig 2023-09-13 17:06:28 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() + 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