From nobody Sun Jan 05 02:13:42 2025 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 4YQgpZ4TM8z5k9SF; Sun, 05 Jan 2025 02:13:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YQgpZ3Wycz4qDt; Sun, 5 Jan 2025 02:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736043222; 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=4ETswIlBQCn8ezymMxiYI2ujdiZ8t4DTSYeFSdz7YfM=; b=tO+fKSR0V9/pVYsED3UoqZPDmhYBHAoVUxC/qRK7KeSxf/qK7BTzGKrlv6hgV7Eks6zDzA hh/7G8goxrdv3Ed3Q9TnGNPfmgIoV+Y4ZJUKA9FQizNP02EOX37hb4jBJWSP1sJXhfCauW eMCqqAsKvBesryz16cUs4zhNHWy2RVAIgNm+K98YazJ/snAT2xHLBPrrrFr56hdTKmy6gf o3j2X4EHHBhxUE07GaLV4DYNr7yOq/fucxSMci7ojO2v7gEt2JruP1IBYHWjHFHDx1/Aml r0bzTl5dp+MfXdZ3zFvMzbIHxJmCznfiUyI4NsGzWGM67EcJIG/OUVLs5Nvtsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736043222; 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=4ETswIlBQCn8ezymMxiYI2ujdiZ8t4DTSYeFSdz7YfM=; b=Rv8WCjYh6dAwSonwVDQW+5FRntGOxmaWUytcNTC1ctQnK2P4PjRoewsmL2DBjB7+tUo5b4 6FBFNEvz7LdI2lH4t+WYCq0RlUzp7qPh09doFBqgWVPZ1b8+G3WaCAurK2TxR6+ouNlnea U2t/ASI+ZFstS954cG6Kc/KPGSAY2eGRueKJCEcP82f36lxOnFI+635BoHBIlJJXCsuk/3 OTL0Kiyw9NZwnDP2xHx4cLHYmNJFe1ucQxZmETvB02+/hHnxlXvh2x20FNoqLCY3caY0ov p6yTvt82uDPFGSEZX3tuMftlM3npaOwyF+F5dIr9Q+rqWKjeNM9i4rZL6CKVEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736043222; a=rsa-sha256; cv=none; b=VV3FIumELSCs/9QYA6pjeKC+PCYVMmWMppp7yX37D58nlhCbB5L9MHc/0NPcjC/5jQ93lY XNvDvVNulMEWZlrfhOHr2eiknhhZZwvdklh9iVEo1SRaqZZvJ4sRMCnQFf3qqsPVfDJxRS Ylvcz5hm8wpaK18lGg1fHDe/KIzP7aVNZgvLM3380zBEKA+7wmIPwZPj1a0wfgcgHJwUCG IvOrd2F4IfbX9r2dbkyhoDAewRqVVCsU7DNG8Ds7nhbnaiIgWhcCrTFSqQABAzmKAjlwS2 Ez8e6WNmqlhFP3k74pZ2HawAlGFxvadrP1tNjJ+W9JIs3AqDXHaIbGJeqFf5JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YQgpZ2sRCz3cD; Sun, 05 Jan 2025 02:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5052Dg0M034381; Sun, 5 Jan 2025 02:13:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5052DgU8034378; Sun, 5 Jan 2025 02:13:42 GMT (envelope-from git) Date: Sun, 5 Jan 2025 02:13:42 GMT Message-Id: <202501050213.5052DgU8034378@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: 833301ea3ea4 - main - net-im/telegram-desktop: Remove Qt flavors 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 833301ea3ea4ca70a92a0c1694a068673115a337 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=833301ea3ea4ca70a92a0c1694a068673115a337 commit 833301ea3ea4ca70a92a0c1694a068673115a337 Author: Sergey A. Osokin AuthorDate: 2025-01-05 02:13:05 +0000 Commit: Sergey A. Osokin CommitDate: 2025-01-05 02:13:37 +0000 net-im/telegram-desktop: Remove Qt flavors Drop local Qt 5.x support for ease of maintainership and its eventual removal from the FreeBSD ports tree. Qt 5.x has been long deprecated upstream [1] and the FreeBSD kde@ team recommends using Qt 6.x for end-user applications whenever possible. [1] https://www.qt.io/blog/qt-5.15-support-ends Bump PORTREVISION. --- MOVED | 2 ++ net-im/telegram-desktop/Makefile | 22 ++++------------------ 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/MOVED b/MOVED index deba50b9a7bd..09e65ca3ab61 100644 --- a/MOVED +++ b/MOVED @@ -3998,3 +3998,5 @@ editors/neovim-qt@qt6|editors/neovim-qt|2025-01-02|Flavorization has been remove deskutils/copyq@qt5|deskutils/copyq|2025-01-02|Flavorization has been removed. Qt 5.x has been long deprecated upstream. Please use the unflavored deskutils/copyq port based on Qt 6.x instead deskutils/copyq@qt6|deskutils/copyq|2025-01-02|Flavorization has been removed. Continue to enjoy deskutils/copyq based on Qt 6.x as usual devel/py-pyls-black||2025-01-04|Repository has been archived by the owner. Use textproc/py-python-lsp-black instead +net-im/telegram-desktop@qt5|net-im/telegram-desktop|2025-01-05|Flavorization has been removed. Qt 5.x has been long deprecated upstream. Please use unflavored net-im/telegram-desktop port based on Qt 6.x instead +net-im/telegram-desktop@qt6|net-im/telegram-desktop|2025-01-05|Flavorization has been removed. Continue to enjoy editors/neovim-qt based on Qt 6.x as usual diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index 3eee56da7904..064bff8ababc 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,5 +1,6 @@ PORTNAME= telegram-desktop DISTVERSION= 5.10.0 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full @@ -44,36 +45,21 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libxxhash.so:devel/xxhash \ libvpx.so:multimedia/libvpx -FLAVORS= qt5 qt6 -FLAVOR?= ${FLAVORS:[1]} -qt5_PKGNAMESUFFIX= -qt6_PKGNAMESUFFIX= -qt6 -qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 -qt6_CONFLICTS_INSTALL= ${PORTNAME} - -USES= cmake compiler:c++20-lang desktop-file-utils gl gnome jpeg localbase \ - minizip openal pkgconfig python:build ssl +USES= cmake compiler:c++20-lang desktop-file-utils gl gnome jpeg kde:6 localbase \ + minizip openal pkgconfig python:build qt:6 ssl USE_GITHUB= nodefault GH_ACCOUNT= telegramdesktop GH_PROJECT= tdesktop -.if ${FLAVOR} == qt5 -USES+= kde:5 qt:5 -USE_QT= buildtools:build core dbus declarative gui imageformats network qmake:build \ - svg widgets -USE_KDE= coreaddons kimageformats -.else -USES+= kde:6 qt:6 USE_QT= 5compat base declarative imageformats lottie shadertools svg tools:build USE_KDE= coreaddons kimageformats -.endif USE_GL= gl USE_GNOME= glib20 glibmm26 introspection CMAKE_ARGS= -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \ - -DQT_VERSION_MAJOR=${FLAVOR:S/qt//} + -DQT_VERSION_MAJOR=6 CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \ DESKTOP_APP_DISABLE_JEMALLOC \ DESKTOP_APP_DISABLE_SCUDO