gentoo resync : 11.05.2021

6 files changed, 89 insertions, 1 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 8bcd51387443..7a95f2308cc3 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 9baf8fa5ae51..5473df76ff3d 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,8 +1,11 @@
 AUX telegram-desktop-bin 379 BLAKE2B e97067e322177c771ac99e59690aa3d5587a78e1dab1c73f530dccb169c1823ca6eff6b7f96a863edd768bf49597f8c8158f7737d1796aa01487274901152b43 SHA512 b57a64e4b9a9edcdcc6a3c3bf09549e49785fe66f38a1e117598780b7637a0b6154e922e2ce0d15749dfd44081bec20d1d353f25f63c276e68d2dd30f8e35a39
 DIST tdesktop-2.6.1.tar.gz 15071996 BLAKE2B 927c571e8a35c30cdf0c974895e3a7d2a3257077959e9a6a0b7b5c819833a83cf6d5e7136f0e8909490310cac01863de88bf3ebd2c82fe60c8ed85f988ed3887 SHA512 abd0630c4bd979cdc36b61c7c9b3223f7cdc090805d88f6a3173466b092934a3400313c7af3a170c5b116ec2aefa7577d008cd41085a94aca5e20759a3957995
 DIST tdesktop-2.7.1.tar.gz 15117072 BLAKE2B caf01d2d4c6b5ec8d9621e1cf2b4d5a906230caeb29fc484b64d69de3bce070f42f9efa43b31149cffbbab4adbbea17fdda65b24dad702db8df01f232b4ad5e6 SHA512 148299b00348129950e92be4f7ea6dc38d0ec6dd4cd673c05126ba724caa9bde3f9b10ba42b55803116f5f145097c83f93fdcdd541a6f9894406ca19a395b583
+DIST tdesktop-2.7.4.tar.gz 15226377 BLAKE2B eeb889c6027e889d08b8df2f74a8a7df964475d62bea500122ad455202c6e590f1908877f38c0d0249c9ab6bfe8f99c610804919e36ab0cb2a39c50331e5b7f1 SHA512 f4f896d725bc96c221e70cff19105834dcb0223ad9b4da6bcb00485204fa77447f7cb82e8fd5fd43c841e44376ee763f9707bd3eb18ff4ee53c16bc523002802
 DIST tsetup.2.6.1.tar.xz 35300412 BLAKE2B cf4e616c4957b8a6ee91b621a79556a588c5d736583457d4fa35c3f0b4266b929f41b488764330c5f5d06314ac57a853613f9fcf70e5d129dceb9ac9e8059c8d SHA512 f8b9f78b4d7f6cf886a9368731733f598749babf6ed50541b5332dfef20ccc24616f399448d17cc523409b6e1dcdd2c137bbe0e5eb13e4e9ade902a6e26cf1ea
 DIST tsetup.2.7.1.tar.xz 35867608 BLAKE2B 13ae89d4c7e98dbb0ec536c22554cd5d2ef6905a07e9eb1684fa536ccd0b6469791955a581bc2d0e71e8727ca5b3c4735a5658d6ec2aa7aecfd2b68c4906c110 SHA512 732d0be95e63e5948258e64fd33ab171adf610706714115fcd4715034d95f3edf030dbc1a7000f1fd01ce140234056b0f1db1d94cb512286789681ade1b0d739
+DIST tsetup.2.7.4.tar.xz 36173288 BLAKE2B 7b25475c2e64a23a658e96bf2bee1495946cdf4c17eb412e3cb385fd3d003cfe99ff67ec66e68590e22d5c818a9c6f4f9060a589edeb17c1b7c69aa222e66d00 SHA512 bd070c1efc9d5db60ebb82e4f0d0145ddadf04760314fa0b37e5a8920f9955dbb475b062911c3857fd6176a4bd8469e1e5764b1c855baf35b2289bb6d12cdcee
 EBUILD telegram-desktop-bin-2.6.1.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
 EBUILD telegram-desktop-bin-2.7.1.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
+EBUILD telegram-desktop-bin-2.7.4.ebuild 1311 BLAKE2B cba5e0ff4a05ee743a824c6c1c30c0632e32a2ce1d284de8bfe15800e1e3cfa507130bea8c9e0c1c52dd5df9606f5a8843e70d61838421f1e22329ea6fd97726 SHA512 49c8b7a4500b0ecf1624f660c290b92e3a11dc5b030b0d983cdb33576f724bfbfe59a038eccc68e53b984acd54139dbcc494b3ad1c68e59e793e266922b5651f
 MISC metadata.xml 616 BLAKE2B d92266b23ce1be2d3180a55b0723b6ea1bd2383e95ca7b216f845b13b5b86a23f44ba42998c13de91bc6b468ba5d0b0ac04a8093454fd512c9a2c3daf3106c17 SHA512 3db845ccdac1b80efeaf903a82bd11a23df8e93458143fb82499053a14a1bed515380d96a2c32f1ad94f58107b61453e8dcdddb4ec71fd570fd04ff35bc9ca21
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-2.7.4.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.7.4.ebuild
new file mode 100644
index 000000000000..6821536278c0
--- /dev/null
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-2.7.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop optfeature xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+QA_PREBUILT="usr/lib/${PN}/Telegram"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=media-libs/fontconfig-2.13
+	media-libs/freetype:2
+	media-libs/libglvnd[X]
+	>=sys-apps/dbus-1.4.2[X]
+	sys-libs/zlib
+	x11-libs/libSM
+	x11-libs/libdrm
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	exeinto /usr/lib/${PN}
+	doexe "Telegram"
+	newbin "${FILESDIR}"/${PN} "telegram-desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "spell checker support" app-text/enchant
+}
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 44bd25f08afa..ee46de7bec6d 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -2,8 +2,9 @@ AUX fix-tgcalls-gcc10.patch 949 BLAKE2B 7a065fcbf5b8e7b49b6b866d199c67315484312c
 AUX tdesktop-2.7.1-fix-disable-dbus-integration.patch 632 BLAKE2B 92aa9006febe4cb52e4273233f8592827e5d74afebc9d996c41cfc33588c0040b3b573a3730d0541ba8e0641e6733c491861c1bb60a5dc0f26f53b7941bf4572 SHA512 74557a9ac798f47d76cc9a0a514d3891c1a9f3c0667d5938be11d53d44704390dbf97d1e7be3c304cce2c9b8e3110ee04e6759ed28bf5f39d1cfee9f5c77f703
 AUX tdesktop-2.7.3-disable-webkit-separately.patch 3536 BLAKE2B 1bf255ba137c12a4d4a75321763327192f6cff81879843f042716daef0a9f9eb18b2a88e3048917adc5f36b9e4959be2a2c757f74a6aeeb9ca312ffcd7f55554 SHA512 aa62ae0319ad5ec86334e763e4c751f6508d7768a8916661fb217b91bf6a897802bc8f4820d058dc341bae69f6a0f0c34321e2a97e63bd0c715d36aa56532fef
 AUX tdesktop-2.7.3-webview-include-gdkx.patch 570 BLAKE2B 4d92c1e14e9df4609ab332c057977a9485867b3a23fc96c46a97d092a5f7083fccb479f87681bfc66964e4be13b4883c0d86ee079e9fd67e932daa2140c9610b SHA512 446a59387f3a76270d9242a19648d86acc0e589833e3aaedff708da0a90d5b55ae0108f28d79da45b4c8dc68c5ac6f6af4ec50203b411c0fcf2eccf4f8c9c753
+AUX tdesktop-2.7.4-webview-fix-gcc11.patch 880 BLAKE2B 581425190b3951d1027c572587e1039d0cf2c5b91d0cebe6be8bd25943eedc3b9e481729f94c920e699526d864ac660d295b4a50ad6aba9ef178513a00b08099 SHA512 7098bca2a1538f66badac21639b3e10a3988acf1e16e50b3f32ed06571687493e87280b992ea1c24fcbd3e3215ccc6e27f327eec8acc7318f9c53b5dfa290c90
 DIST tdesktop-2.7.1-full.tar.gz 36770178 BLAKE2B 21379cc970da07725e7a46d18a4f0bc459b1da1b730587595448b8f78133ce701e374e7faefc649a973342c203eee510872b5a4ed2ff6be92daec25157e400a4 SHA512 dffd184c4369c5c5947b1ca085add533e54313ce39aebcdca4f0958431a305aa5e95c2f2b48592f6992e666b2d33eeba5697f9e09f6048a53b807f2950fbd17b
 DIST tdesktop-2.7.4-full.tar.gz 36894673 BLAKE2B e04749fb0168f8bae69a9ad85c5bff315faf0b355ff5f3a85a34ee36e3305c6b550553284d5179aff9283bbd1a94f9ec3c41e293d0ad8c86e4d08283189e42b3 SHA512 0a796d7a8c5e5982bc60f19c41da53996a609bf794fad224e7beea5fc3816b5cf35f16b0ec2cc7279085c69996063a44085f48e1596dfe746d260a2e8f1b2d14
 EBUILD telegram-desktop-2.7.1-r2.ebuild 3955 BLAKE2B ebd8a7ce7cbb217f7277879a0b65cf13d99a78af157fb85f7453f8239fce90523ac0644146cc7a0ad8f87e66eb327c061896df4fafbf40931475713e693f5d9c SHA512 6a388a597113e102213b591f91395a59eef26458d4d4173d6a2e6e8d76c45a1f6e4b34dd83ae495bf4ff1d2639861608a73031460c43f9af97542eb9c755a68a
-EBUILD telegram-desktop-2.7.4.ebuild 4159 BLAKE2B 9ce7844f86fd7010d6ea8a3888b6876ba994f1ac5f430a8d9dd2e930e727d75016cffe94011dafc25a24594becf6fa3f6415320e5278c1ce880b1dca9c8238f3 SHA512 74870605d74efdcfef32a4edc37d598875a9f27a9c453640d97eb0eec7ad5479cdfefbed0b39d8a777b198a89ca55c0d66f5f42c67129a4f35a016f0a228aa7b
+EBUILD telegram-desktop-2.7.4.ebuild 4266 BLAKE2B b7102112ec4afb170ff44ec54b34e0795d361e07dec623e7e3775ef4d993b8e0562124f5ec9dd74453aff20758f0ce7ef56c6dbfb5fd7cdcaba96191314f734d SHA512 d213159ee7e55e19d59aa693e841cf71df6a637e50d4eaea35a67af00a4f091d378c69a9e587925b3b59f538223f27b51a10affcec93c61635e84c24eb74475b
 MISC metadata.xml 587 BLAKE2B 1f49c91d650d26ba9fd95e9cbcb793ed527d58bf0ccc81ebddb624d54c4af38cc7aff3cf799814932a69b2a6f36dad7fe1c5ce4eb82e562e46dcebca9b751308 SHA512 5e74bb555b2b1a513bd8c7450a3db2f46daa426eecc0d3cebf11d46e58124ef117697bc422f7fccd8757f2e6e8ce6bd8ff0e317b58740dd302c1ea2f2476ff3f
diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
new file mode 100644
index 000000000000..0188eaf76f8a
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
@@ -0,0 +1,25 @@
+Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
+===================================================================
+--- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.cpp
++++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
+@@ -14,7 +14,6 @@
+ 
+ #include <QtWidgets/QWidget>
+ #include <QtGui/QWindow>
+-#include <QtCore/QJsonDocument>
+ 
+ namespace Webview {
+ namespace {
+Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.h
+===================================================================
+--- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.h
++++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.h
+@@ -9,6 +9,8 @@
+ #include "base/unique_qptr.h"
+ #include "base/basic_types.h"
+ 
++#include <QtCore/QJsonDocument>
++
+ class QString;
+ class QWidget;
+ class QWindow;
diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild
index 609781f96cb7..8081b9da583e 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild
@@ -71,6 +71,8 @@ PATCHES=(
 	"${FILESDIR}/tdesktop-2.7.3-disable-webkit-separately.patch"
 	# https://github.com/desktop-app/lib_webview/commit/0b4100d7cecc4e748c51f3f51ebfd1392ec3978a
 	"${FILESDIR}/tdesktop-2.7.3-webview-include-gdkx.patch"
+	# https://github.com/desktop-app/lib_webview/pull/3
+	"${FILESDIR}/tdesktop-2.7.4-webview-fix-gcc11.patch"
 )
 
 pkg_pretend() {