Date: Wed, 13 Oct 2021 17:15:49 +0000 From: "Sergey A. Osokin" <osa@freebsd.org> To: Alexey Dokuchaev <danfe@freebsd.org>, Li-Wen Hsu <lwhsu@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 2bc3e6229feb - main - net-im/telegram-desktop: Update to 3.1.9 Message-ID: <YWcURc7PrcJA65jY@FreeBSD.org> In-Reply-To: <YWWcR20bUeZJ1I4y@FreeBSD.org> References: <202110121357.19CDvdWN002446@gitrepo.freebsd.org> <YWWcR20bUeZJ1I4y@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--vNRajT5I+t0BTuZ+ Content-Type: multipart/mixed; boundary="CEDzxrefpjhOshkA" Content-Disposition: inline --CEDzxrefpjhOshkA Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Well, I'm not totally sure is my approach is corrent, but here's the patch returning back GTK staff. Please be aware: it wasn't tested yet. --=20 Sergey Osokin On Tue, Oct 12, 2021 at 02:31:35PM +0000, Alexey Dokuchaev wrote: > On Tue, Oct 12, 2021 at 01:57:39PM +0000, Li-Wen Hsu wrote: > > commit 2bc3e6229febd07dd7f2980cb7065573d689a0f5 > >=20 > > net-im/telegram-desktop: Update to 3.1.9 >=20 > Thanks for updating the port, however... >=20 > > ... > > @@ -40,6 +39,7 @@ LIB_DEPENDS=3D 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 \ >=20 > Commit log does not explain why would light-weight chat program would now > unconditionally depend on this admittedly quite heavy component. >=20 > > @@ -52,9 +52,10 @@ USE_GITHUB=3D nodefault > > GH_ACCOUNT=3D telegramdesktop > > GH_PROJECT=3D tdesktop > > USE_GL=3D gl > > -USE_GNOME=3D glib20 glibmm > > +USE_GNOME=3D glib20 glibmm gtk30 >=20 > Nor does it explain why Qt-based program now unconditionally requires GTK. >=20 > > +INSTALLS_ICONS=3D yes >=20 > Please also see the latest CHANGES entry. >=20 > ./danfe --CEDzxrefpjhOshkA Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="telegram-desktop.diff" Content-Transfer-Encoding: quoted-printable diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Mak= efile index 209c2388409d..afa197e6e5c7 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,5 +1,6 @@ PORTNAME=3D telegram-desktop DISTVERSION=3D 3.1.9 +PORTREVISION=3D 1 CATEGORIES=3D net-im MASTER_SITES=3D https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/do= wnload/v${DISTVERSION}/ DISTNAME=3D tdesktop-${DISTVERSION}-full @@ -39,7 +40,6 @@ LIB_DEPENDS=3D 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=3D nodefault GH_ACCOUNT=3D telegramdesktop GH_PROJECT=3D tdesktop USE_GL=3D gl -USE_GNOME=3D glib20 glibmm gtk30 +USE_GNOME=3D glib20 glibmm USE_QT=3D core dbus gui imageformats network widgets buildtools_build \ qmake_build wayland svg USE_XORG=3D x11 xcb xcomposite xdamage xext xfixes xrender xrandr xtst @@ -76,13 +76,18 @@ NO_CCACHE=3D 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 oth= er functionalities still work. +OPTIONS_DEFINE=3D GTK OPTIONS_DEFAULT=3D ALSA OPTIONS_MULTI=3D AUDIO OPTIONS_MULTI_AUDIO=3D ALSA PULSEAUDIO =20 AUDIO_DESC=3D Audio backend for voice calls +GTK_DESC=3D Gtk integration (Use Gtk dialogs, etc.) =20 ALSA_LIB_DEPENDS=3D libasound.so:audio/alsa-lib +GTK_CMAKE_BOOL_OFF=3D DESKTOP_APP_DISABLE_WEBKITGTK +GTK_LIB_DEPENDS=3D libwebkit2gtk-4.0.so:www/webkit2-gtk3 +GTK_USE=3D GNOME=3Dgtk30 PULSEAUDIO_LIB_DEPENDS=3D libpulse.so:audio/pulseaudio =20 # Telegram asks each custom build to have its own API ID and hash. --CEDzxrefpjhOshkA-- --vNRajT5I+t0BTuZ+ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQITBAEBCgB9FiEEZTMJYdHlAQrZCsSmOBlAga+KbzQFAmFnFEFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY1 MzMwOTYxRDFFNTAxMEFEOTBBQzRBNjM4MTk0MDgxQUY4QTZGMzQACgkQOBlAga+K bzSKrgv/YDk8psTgxG3SWWwPLuTQKpVvgVV1nHzq3iXKqCdwwEObqb5ZGLzcFVzb q8fW7uHL5LbTo9DsTxwURCByBfzoPgAtyX6pObyhNTBKhPhbItrqCmJwFhIV81hG NfvCpr2DdmycXgBHQoPfe3L6PCtD6hl3AkOYIg5fTbc7JwhZxB1mFB2q1vRMTV6P 6szcFxQc0EUQ91tnGenBNkeGXOGRVCMr+8xnPvWO9C++H+rTROWl7td+0wlMYpbj hIK93Lgyu91aP/sZ00sXNgtVJ7RWa3X/EtyrSfjy8RSurG7ILaaXeJB9MIIG7ADk LwvoKFDf7zchIzjMrf6OKCjsgUsk1gHcuikAqtSNHaq6ExzxGejHxL6nCLqzf4no HfhJJXDPPbF0UYEwAK7giGiT8+F1DCnJQpOFc64qfvNyimVRUAaLvKywbFaJrx7g juLJJ71ejv7QDiWBPiz/IwBg93dMTXys2QmYlb8EcYiwmIVMppm1uwtZXOU0xTt/ Q1doJOXX =2ulz -----END PGP SIGNATURE----- --vNRajT5I+t0BTuZ+--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YWcURc7PrcJA65jY>