1 |
commit: 341116ec481cbc56deac5eb03162088068a047ba |
2 |
Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Oct 31 22:11:18 2021 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 1 20:10:06 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=341116ec |
7 |
|
8 |
net-im/telegram-desktop: Bump to 3.1.11, drop old |
9 |
|
10 |
Closes: https://bugs.gentoo.org/813408 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/22776 |
12 |
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> |
13 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
14 |
|
15 |
net-im/telegram-desktop/Manifest | 2 +- |
16 |
....3-r1.ebuild => telegram-desktop-3.1.11.ebuild} | 26 +++++++++++----------- |
17 |
2 files changed, 14 insertions(+), 14 deletions(-) |
18 |
|
19 |
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest |
20 |
index cee361d221e..88ea9c202b3 100644 |
21 |
--- a/net-im/telegram-desktop/Manifest |
22 |
+++ b/net-im/telegram-desktop/Manifest |
23 |
@@ -1,3 +1,3 @@ |
24 |
-DIST tdesktop-2.9.3-full.tar.gz 37335782 BLAKE2B 197583ba6568c455218c51f590c1ba1a3f10c390caa4fd03657098f499ce113a4f5f57ca9dd53bc4baba31992d4229768ed35e68ad6b0685010bc335817edcac SHA512 810cfac5d7e6ce9413b1b2406927e89c1383ea5b725233a68b2cb29dd374b4c3386c22186640afde4492c844516c88889a5db8e5b167a09d6d6c1270ac965ac4 |
25 |
DIST tdesktop-3.0.1-full.tar.gz 37531917 BLAKE2B c139501f23c742f76d4acd43def69963413ffafef1be584f13d7359b3c20625def7ec283a981556c795aa4dc5ad2e117e1f8aada28cd4815f66f02510e607435 SHA512 6bff6be5f2c0c7a17df61dccc5a3216dcbb95a1c6d3176442c530e2c1b525e6d15079b230d40751f20684da2a1067d4518a9a1ab90d49d1a7338d3e05239d447 |
26 |
+DIST tdesktop-3.1.11-full.tar.gz 38541579 BLAKE2B 0c0c5d9591a6f517d3859ecc1bc6a8410c76a46b03db7267dec3354d54382c590bda86aff46e4cda518a512ae5539815553defc8b4b20929894324fee876b826 SHA512 7d67f2895797d4f7f1edd5e5e7e8509044fad5d5cfe6bbdb5613689da9519dab2fde707a452aad6788193addf84f2ebcc69342955607e0be8507397c22557709 |
27 |
DIST tdesktop-3.1.8-full.tar.gz 38494235 BLAKE2B 50da0fdfe48f6492dc255c0fdfdb584750fd137ab0f847d226f9f62012ed1c34cc1a597f97735ca6aae1ba7e262562be2c88b92fe22c2868ed2cda437341a1f9 SHA512 787c92d6aaad2998d7195f2e1c98eddc6e87c3cb04a0d9ab80ea9a4a2dd1a798004109f8cc1ad82136c511ae191cea5b15cc23cc541ce86ccdb79dbc65367f09 |
28 |
|
29 |
diff --git a/net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.1.11.ebuild |
30 |
similarity index 86% |
31 |
rename from net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild |
32 |
rename to net-im/telegram-desktop/telegram-desktop-3.1.11.ebuild |
33 |
index eda14696228..65f4899c98b 100644 |
34 |
--- a/net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild |
35 |
+++ b/net-im/telegram-desktop/telegram-desktop-3.1.11.ebuild |
36 |
@@ -5,7 +5,7 @@ EAPI=7 |
37 |
|
38 |
PYTHON_COMPAT=( python3_{7..10} ) |
39 |
|
40 |
-inherit xdg cmake python-any-r1 flag-o-matic |
41 |
+inherit xdg cmake python-any-r1 |
42 |
|
43 |
DESCRIPTION="Official desktop client for Telegram" |
44 |
HOMEPAGE="https://desktop.telegram.org" |
45 |
@@ -15,22 +15,19 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${ |
46 |
|
47 |
LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" |
48 |
SLOT="0" |
49 |
-KEYWORDS="amd64 ~ppc64" |
50 |
-IUSE="+dbus enchant +gtk +hunspell screencast +spell wayland webkit +X" |
51 |
+KEYWORDS="~amd64 ~ppc64" |
52 |
+IUSE="+dbus enchant +hunspell screencast +spell wayland webkit +X" |
53 |
REQUIRED_USE=" |
54 |
spell? ( |
55 |
^^ ( enchant hunspell ) |
56 |
) |
57 |
- webkit? ( gtk ) |
58 |
- gtk? ( dbus ) |
59 |
+ webkit? ( dbus ) |
60 |
" |
61 |
-# Future: webkit doesn't depend on gtk anymore (version: >2.9.3) |
62 |
|
63 |
RDEPEND=" |
64 |
!net-im/telegram-desktop-bin |
65 |
app-arch/lz4:= |
66 |
dev-cpp/abseil-cpp:= |
67 |
- dev-cpp/glibmm:2 |
68 |
dev-libs/jemalloc:=[-lazy-lock] |
69 |
dev-libs/openssl:= |
70 |
dev-libs/xxhash |
71 |
@@ -47,15 +44,15 @@ RDEPEND=" |
72 |
media-libs/openal |
73 |
media-libs/opus:= |
74 |
media-libs/rnnoise |
75 |
- ~media-libs/tg_owt-0_pre20210626[screencast=,X=] |
76 |
+ ~media-libs/tg_owt-0_pre20210914[screencast=,X=] |
77 |
media-video/ffmpeg:=[opus] |
78 |
sys-libs/zlib:=[minizip] |
79 |
dbus? ( |
80 |
+ dev-cpp/glibmm:2 |
81 |
dev-qt/qtdbus:5 |
82 |
dev-libs/libdbusmenu-qt[qt5(+)] |
83 |
) |
84 |
enchant? ( app-text/enchant:= ) |
85 |
- gtk? ( x11-libs/gtk+:3[X?,wayland?] ) |
86 |
hunspell? ( >=app-text/hunspell-1.7:= ) |
87 |
wayland? ( kde-frameworks/kwayland:= ) |
88 |
webkit? ( net-libs/webkit-gtk:= ) |
89 |
@@ -70,12 +67,13 @@ BDEPEND=" |
90 |
>=dev-util/cmake-3.16 |
91 |
virtual/pkgconfig |
92 |
" |
93 |
+# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233 |
94 |
|
95 |
S="${WORKDIR}/${MY_P}" |
96 |
|
97 |
PATCHES=( |
98 |
- "${FILESDIR}/tdesktop-2.9.3-jemalloc-only-telegram.patch" |
99 |
- "${FILESDIR}/tdesktop-2.9.3-add-libdl-dependency.patch" |
100 |
+ "${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch" |
101 |
+ "${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch" |
102 |
) |
103 |
|
104 |
pkg_pretend() { |
105 |
@@ -105,7 +103,6 @@ src_configure() { |
106 |
-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes) |
107 |
-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes) |
108 |
-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes) |
109 |
- -DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk no yes) |
110 |
-DDESKTOP_APP_DISABLE_WEBKITGTK=$(usex webkit no yes) |
111 |
-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes) # enables hunspell (recommended) |
112 |
-DDESKTOP_APP_USE_ENCHANT=$(usex enchant) # enables enchant and disables hunspell |
113 |
@@ -139,8 +136,11 @@ src_configure() { |
114 |
|
115 |
pkg_postinst() { |
116 |
xdg_pkg_postinst |
117 |
- use gtk || elog "enable the 'gtk' useflag if you have image copy-paste problems" |
118 |
if ! use X && ! use screencast; then |
119 |
elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!" |
120 |
fi |
121 |
+ if has_version '<dev-qt/qtcore-5.15.2-r10'; then |
122 |
+ ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram" |
123 |
+ ewarn "to crash when pasting big images from the clipboard." |
124 |
+ fi |
125 |
} |