gentoo auto-resync : 08:12:2022 - 21:16:36

4 files changed, 224 insertions, 5 deletions

diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index bdd6ad8e06bf..3eddcb79eb14 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -10,6 +10,8 @@ AUX tdesktop-4.3.4-qt5-incompatibility-1.patch 1603 BLAKE2B b7ff625e874298617df3
 AUX tdesktop-4.3.4-qt5-incompatibility-2.patch 1325 BLAKE2B 0a74bb545024dbd4df62d52a7603f7a3b28b827940900f4338d6c05ac148ddaf2dcb6cefb8ff3905c737e7e330b896e493334f1dd114341d6818b1aec6e8469a SHA512 254acfe8b8cec69df629759f025ff1c979f609b0fa591a4137c96e9e726782049e4b6a799755b9e50ffffe6d0a26ca3211d4c12e28c7bacd07605b028235e474
 DIST tdesktop-3.6.1-full.tar.gz 41226549 BLAKE2B 6922ae015e36f86597aaedf1212ed951d6313a8f5f76a8838ab7ef9e02afe0cbc428acd991488190bafdf28faf2a69a09a5a1e963b2aa6ed27ef941602e15d88 SHA512 dd216c720ea3b1c72669805bb31319746a7ddfe746d188bf2ae0c5cdf0a10b379fc2e888a26fe755d77381fc5d9aa638cedc76b2dce1f1126a9c1ef9c02da2ba
 DIST tdesktop-4.3.4-full.tar.gz 50030732 BLAKE2B 68d9001128cca6e8a68d991e77a20f9764af9a634c37d792e92f7e77b0446b6d16ec1342f9e7ce7e0c49464f385f795164f9d176d65a74fc64fc072eae33d263 SHA512 415e0d60508317ef6d07e1f8aa2d974b166925f19349106cc543e487dd5bef8d1ff0548fb815682c6c4bb3bf762c08fcb1c7073f2c7ad305ae885b7979c70f88
+DIST tdesktop-4.4.1-full.tar.gz 50077498 BLAKE2B 6196c474c0771197c56b386bbfd67e4a014569cb8bd9676990e323005f06cb6938aad0c0dd00fd74cab9fca1ac50c7bf7227f34aa39ae598b4f003199fa8cd00 SHA512 91038f0a615ef7ae1050cbfa614041a3d6a45fdbd26d120ef98cca3c31377612c3bb1e80f9aff58c4853a1726bf2cfb427f752a4f88a796f05b381516c981563
 EBUILD telegram-desktop-3.6.1-r1.ebuild 4888 BLAKE2B 00e45ba4841ae6c61d5df8a9fe6bfc1bbfcf8fce3bc4fc8ac1b5f5cf48b02ecd4938b0877f3ad744113bd5c33d9e92327473975e7b9225113ce05d3d3a09bdbd SHA512 2f95014465cb27fbf6472d9074436403ba706b4c6012cc3e341c010d63958adc564415dafd3b2a78e86b7114975de894a3de7dbf60cf34987d1c3f4ba6d296fc
-EBUILD telegram-desktop-4.3.4-r1.ebuild 6776 BLAKE2B 4ad8754d6c226015fdff38572cf2534012488bdbafc0119217126c9f6485e0636765ecf996bf6cf03cada00abee5c68d8a9a19fbb8d42e81bc6d32ad1feb2010 SHA512 c211dc9cc1b25ff5e5dfea76a6c616ad579c253e364046c540cdfbede2e5a9ec1309b2fb50f81f64ac28e75076340dad02bece84b1875a29fdd285c50f5f32f6
-MISC metadata.xml 872 BLAKE2B 8a0aa8dde517ddab431e11465168feb22e928fff7b45b7b6296d2880ac6d22f0514cf123f4097043093706bff43f44d26da2ec2ea75d9270acc963cfbe2a43d5 SHA512 f5976687b829ce892063e865b2390b4b5ddbf9c118b51978d04170bdc26fc0fae5f8df78af083674618d4081b3837d731ed31013b80909849050091191e8603d
+EBUILD telegram-desktop-4.3.4-r2.ebuild 6776 BLAKE2B b28f772845dc5826fb63067c730cbf6bbf55228b2117e4bf5007318a55d25876ff88b049872834ce9ce38e46e2127039a84f40f8bd9628df5b593b1c77995a42 SHA512 ee349cb28bb4c2ceb77d6e7aa2a2e17fc1875294c49538c41fbf283ed81c0c6a8ee7156f4afe3e836cb79ff6fdc2b593f333dd5bcf894bbb4d3da8b0023cde3c
+EBUILD telegram-desktop-4.4.1.ebuild 6609 BLAKE2B 907bf56bb50ec9c7587d59e96608fa03ec4f0267cd9184d2eaf51d1e92a056123ae1eff8d5d6a6e26ed92e4c82fa4808dfffe891b24a8ceb6bf93308976d6ce7 SHA512 88ba64d8df6ad9218b3105ea5c88bd0162b205ae9749ca66fc9e71ecfc8a207a773f8f60e8ddafc573ceff7aefa569e990a1f7a13fb25b38a2714a2ffb31c4b4
+MISC metadata.xml 1111 BLAKE2B da28403273bdd0e3055f45070a419b8cc65867ec406f3bb19f048e465604a88426d3857e4b7d696ccfd8405713d7a587d0dec5fde8cb264df59f246045584282 SHA512 2fc1a41ad4dfd78d1e02ef5d0ff2fa391cf2950bf6645038a61f0ad48803ad505917ed4a787f0397d529c1ed07d78c0bfd425f6fb9a9876f5a015f573769d38d
diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml
index 5359672b12eb..a87e97ea9955 100644
--- a/net-im/telegram-desktop/metadata.xml
+++ b/net-im/telegram-desktop/metadata.xml
@@ -16,4 +16,9 @@
 		<flag name="qt6">Build with Qt6 support</flag>
 		<flag name="qt6-imageformats">Add support for HEIF, AVIF and JpegXL by bundling kde-frameworks/kimageformats</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">telegramdesktop/tdesktop</remote-id>
+		<bugs-to>https://github.com/telegramdesktop/tdesktop/issues</bugs-to>
+		<changelog>https://github.com/telegramdesktop/tdesktop/releases</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/net-im/telegram-desktop/telegram-desktop-4.3.4-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.3.4-r2.ebuild
index 839dae189ee7..442730b0071d 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.3.4-r1.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-4.3.4-r2.ebuild
@@ -48,7 +48,6 @@ RDEPEND="
 	~media-libs/tg_owt-0_pre20220507:=[screencast=,X=]
 	media-video/ffmpeg:=[opus]
 	sys-libs/zlib:=[minizip]
-	x11-libs/xcb-util-keysyms
 	virtual/opengl
 	dbus? ( dev-cpp/glibmm:2.68 )
 	enchant? ( app-text/enchant:= )
@@ -71,11 +70,14 @@ RDEPEND="
 		wayland? ( dev-qt/qtwayland:6 )
 		qt6-imageformats? ( ${KIMAGEFORMATS_RDEPEND} )
 	)
-	X? ( x11-libs/libxcb:= )
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util-keysyms
+	)
 "
 DEPEND="${RDEPEND}
 	dev-cpp/range-v3
-	=dev-cpp/ms-gsl-3*
+	dev-cpp/ms-gsl
 "
 BDEPEND="
 	${PYTHON_DEPS}
diff --git a/net-im/telegram-desktop/telegram-desktop-4.4.1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.4.1.ebuild
new file mode 100644
index 000000000000..b77e4471ba3d
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-4.4.1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+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 ~arm64 ~ppc64 ~riscv"
+IUSE="+dbus enchant +fonts +hunspell +jemalloc screencast +spell qt6 qt6-imageformats wayland +X"
+REQUIRED_USE="
+	spell? (
+		^^ ( enchant hunspell )
+	)
+	qt6-imageformats? ( qt6 )
+"
+
+KIMAGEFORMATS_RDEPEND="
+	media-libs/libavif:=
+	media-libs/libheif:=
+	media-libs/libjxl
+"
+RDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	dev-cpp/abseil-cpp:=
+	dev-libs/glib:2
+	dev-libs/libdispatch
+	dev-libs/libsigc++:2
+	dev-libs/openssl:=
+	dev-libs/xxhash
+	media-libs/fontconfig:=
+	media-libs/libjpeg-turbo:=
+	~media-libs/libtgvoip-2.4.4_p20220503
+	media-libs/openal
+	media-libs/opus:=
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20220507:=[screencast=,X=]
+	media-video/ffmpeg:=[opus]
+	sys-libs/zlib:=[minizip]
+	virtual/opengl
+	dbus? ( dev-cpp/glibmm:2.68 )
+	enchant? ( app-text/enchant:= )
+	hunspell? ( >=app-text/hunspell-1.7:= )
+	jemalloc? ( dev-libs/jemalloc:=[-lazy-lock] )
+	!qt6? (
+		>=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?]
+		kde-frameworks/kcoreaddons:=
+	)
+	qt6? (
+		dev-qt/qt5compat:6
+		dev-qt/qtbase:6[dbus?,gui,network,opengl,widgets,X?]
+		dev-qt/qtimageformats:6
+		dev-qt/qtsvg:6
+		wayland? ( dev-qt/qtwayland:6 )
+		qt6-imageformats? ( ${KIMAGEFORMATS_RDEPEND} )
+	)
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	dev-cpp/range-v3
+	dev-cpp/ms-gsl
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
+
+PATCHES=(
+	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram.patch"
+	"${FILESDIR}/tdesktop-4.3.4-qt5-incompatibility-2.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 "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() {
+	# Bundle kde-frameworks/kimageformats for qt6, since it's impossible to
+	#   build in gentoo right now.
+	if use qt6-imageformats; then
+		sed -e 's/DESKTOP_APP_USE_PACKAGED_LAZY/TRUE/' -i \
+			cmake/external/kimageformats/CMakeLists.txt || die
+		printf "%s\n" \
+			'Q_IMPORT_PLUGIN(QAVIFPlugin)' \
+			'Q_IMPORT_PLUGIN(HEIFPlugin)' \
+			'Q_IMPORT_PLUGIN(QJpegXLPlugin)' \
+			>> cmake/external/qt/qt_static_plugins/qt_static_plugins.cpp || die
+	fi
+
+	# kde-frameworks/kcoreaddons is bundled when using qt6, see:
+	#   cmake/external/kcoreaddons/CMakeLists.txt
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# The ABI of media-libs/tg_owt breaks if the -DNDEBUG flag doesn't keep
+	# the same state across both projects.
+	# See https://bugs.gentoo.org/866055
+	append-cppflags '-DNDEBUG'
+
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
+		-DQT_VERSION_MAJOR=$(usex qt6 6 5)
+
+		-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus)
+		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
+		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
+		-DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex !spell)  # enables hunspell (recommended)
+		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)  # enables enchant and disables hunspell
+		-DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts)  # use system fonts instead of bundled ones
+	)
+
+	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
+		ewarn "both the 'X' and 'screencast' USE flags are disabled, screen sharing won't work!"
+		ewarn
+	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."
+		ewarn
+	fi
+	if ! use jemalloc && use elibc_glibc; then
+		# https://github.com/telegramdesktop/tdesktop/issues/16084
+		# https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
+		ewarn "Disabling USE=jemalloc on glibc systems may cause very high RAM usage!"
+		ewarn "Do NOT report issues about RAM usage without enabling this flag first."
+		ewarn
+	fi
+	if use qt6; then
+		ewarn "Qt6 support in gentoo is experimental."
+		ewarn "Please report any issues you may find, but don't expect"
+		ewarn "everything to work correctly as of yet."
+		ewarn
+	fi
+	if use wayland && ! use qt6; then
+		ewarn "Wayland-specific integrations have been deprecated with Qt5."
+		ewarn "The app will continue to function under wayland, but some"
+		ewarn "functionality may be reduced."
+		ewarn "These integrations are only supported when built with Qt6."
+		ewarn
+	fi
+	if use qt6 && ! use qt6-imageformats; then
+		elog "Enable USE=qt6-imageformats for AVIF, HEIF and JpegXL support"
+		elog
+	fi
+	optfeature_header
+	optfeature "shop payment support (requires USE=dbus enabled)" net-libs/webkit-gtk:4
+	if ! use qt6; then
+		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl]
+	fi
+}