From nobody Fri Dec 10 22:00:00 2021 X-Original-To: dev-commits-ports-branches@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 27D3A18DAAF9; Fri, 10 Dec 2021 22:00:02 +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 4J9lFF3BsDz4tkN; Fri, 10 Dec 2021 22:00:01 +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 D77F321FB7; Fri, 10 Dec 2021 22:00:00 +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 1BAM00Oo018595; Fri, 10 Dec 2021 22:00:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BAM004J018574; Fri, 10 Dec 2021 22:00:00 GMT (envelope-from git) Date: Fri, 10 Dec 2021 22:00:00 GMT Message-Id: <202112102200.1BAM004J018574@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Olivier Cochard Subject: git: 8dea5aa1e02c - 2021Q4 - net-im/telegram-desktop: convert webkit-gtk dependency to OPTIONS (+) List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 8dea5aa1e02c53302a1d9b183f49dd62fa7056c4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639173601; 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=Lthc5YNUamo9qaYqLX3ah3uB6AA6zO4RKKAhcJj3C34=; b=nvrorPq3M92urtKINWvCe7sa2gIMtYgpmUNmqR9oAtnRIRuHprZ6Gg3mDmFHbBJuyjlH5W h7hmj89M7M+ZY2TkfjvvU9Nj+ZgcSLfaq9gOVO9AztYxmNnik265dteEy8hAJsDFQ/c9Kh 2lgILZ3MIACh8t1RCRxd3fzzICpex5HTfJcuoqsXt3xgYiIIAbWyrtdN4ehxk8TC22YBwe 0LAsliKgWdflDCibLSjTp3NqMRfGTNJDR02/s8znKOMx/odsimHa/qI4arylDgdMfWpzDO 2NE06NdLf4Q0HvIIa1Rl7NFUgmKXi81OkBHc1xLkfAKohc32VGdGo2Y5eFOJpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639173601; a=rsa-sha256; cv=none; b=FsoSIHXTceRE/F6Wb9iQN8YRLSvdpH51VM2ga8mJpnmVTbLdrmnMNzYN2vV2SppJj3OxpF +9a5VD+BLCREWfyLru3lVfaR+n173jHY67d8BU77m09InLB06RpNWXrCJ5uRmU1j+yYSSI IhhEP8WPKhce6D6uCfdlnmJ/GvkLXRgdqOBeuAV90ZBYryqYxvrUmGG2a3oyjCw8GYOPI4 CA0+xoV0pR8XM9LYNsoLXOW63QTCz7WHTDOJOwJ8sECifA8Z412TsSEp0/HQcCE0uzm0zk 2uKaPE9NSUiE8nZMbgX0vWrkDGCNRTFqWamSBMy+OQqDupEJnyDlV6NFLWFpkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=8dea5aa1e02c53302a1d9b183f49dd62fa7056c4 commit 8dea5aa1e02c53302a1d9b183f49dd62fa7056c4 Author: Dima Panov AuthorDate: 2021-10-14 17:57:17 +0000 Commit: Olivier Cochard CommitDate: 2021-12-10 21:19:12 +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 (cherry picked from commit ece7e7d92c75401608ccb6d64bcdb0b51898fe2c) --- net-im/telegram-desktop/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index 12264d47a854..ee236dcca34b 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 \ @@ -77,14 +77,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