Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/
Date: Mon, 26 Oct 2020 21:14:00
Message-Id: 1603746706.57fe3ccd0607533807d51e3243dc96ab6e1accac.gyakovlev@gentoo
1 commit: 57fe3ccd0607533807d51e3243dc96ab6e1accac
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 26 21:11:21 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 26 21:11:46 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57fe3ccd
7
8 net-im/telegram-desktop: remove system-rlottie flag
9
10 Closes: https://bugs.gentoo.org/751319
11 Package-Manager: Portage-3.0.8, Repoman-3.0.2
12 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
13
14 net-im/telegram-desktop/metadata.xml | 1 -
15 net-im/telegram-desktop/telegram-desktop-2.4.4.ebuild | 9 ++-------
16 2 files changed, 2 insertions(+), 8 deletions(-)
17
18 diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml
19 index 487d6100c6b..3483ee3eee6 100644
20 --- a/net-im/telegram-desktop/metadata.xml
21 +++ b/net-im/telegram-desktop/metadata.xml
22 @@ -8,7 +8,6 @@
23 <use>
24 <flag name="enchant">Enable the app-text/aspell spell-checking backend</flag>
25 <flag name="hunspell">Enable the app-text/hunspell spell-checking backend</flag>
26 - <flag name="system-rlottie">Use system version of <pkg>media-libs/rlottie</pkg> ( may alter sticker color )</flag>
27 <flag name="webrtc">WebRTC based video call support</flag>
28 </use>
29 </pkgmetadata>
30
31 diff --git a/net-im/telegram-desktop/telegram-desktop-2.4.4.ebuild b/net-im/telegram-desktop/telegram-desktop-2.4.4.ebuild
32 index 6f411ab81e1..57c8fafa89f 100644
33 --- a/net-im/telegram-desktop/telegram-desktop-2.4.4.ebuild
34 +++ b/net-im/telegram-desktop/telegram-desktop-2.4.4.ebuild
35 @@ -19,13 +19,10 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
36 )
37 "
38
39 -LICENSE="GPL-3-with-openssl-exception LGPL-2+
40 - !system-rlottie? ( BSD FTL JSON MIT )
41 - webrtc? ( BSD )
42 -"
43 +LICENSE="GPL-3-with-openssl-exception LGPL-2+ webrtc? ( BSD )"
44 SLOT="0"
45 KEYWORDS="~amd64 ~ppc64"
46 -IUSE="+alsa +dbus enchant +gtk +hunspell libressl +pulseaudio +spell system-rlottie +webrtc +X"
47 +IUSE="+alsa +dbus enchant +gtk +hunspell libressl +pulseaudio +spell +webrtc +X"
48
49 RDEPEND="
50 !net-im/telegram-desktop-bin
51 @@ -63,7 +60,6 @@ RDEPEND="
52 hunspell? ( >=app-text/hunspell-1.7:= )
53 pulseaudio? ( media-sound/pulseaudio )
54 webrtc? ( media-libs/libjpeg-turbo:= )
55 - system-rlottie? ( media-libs/rlottie:= )
56 "
57
58 DEPEND="
59 @@ -134,7 +130,6 @@ src_configure() {
60 -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
61 -DDESKTOP_APP_USE_PACKAGED=ON
62 -DDESKTOP_APP_USE_PACKAGED_FONTS=ON
63 - -DDESKTOP_APP_LOTTIE_USE_CACHE=$(usex system-rlottie OFF ON) # we disable cache with system rlottie
64 -DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk OFF ON)"
65 -DTDESKTOP_LAUNCHER_BASENAME="${PN}"
66 -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"