From nobody Thu Nov 10 23:55:46 2022 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 4N7dyC0KtQz4dT7X; Thu, 10 Nov 2022 23:55:47 +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 4N7dyB6slyz4YgS; Thu, 10 Nov 2022 23:55:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668124547; 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=Jz0dqEFSuGHvkuCTjuiJdk4kuOiShV6Oh2XCTY4aRDc=; b=AuxQIo3uZfqeOQO91vHeMo0tni/dCgMxS80B34vtibTys2R606teEy2obDCGU5BpIHGRRU daFsXCciQ/Y303yy6DaRYK7+3WfvpMgk5U/Ka8FwqA1br6b/Rm43LSoXElPG+KHLA4FvQi UuOl2D9eAeZWScfm/31Yk7Z4Y8bLW9/Jf5OSggDjXFhfZDF3FZv/vAX++Rr3Xsma87XRPN HEIJ46Oz1QbWFb3t84TEfB84wWBpFMDoPQX5bUvF+SmOQQr8xXb11reZEiTPpE4b+cKbDh n4ZgE9uUjAND/GbCTTBu/putxQFrdJZFE28JvN359B53ZTsfl0LV6TxPZsAM5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668124547; 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=Jz0dqEFSuGHvkuCTjuiJdk4kuOiShV6Oh2XCTY4aRDc=; b=Dwt+CUEfp7WCMrykm2HKHZ+X5kdjaxi3zHHbA5sLA6BXLtbObHRsX/D0RkaGf0Naaf6LL1 nAMzXZih0MZRZQ/EwGga8RGIplQDnpeTEbhWOR/RLh1UAFajHsSBP6TFdPdw3mMwKUO1h5 U9GlC1ygVILHzi6zX5INFZdjEbEvERoDGHIAJofouYBcUrmN7XP9JpUvqFwFsZSJcwtXJ0 huFzaCRA43Htmktmcbkawt2QZYlVMASYutm+HFlm8YuDskl4SkB2NmEuVGXvTDDFvAJM7I gXPqZVyp5gVutIrGieFxLNnPbeDybbS5KjrJmzYk2QTlvPNB8I+AdZ/qgMrPxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668124547; a=rsa-sha256; cv=none; b=ZWn1vpAeVYMeRDJVW+dh9A5X/zWL+d5bgQYxQAegQMY7ZGpfGlTtVsmVFRYRYIPBt920z0 ibBG+5u0nBofidz1MqohtCc3KmM8klmiCf5aojgQGO/sN1PhEB5Hw9DAZ68qVFQRivIJp7 JyZl9oIOSxuVerOgFgXKiF/zu7NxdFG4dS2QkNalIpWdleyCgep1f/AluLTZkJ1Gc8hlpa 7VqqWVGyUN5UPWskweUGWybbzNTXgUtPWtpHMdzU9rkLqwUvQ9XmTu2uDrrNSN1GwsmmjV 4n45A2LtQZ3fgsdSVVvAOUbpfHJfhiESC2hPMmcmlF9IkyEHWYoHP2qwFVvN7w== 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 4N7dyB5vPYzLbG; Thu, 10 Nov 2022 23:55:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AANtkJ5099381; Thu, 10 Nov 2022 23:55:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AANtkLr099380; Thu, 10 Nov 2022 23:55:46 GMT (envelope-from git) Date: Thu, 10 Nov 2022 23:55:46 GMT Message-Id: <202211102355.2AANtkLr099380@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: b63891cb14b7 - main - net-im/telegram-desktop: revive Qt5/Qt6 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: 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: b63891cb14b7a6cfc4029f3954a09565c3e65ea7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b63891cb14b7a6cfc4029f3954a09565c3e65ea7 commit b63891cb14b7a6cfc4029f3954a09565c3e65ea7 Author: Dima Panov AuthorDate: 2022-11-10 23:47:21 +0000 Commit: Dima Panov CommitDate: 2022-11-10 23:47:21 +0000 net-im/telegram-desktop: revive Qt5/Qt6 flavors (+) * While building with Qt6, Telegram Desktop can use bundled kcoreutils and kimageformat libraries to provide a needed function from KDE Framework * Switch from bundled dispatch library to devel/libdispatch * Drop extra -DNDEBUG from CXXFLAGS, it is now a default for ports cmake framework Revieved by: osa --- net-im/telegram-desktop/Makefile | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index c5ce91f3c0b3..2d1b9476ba07 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,5 +1,6 @@ PORTNAME= telegram-desktop DISTVERSION= 4.2.4 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full @@ -27,6 +28,7 @@ BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib \ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libavformat.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ + libdispatch.so:devel/libdispatch \ libenchant-2.so:textproc/enchant2 \ libhunspell-1.7.so:textproc/hunspell \ libjpeg.so:graphics/jpeg-turbo \ @@ -42,16 +44,30 @@ 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++17-lang desktop-file-utils gl \ - gnome kde:5 pkgconfig python:3.7+,build qt:5 ssl xorg -USE_KDE= coreaddons -USE_QT= buildtools:build core dbus gui imageformats network qmake:build \ - svg wayland widgets + gnome pkgconfig python:3.7+,build ssl xorg USE_GITHUB= nodefault GH_ACCOUNT= telegramdesktop GH_PROJECT= tdesktop +.if ${FLAVOR} == qt5 +USES+= kde:5 qt:5 +USE_QT= buildtools:build core dbus gui imageformats network qmake:build \ + svg wayland widgets +USE_KDE= coreaddons kimageformats +.else +USES+= qt:6 +USE_QT= 5compat base imageformats lottie shadertools svg tools:build wayland +.endif + USE_GL= gl USE_GNOME= glib20 glibmm USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst @@ -63,8 +79,8 @@ CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \ DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION CMAKE_OFF= DESKTOP_APP_USE_PACKAGED_FONTS -# Disable DCHECKs, otherwise video calls will crash. -CXXFLAGS+= -DNDEBUG +# libdispatch components +LDFLAGS+= -lBlocksRuntime # see Bugzilla #245452 for details NO_CCACHE= yes