gentoo resync : 02.02.2022

3 files changed, 186 insertions, 0 deletions

diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index f7231828f768..e57dafaa44a7 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,10 +1,13 @@
 AUX tdesktop-3.1.0-fix-openssl3.patch 641 BLAKE2B 0354e0c8931311e5b6561c601cd0e78d436aeda53f14332803484b278fe60c90fa74e761ac005f79d6f44f18053fa870dc9246de1ab6e63986d7bf9b7214e12c SHA512 cfbf1798a290674e1f4589db1f5f43e61a6c691c19d936090ec9b7396e6cb720aa86b86cfdbff197de68a8723c04a20e7bf858f8511b48cc8e7b924a8d6876ec
 AUX tdesktop-3.1.0-jemalloc-only-telegram.patch 1136 BLAKE2B 06811696df84c1648f63843e937d18542ec5185aee6c3fde99dcfabe982aaad49e97387910882e405ec0ec9e8a12bef615f6f920c7f603224bce347bbff3bf22 SHA512 59c3f508c4be10e182fca52e4069e88af8cd26d150625dbe14214e505f9a5461e1492450896b1e9e229444a4f403eff43e4066d7f0c866bc9631c76f2c1f847e
 AUX tdesktop-3.3.0-fix-enchant.patch 819 BLAKE2B f827deca269c32648e438642a916383e6184ef3fbdb045c8950997b3a30c6231336fe54a3b39ae5b2b93e7c6c72d0080f00a535dcf6932bbe3740041ba79abc8 SHA512 2653dd30699633c55e590744ed1fb2104b473d43e6391ece791bf3543cac7de594a75d303dc66dd9c7b75face5e90615da261d10758e50e1c669ad0b4f27923f
+AUX tdesktop-3.4.8-jemalloc-only-telegram.patch 950 BLAKE2B f1dd5f795ad8aa66c9ff00cb1e616789be8b9ef3bcad08f27596d6a7a0364eca4299f02d56179664eb7dbc6552c7cf68ca6ee6f98fcd0171a2ede35f03cf1168 SHA512 c02a1d76378cd18f963ea88b47682237cc4702fda3504ff3ab303a87a60434c38cca866193fdb6e33e5e5afe20bb7ba94f5024b40ad4a42a666713fc079e7c53
 DIST tdesktop-3.1.8-full.tar.gz 38494235 BLAKE2B 50da0fdfe48f6492dc255c0fdfdb584750fd137ab0f847d226f9f62012ed1c34cc1a597f97735ca6aae1ba7e262562be2c88b92fe22c2868ed2cda437341a1f9 SHA512 787c92d6aaad2998d7195f2e1c98eddc6e87c3cb04a0d9ab80ea9a4a2dd1a798004109f8cc1ad82136c511ae191cea5b15cc23cc541ce86ccdb79dbc65367f09
 DIST tdesktop-3.3.0-full.tar.gz 38662573 BLAKE2B f6cba2be02faccde77c510742dc57680a2731cd3b2bc4a2d680f6cda7fd1a634e2fa0406855a491241434daa080e782f561e5e472dcc42a8b8376c16e038b6af SHA512 ff0ac1abe264f19812c2e0b40d4861caddd6c01a3f863ccb68de9c5227282872b2bde878dcf751d7d04d36c6e0e77912619ac7863d54f25f739f3744e9bca53a
 DIST tdesktop-3.4.3-full.tar.gz 40647558 BLAKE2B 220a7b29dbc7a48d53e53fe9609dba804e5fe536feebc1225fd5400a8eec703e64f65decb8b503ed77e843c011c8b5fd12916534d4a1ecbc84724f277dcc301a SHA512 6b27eb14570b55fb14c77f1d557591985a4791712897c2e144196c54c2a98b10c7ece9dac7d039a6bb56f39e3062e4fbfbb60f6822e52b76f927bbf419d88a6b
+DIST tdesktop-3.4.8-full.tar.gz 41220984 BLAKE2B e75e7d7432a863e7a35b73bb2a378970f8aab74d99a425e631947fd894e51d931ee2390e2f885831d165d73541cf2151840467e2ef02ece175cc6a18f3e2c81c SHA512 cdeb5a83a375a494d805bf4198beee1c4bfc94bd9626535721a0cf04a590c70bfdb20e76baaa2a4c8c6db54c5813f22ce2a8c6291786b6b6db3dcde10b266fe1
 EBUILD telegram-desktop-3.1.8.ebuild 4358 BLAKE2B a305bba1349c0bc884014cd50c06308d831f7fc27e2b4aea0136a303f1eedaeb67631a6b27dc5860614cc6018c1e692833c272ea7ce7d29e00b0768c76dd44f4 SHA512 917c1ecd3c35ef953d3b71f5f1e3adaf74ea8aaa203e550dc775dfc1eb418675f5fc1aae08eebe4e0f5fc62edf64beb9e2ae6bee8fbfd73870cbcf66d5647ef9
 EBUILD telegram-desktop-3.3.0.ebuild 4622 BLAKE2B 20240a1921bcc98a34d685a93a0c66944420a8fc74770dbc5b3484e47ce02d146fa7184a16987184077019ee7ca3cb2c2e47586bbd09b2ce4617ea54fbc63a97 SHA512 6e98b3e166b918875bd73c0cae2eb6af507970d50cc8dd03555471fa35c954a6ece49de310934863f06fa726538241aaba6c3cb307fae7fd74457e884aa024ea
 EBUILD telegram-desktop-3.4.3.ebuild 4752 BLAKE2B 4817101e22311ee0414d2065522ba83cbacc1a877217a9403d6b5e70b096ecc51f25376bb151d5d8c77cc9a9f305c7d3af3dfb4fda7178aedca0194a6cf5f06e SHA512 909d08dd26ed182f1700b98a7675be52d31a3978ef274afefbf310709c8d0b934729f62bb05746833ce0995fb24eb5160715da2d4f013aab0a9eafcf33d7eba2
+EBUILD telegram-desktop-3.4.8.ebuild 4636 BLAKE2B 353cdac4d13a21377223ee6b506bd5956f32bfbb23c8c450997d3fb1a802a770f91719e313e052799b3bf5c46830a0288c20e107d9060a7f1f34e0454d36b1c6 SHA512 a31e12360be13e57a4896ec3bd4ad3d674fd0a64cd34d02b1aae44def1eed440a2a0929585ce8fb80cd866a3730873b5f9252f591d741a8e2c0e5d669890d9f6
 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e
diff --git a/net-im/telegram-desktop/files/tdesktop-3.4.8-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.4.8-jemalloc-only-telegram.patch
new file mode 100644
index 000000000000..e99cd2e4bf91
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.4.8-jemalloc-only-telegram.patch
@@ -0,0 +1,31 @@
+Only link jemalloc for the Telegram binary
+
+Some combination of factors is making the different codegen tools hang when
+jemalloc is linked for those, and they're ran under portage's sandbox. Since
+this is only used during build-time, and jemalloc is merely necessary to
+improve runtime memory use, it's unnecessary to use it for anything else.
+
+--- tdesktop-3.4.8-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-3.4.8-full/Telegram/CMakeLists.txt
+@@ -1331,6 +1331,11 @@
+         endif()
+     endif()
+ else()
++    target_link_libraries(Telegram
++    PRIVATE
++        desktop-app::external_jemalloc
++    )
++
+     if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
+         target_link_libraries(Telegram
+         PRIVATE
+--- tdesktop-3.4.8-full.orig/cmake/options_linux.cmake
++++ tdesktop-3.4.8-full/cmake/options_linux.cmake
+@@ -65,7 +65,6 @@
+ 
+ target_link_libraries(common_options
+ INTERFACE
+-    desktop-app::external_jemalloc
+     ${CMAKE_DL_LIBS}
+ )
+ 
diff --git a/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild b/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild
new file mode 100644
index 000000000000..5282d22ec82f
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-3.4.8.ebuild
@@ -0,0 +1,152 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit xdg cmake python-any-r1 optfeature flag-o-matic
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+
+MY_P="tdesktop-${PV}-full"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv"
+IUSE="+dbus enchant +hunspell screencast +spell wayland +X"
+REQUIRED_USE="
+	spell? (
+		^^ ( enchant hunspell )
+	)
+"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	dev-cpp/abseil-cpp:=
+	dev-libs/jemalloc:=[-lazy-lock]
+	dev-libs/libdispatch
+	dev-libs/openssl:=
+	dev-libs/xxhash
+	>=dev-qt/qtcore-5.15:5
+	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
+	>=dev-qt/qtimageformats-5.15:5
+	>=dev-qt/qtnetwork-5.15:5[ssl]
+	>=dev-qt/qtsvg-5.15:5
+	>=dev-qt/qtwidgets-5.15:5[png,X?]
+	media-fonts/open-sans
+	media-libs/fontconfig:=
+	~media-libs/libtgvoip-2.4.4_p20211129
+	media-libs/openal
+	media-libs/opus:=
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20211207[screencast=,X=]
+	media-video/ffmpeg:=[opus]
+	sys-libs/zlib:=[minizip]
+	dbus? (
+		dev-cpp/glibmm:2
+		dev-qt/qtdbus:5
+		dev-libs/libdbusmenu-qt[qt5(+)]
+	)
+	enchant? ( app-text/enchant:= )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	wayland? ( kde-frameworks/kwayland:= )
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/range-v3
+	=dev-cpp/ms-gsl-3*
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
+
+PATCHES=(
+	"${FILESDIR}/tdesktop-3.4.8-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-3.3.0-fix-enchant.patch"
+)
+
+# Current desktop-file-utils-0.26 does not understand Version=1.5
+QA_DESKTOP_FILE="usr/share/applications/${PN}.desktop"
+
+pkg_pretend() {
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "ccache does not work with ${PN} out of the box"
+		ewarn "due to usage of precompiled headers"
+		ewarn "check bug https://bugs.gentoo.org/715114 for more info"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# no explicit toggle, doesn't build with the system one #752417
+	sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
+		cmake/external/rlottie/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
+	local mycmakeargs=(
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
+		-DDESKTOP_APP_QT6=OFF
+
+		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus no yes)
+		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell no yes)  # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
+		# Building with snapcraft API credentials by default
+		# Custom API credentials can be obtained here:
+		# https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
+		# After getting credentials you can export variables:
+		#  export MY_TDESKTOP_API_ID="17349""
+		#  export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
+		# and restart the build"
+		# you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
+		# portage will use custom variable every build automatically
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="611335"
+			-DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
+		)
+	fi
+
+	# Fix for RISCV, as well as any other platforms that might generate libatomic calls
+	# Upstreamed in >3.4.3
+	append-ldflags '-pthread'
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! use X && ! use screencast; then
+		elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
+	fi
+	if has_version '<dev-qt/qtcore-5.15.2-r10'; then
+		ewarn "Versions of dev-qt/qtcore lower than 5.15.2-r10 might cause telegram"
+		ewarn "to crash when pasting big images from the clipboard."
+	fi
+	optfeature_header
+	optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk
+}