From nobody Thu Aug 25 17:06:06 2022 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 4MD8W23VChz4b0sn; Thu, 25 Aug 2022 17:06: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 4MD8W233vbz3GYg; Thu, 25 Aug 2022 17:06:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661447166; 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=1KRGsjx6gIyz+fq9MGHFKeH8kspBtrX+fZz/l3wpf8g=; b=lFGBKphcbc8dbjKHoGreaiqMMp4Y75VNjiU63RjJ1/WKcdwjFBCEB9eBADGUSYea2XkL1X wsnwhnVDrXlCcqZRSa3QKuKVSLw8ghf4RjrP5I+31jp7bV0DEaGOSFdIWhevpgTtVfrgCq fkTkR0r6sLxlfFW0mbKzsCxOu5nzZbd4AQkp3Rrd0TlcdKXWKBt65i/7LuGO4yWk4u6Ekm DEYct6kAdFHxZ/31S1/RkVlvCLDNayl2zpc/YRDwEiu5zbhWF4dsgdP9kNJvE0mxAUIV3u QCd+BNVS5ckgZtH+1AIyDS+pgchLMhaFdDMKxQFb8ZGqIeD7dlFiD5XDzh5tgw== 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 4MD8W2213czwBF; Thu, 25 Aug 2022 17:06:06 +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 27PH66DM004161; Thu, 25 Aug 2022 17:06:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PH662I004160; Thu, 25 Aug 2022 17:06:06 GMT (envelope-from git) Date: Thu, 25 Aug 2022 17:06:06 GMT Message-Id: <202208251706.27PH662I004160@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: 95f09c993c10 - main - net-im/telegram-desktop: add Qt5/Qt6 flavors 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: 95f09c993c104f129fe80b1f33cb4ec1dc159fb4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661447166; 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=1KRGsjx6gIyz+fq9MGHFKeH8kspBtrX+fZz/l3wpf8g=; b=f4BC/sHBF4S82OKnu+K/rrcOjpx36/wPy9gWXbsmhhwrbks+qiWKLjSVROazUAMh6sBnVc VsNG83fzCz2AfC6Xvd4709FWrz5kbiUBjnbeOVnoqev9ZX7dMRCHMqGytcZFM3bpHaZv+V ru9zqQw/5X8HeuFsFiFQ/x5RscSZBn2gKxeyCnAK5gfIMXTAvaPvEVTV0EavTwc8noQiSf iKCljQGrLNuxvsYznDu64B0CYMj4TtFWO6dIQnvmjiFvMUp2tuK1glp7ztBqMlNxinq8rw KteT66mfNSiUXtVpSq5ZzUV3I9B518jwOXt3kG/d2l96+Cb6lFhWIMdStT2crQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661447166; a=rsa-sha256; cv=none; b=Gb4OKwAO0iqYfpzNrqSeg1ic9d31PUQYCxoWaQFObMGdd/ep9InS0wB99A67rN63ZCr/wY tFyq+8F/Ro37ilxCbXcO0w3LIVvB7gJ4F2Aq3LbaCiPXq8i2Oawp7bNq40v1vf7GgMnUyH MvOONRZzWLGVHfYpXc1x+ur9ceYM8xzkUDTqjea6G+SoC9PraZ8NSVUbt+2258DUxsm3d0 RiFx/d3UB1kDpmfN5MyuRPmwMmXYm1C6H31rTMdUwoqjpo8aEKjP/8l8OoFF2nYqINuvKg zdx7lLWtPq5KC23DQYhbQHAxkPyZcUGG3nXItV92rqLU3xKitpZ+K71lEdbUeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=95f09c993c104f129fe80b1f33cb4ec1dc159fb4 commit 95f09c993c104f129fe80b1f33cb4ec1dc159fb4 Author: Sergey A. Osokin AuthorDate: 2022-08-25 17:04:29 +0000 Commit: Sergey A. Osokin CommitDate: 2022-08-25 17:04:29 +0000 net-im/telegram-desktop: add Qt5/Qt6 flavors Remove needless dependences and knobs. Bump PORTREVISION. --- net-im/telegram-desktop/Makefile | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index 1903b04deb3d..af7bb3237b2d 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,6 +1,6 @@ PORTNAME= telegram-desktop DISTVERSION= 4.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full @@ -27,10 +27,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 \ - libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \ libenchant-2.so:textproc/enchant2 \ - libevent.so:devel/libevent \ - libhunspell-1.7.so:textproc/hunspell \ libjpeg.so:graphics/jpeg-turbo \ liblz4.so:archivers/liblz4 \ librnnoise.so:audio/rnnoise \ @@ -39,31 +36,45 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libopus.so:audio/opus \ libpipewire-0.3.so:multimedia/pipewire \ libqrcodegencpp.so:graphics/qr-code-generator \ - libusrsctp.so:net/libusrsctp \ + librnnoise.so:audio/rnnoise \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxkbcommon.so:x11/libxkbcommon \ 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 pkgconfig python:3.7+,build qt:5 ssl xorg + gnome pkgconfig python:3.7+,build ssl xorg USE_GITHUB= nodefault GH_ACCOUNT= telegramdesktop GH_PROJECT= tdesktop + +.if ${FLAVOR} == qt5 +USES+= qt:5 +USE_QT= buildtools_build core dbus gui imageformats network qmake_build \ + svg wayland widgets +.else +USES+= qt:6 +USE_QT= 5compat base imageformats svg wayland +.endif + USE_GL= gl USE_GNOME= glib20 glibmm -USE_QT= core dbus gui imageformats network widgets buildtools_build \ - qmake_build wayland svg -USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrender xrandr xtst +USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst CMAKE_ARGS= -DDESKTOP_APP_SPECIAL_TARGET="" -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \ -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \ -Ddisable_autoupdate=1 CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \ DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION -CMAKE_OFF= DESKTOP_APP_USE_PACKAGED_FONTS \ - DESKTOP_APP_QT6 +CMAKE_OFF= DESKTOP_APP_USE_PACKAGED_FONTS # Disable DCHECKs, otherwise video calls will crash. CXXFLAGS+= -DNDEBUG