From nobody Thu Oct 14 18:07:52 2021 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 1ABC717FF533; Thu, 14 Oct 2021 18:07:53 +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 4HVcnh66Xyz4Vby; Thu, 14 Oct 2021 18:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A874417B36; Thu, 14 Oct 2021 18:07:52 +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 19EI7qxB096149; Thu, 14 Oct 2021 18:07:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19EI7qB6096148; Thu, 14 Oct 2021 18:07:52 GMT (envelope-from git) Date: Thu, 14 Oct 2021 18:07:52 GMT Message-Id: <202110141807.19EI7qB6096148@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: ece7e7d92c75 - main - net-im/telegram-desktop: convert webkit-gtk dependency to OPTIONS (+) 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: ece7e7d92c75401608ccb6d64bcdb0b51898fe2c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ece7e7d92c75401608ccb6d64bcdb0b51898fe2c commit ece7e7d92c75401608ccb6d64bcdb0b51898fe2c Author: Dima Panov AuthorDate: 2021-10-14 17:57:17 +0000 Commit: Dima Panov CommitDate: 2021-10-14 18:07:44 +0000 net-im/telegram-desktop: convert webkit-gtk dependency to OPTIONS (+) - Add WEBKIT option, disabled by default - Bump PORTREVISION, default dependencies was changed Previously dropped GTK option was used to enable gtk native dialogs and render rich window content. With last releases WebKit-gtk used only for in-app payments system. While internal payments still experimental and not wide used, there is no reason to hook this burden to the build as default yet. Discussed with: osa, danfe, maintainer via ML Approved by: maintainer --- net-im/telegram-desktop/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index 209c2388409d..40291a38b098 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,5 +1,6 @@ PORTNAME= telegram-desktop DISTVERSION= 3.1.9 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full @@ -39,7 +40,6 @@ LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libpipewire-0.3.so:multimedia/pipewire \ libqrcodegencpp.so:graphics/qr-code-generator \ libusrsctp.so:net/libusrsctp \ - libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxkbcommon.so:x11/libxkbcommon \ libxxhash.so:devel/xxhash \ @@ -52,7 +52,7 @@ USE_GITHUB= nodefault GH_ACCOUNT= telegramdesktop GH_PROJECT= tdesktop USE_GL= gl -USE_GNOME= glib20 glibmm gtk30 +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 @@ -76,14 +76,19 @@ NO_CCACHE= yes # Telegram uses OpenAL for its audio, but libtgvoip (for voice calls) can use PulseAudio or ALSA. # It dynamically loads PulseAudio, and if this fails, it loads ALSA. # If both of them are not installed, then voice calls do not work, but other functionalities still work. +OPTIONS_DEFINE= WEBKIT OPTIONS_DEFAULT= ALSA OPTIONS_MULTI= AUDIO OPTIONS_MULTI_AUDIO= ALSA PULSEAUDIO AUDIO_DESC= Audio backend for voice calls +WEBKIT_DESC= WebKit-gtk integration for payments ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio +WEBKIT_CMAKE_BOOL_OFF= DESKTOP_APP_DISABLE_WEBKITGTK +WEBKIT_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 +WEBKIT_USE= GNOME=cairo,gtk30 # Telegram asks each custom build to have its own API ID and hash. TELEGRAM_API_HASH= 20a3432aab43f24bb4460fceac5ba38d