gentoo resync : 25.09.2021

6 files changed, 211 insertions, 2 deletions

diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 8e25acbfb57b..4b4dc82bf440 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,7 +1,11 @@
 AUX tdesktop-2.9.3-add-libdl-dependency.patch 615 BLAKE2B f87d48b6c36116bad13f4f930fc69de132e9b916f02b6055fb5b770e9ab4944c4d8c0e0b7d3e7da580ba1e3b848fd94636a36221c35b29518ca349cd0ed727bf SHA512 86f54fd463c6a681d17e1beb0cbbe0f67e6fd74fa8e5dce350a61ff92da19f3879e81cbb996b97195091794bca174742cb1203aba08d1b95e9389d878f05f254
 AUX tdesktop-2.9.3-jemalloc-only-telegram.patch 988 BLAKE2B 487ce32454a5bfb51a081c7bd6803ff6cc956b349569d5ddf17d2abb7d7d5f0714002de654e149d8aefe6880e6b827c2ffb42c22e3ffa3fc6f10286c3e805463 SHA512 a1645bac4b715bad17a78226b9e76e30117f64715b1833df17950c882940a2ebbf18c70ab9ec628002408859292b57b9c4a48f9212bd15d9d2903867012eb3cf
+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
 DIST tdesktop-2.9.3-full.tar.gz 37335782 BLAKE2B 197583ba6568c455218c51f590c1ba1a3f10c390caa4fd03657098f499ce113a4f5f57ca9dd53bc4baba31992d4229768ed35e68ad6b0685010bc335817edcac SHA512 810cfac5d7e6ce9413b1b2406927e89c1383ea5b725233a68b2cb29dd374b4c3386c22186640afde4492c844516c88889a5db8e5b167a09d6d6c1270ac965ac4
 DIST tdesktop-3.0.1-full.tar.gz 37531917 BLAKE2B c139501f23c742f76d4acd43def69963413ffafef1be584f13d7359b3c20625def7ec283a981556c795aa4dc5ad2e117e1f8aada28cd4815f66f02510e607435 SHA512 6bff6be5f2c0c7a17df61dccc5a3216dcbb95a1c6d3176442c530e2c1b525e6d15079b230d40751f20684da2a1067d4518a9a1ab90d49d1a7338d3e05239d447
-EBUILD telegram-desktop-2.9.3.ebuild 4336 BLAKE2B ca0dd4416d7b2bbda13e8adfa548eca9db4140f50970c20fdeb2893ef019eb6a201006acda6e87ec4cd667750f37289f5fcae5e47e944a90d0c6325b26018254 SHA512 0d4ee5774bca8406eda829a119ef7e01e37824cddbf21c3033d6cf7d5dd3896fc055093a924c7eabd5f859d3af60701df72aec75b733c45b69327b014f6055cd
-EBUILD telegram-desktop-3.0.1.ebuild 4216 BLAKE2B 3c74c83e74625be07b36b867bd7c6722c1dc7003e724aaa2bfc40ce824783cb2cb1659865fb068ba2940b9dc35aa5953f0431b5d676c55aac86919bcfd021665 SHA512 8f21fdb4bab4fca0636ea0da87f7ba2ab5f90601e20b67862852fdcf6150ad62e89c3c5994b67d0d2757658b238ec3efde620c6cf170d5e7a18a066109bf5603
+DIST tdesktop-3.1.0-full.tar.gz 38465279 BLAKE2B c9442507d3ec6f6e36e68d44ec86a9c1dfb864498ee90eef5f50b12482de4e1c93256352fc21bf997c38cda0dfce03f53776c47afe1a3066b109c1675ffc8749 SHA512 7fbb5722917c482aed820154e425642c4a3c7649defebae7076e48ac25da8744933877b70539d5cd6952e9f80493ccc5f144bf2c0c01083bade3473f00a23ec4
+EBUILD telegram-desktop-2.9.3-r1.ebuild 4378 BLAKE2B e93eb591dfb85de579398166b565d473d51edcbe5da9463b6e495ef4190574780ad626e5542019a032dff09de4fed94eb35f2029ae3860ad700eb6451093d45e SHA512 6f2b955352ad244d39286af4c1001e4bb67101d4dd9fa42bf338ac90cc5c15ae3f8b6fb09f8a955a447b5f13e963f4ac33624e3c5197e36936fabdb8e6bd8dc0
+EBUILD telegram-desktop-3.0.1-r1.ebuild 4326 BLAKE2B c5643127d791d9bab485163fd6b4d38771750f6c2e1457d02b0d40012421aad5ec3b6bf94fe9f08e08920f121aba827d057a7c62f5ab889a88a250345df62f77 SHA512 23ebe675b4d967ebc083fcbd6bf2363cf15bf646df2bd7a38240291f6764e1354c8206819819a0c9f88c051ed4f700aed5fdc2b122ae583d291acf936392db48
+EBUILD telegram-desktop-3.1.0.ebuild 4372 BLAKE2B 36240b358bb02e5a4dd43bebd5ef27598db90207b4d242083ded672d0c8704fd57b02761d60c253558cf4ce38a019df8ade44141e227fc32cf8681eb0db26943 SHA512 7442d197978235bb587c422b1f3052e7bfb2a904cfc23c138f180134220856ec843c9024e13b11e878e051b1f70dedc48d38e0c8e014b266dc59c4603db06ab2
 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e
diff --git a/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch b/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch
new file mode 100644
index 000000000000..2b92e8adce4f
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.1.0-fix-openssl3.patch
@@ -0,0 +1,19 @@
+Fix openssl 3.x compatibility
+
+FIPS_mode_set was merely used to clean up resources. This isn't necessary
+anymore on the newer openssl version.
+
+There's still a lot of functions that are used that were deprecated. I hope
+upstream can fix those, as I'm unsure what to do with them.
+
+--- tdesktop-3.1.0-full.orig/Telegram/SourceFiles/core/utils.cpp
++++ tdesktop-3.1.0-full/Telegram/SourceFiles/core/utils.cpp
+@@ -124,7 +124,7 @@
+ 
+ 	void finish() {
+ 		CRYPTO_cleanup_all_ex_data();
+-#ifndef LIBRESSL_VERSION_NUMBER
++#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x20000000L
+ 		FIPS_mode_set(0);
+ #endif
+ 		ENGINE_cleanup();
diff --git a/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch
new file mode 100644
index 000000000000..7ad3e75e49ba
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-3.1.0-jemalloc-only-telegram.patch
@@ -0,0 +1,35 @@
+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.1.0-full.orig/Telegram/CMakeLists.txt
++++ tdesktop-3.1.0-full/Telegram/CMakeLists.txt
+@@ -1256,6 +1256,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.1.0-full.orig/cmake/options_linux.cmake
++++ tdesktop-3.1.0-full/cmake/options_linux.cmake
+@@ -45,11 +45,6 @@
+     target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>)
+ endif()
+ 
+-target_link_libraries(common_options
+-INTERFACE
+-    desktop-app::external_jemalloc
+-)
+-
+ if (DESKTOP_APP_USE_ALLOCATION_TRACER)
+     target_link_options(common_options
+     INTERFACE
diff --git a/net-im/telegram-desktop/telegram-desktop-2.9.3.ebuild b/net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild
index 9e09efaee54e..eda146962285 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.9.3.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.9.3-r1.ebuild
@@ -29,8 +29,10 @@ REQUIRED_USE="
 RDEPEND="
 	!net-im/telegram-desktop-bin
 	app-arch/lz4:=
+	dev-cpp/abseil-cpp:=
 	dev-cpp/glibmm:2
 	dev-libs/jemalloc:=[-lazy-lock]
+	dev-libs/openssl:=
 	dev-libs/xxhash
 	>=dev-qt/qtcore-5.15:5
 	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
diff --git a/net-im/telegram-desktop/telegram-desktop-3.0.1.ebuild b/net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild
index 4c3ae78f28d6..f17835c3420d 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.0.1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.0.1-r1.ebuild
@@ -28,8 +28,10 @@ REQUIRED_USE="
 RDEPEND="
 	!net-im/telegram-desktop-bin
 	app-arch/lz4:=
+	dev-cpp/abseil-cpp:=
 	dev-cpp/glibmm:2
 	dev-libs/jemalloc:=[-lazy-lock]
+	dev-libs/openssl:=
 	dev-libs/xxhash
 	>=dev-qt/qtcore-5.15:5
 	>=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
@@ -67,6 +69,7 @@ BDEPEND="
 	>=dev-util/cmake-3.16
 	virtual/pkgconfig
 "
+# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-im/telegram-desktop/telegram-desktop-3.1.0.ebuild b/net-im/telegram-desktop/telegram-desktop-3.1.0.ebuild
new file mode 100644
index 000000000000..675c8aefaa4d
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-3.1.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit xdg cmake python-any-r1 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"
+
+LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="+dbus enchant +hunspell screencast +spell wayland webkit +X"
+REQUIRED_USE="
+	spell? (
+		^^ ( enchant hunspell )
+	)
+	webkit? ( dbus )
+"
+
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	dev-cpp/abseil-cpp:=
+	dev-libs/jemalloc:=[-lazy-lock]
+	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_p20210302
+	>=media-libs/libtgvoip-2.4.4_p20210302-r2
+	media-libs/openal
+	media-libs/opus:=
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20210914[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:= )
+	webkit? ( net-libs/webkit-gtk:= )
+	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
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/tdesktop-3.1.0-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-3.1.0-fix-openssl3.patch"
+)
+
+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_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_WEBKITGTK=$(usex webkit 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
+
+	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
+}