gentoo auto-resync : 28:10:2023 - 16:35:15

4 files changed, 249 insertions, 0 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index aec44331ea6d..a705bfc47452 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index af9bb853f59c..9af9f1f2451b 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,14 +1,17 @@
 AUX tdesktop-4.10.0-system-cppgir.patch 1150 BLAKE2B d8a6e1320c2ccfd4f1c3f63bfda11f58a499df3880f262adf3f1b74f217dc8c4cc62a8c250d71ff809fb67c797948b53fac5a4d5c584a116b1609ea432662d73 SHA512 0fd213f9aec3a6ff9be11654934126960309cb8e1241dd694852bffeb7a37a08d3c78a332a5bb7e6529358df69bfddb7ccb58138e6dc331f20dd5337ddc9a1c1
 AUX tdesktop-4.10.3-fix-clang-libstdcxx.patch 501 BLAKE2B 2bedef1c542c3312236f7fd4cc4d455d298749790a53718264df35b268e09b9f1bbdf8a77b52468037a8c1ad5b32f92249b20dadb136797c68d2fa4e3f0e1551 SHA512 b9ddee5ae7ebd060cf7d739ed633f02c2142c903e4dc9a98cb8937077481b1b5c35cadacc1eb48a0b0d47e72d76d2a0cb4dbc392af449be6cd21bc05a381d66b
+AUX tdesktop-4.10.5-qt_compare.patch 381 BLAKE2B 5a5ceea9163f5c2a4cda0df5d10e4013a9634e11a3a3694e1d09166ec311c1089f75b48fa6d618965b722daae40d1f297484ea954341ef8420c7259425eb0ef8 SHA512 d37fea06e9178c778560d2f46b2953794b1605635bdcbf1343a5077c1270d7ec56e5cbb00bdf6caf7eafe21a3c44faa719b9376b8d317d2a109308107fae4226
 AUX tdesktop-4.2.4-jemalloc-only-telegram-r1.patch 1307 BLAKE2B b27f65973a6fa8c83469e0c6419a600ca04ebbf35f6c4a406129867eee644082c4f0164fb71afbc6ae729bb4037d0cf6c68ea1ad78f6268bfe245b83e4290400 SHA512 d2c33dd18e354ebe6cb7143b58e9f61dc4cd664bb1e7ad9c60f562efbb05cc72d5b36270af96b866583b366b59cc34cadee3a62dcbd40433276b80b2511e1fcb
 AUX tdesktop-4.4.1-fix-dupe-main-decl.patch 853 BLAKE2B 6a3ce346467a3b6450674a77157f3fa45d9e1991160ce33e9cc58292a8441310468943225d5d5b2ba5e5c23feaba544d52f19c964130a8e8c724a99392072abe SHA512 edaad94a901181f0bca4a64b4ab2277a247073005b351156df02532dfff470a4060e6b709197da0778b5484d39a4c1bc1f75e9df068872d68209dd47eca9ac54
 AUX tdesktop-4.8.3-fix-clang.patch 2217 BLAKE2B d487e97730032d81e063fd509aa2bea642d471c103da8754b56e9b5096861762f719ef891ae9ba7f7d275247904af616d614e6c5581d6b1b2ac53598ba8bf967 SHA512 e9d603ef61d819e2cbaacdd0e77439ee1580e7613b3867e468f0fc9d670558489915e4c12a30841685af6cead8d44bc6b23f6c839cfc04720e293322f794d4c7
 AUX tdesktop-4.8.4-remove-private-qt.patch 1754 BLAKE2B 60d2c2c0a4fbe85f8715d3aeb1abdfb336f94ec0d61e48e6152f29867fa9868dd5d1d9ded1f2b8e1c7515f4af3d28d67f71d775b5eac81fbf5ebea9363c6b78d SHA512 6697373493800f7f597e507579c6195a5c4c050ccbdd65fe8d78fef945ce79fea3f6b29c2ae413d752201af89ef5ad67e91b0a80db3a48330031c13ef0cddbee
 AUX tdesktop-4.8.4-system-cppgir.patch 1882 BLAKE2B 05073b4cefb6e9cac75906f5beaec8c425fe5fa249494f9b5d29d9d23822f71c7f8c513688101481004b31f4a0cf520d61fab8f5918429e52ed6781d89e269d8 SHA512 179155ef27453bcc9fc46a90d1cfa832c4d9ed76481270e8a6c6eba5ff51ff6fa94ace5cc8b1cb79b494147474ef93100d97767d0442c9802de32a72f61330e4
 DIST tdesktop-4.10.3-full.tar.gz 67750018 BLAKE2B 395484594dc201019b5cdf3fdaabe1155dca99504b74e65951b6264b61ed0403bb1e016542c6c59370b3ee39d1449ea223409fc64fd6bff723c1be43b615570a SHA512 1e7c0f32b4e17c1f1c39aa9a4f35ce2867324c4410a30fde2c2d6ca5d5fe59a84f58f93cb6b4f8c7ad04fa0adcaf5a276dd2aa7dee0ef34446e6bb95fafa49d6
+DIST tdesktop-4.10.5-full.tar.gz 68246449 BLAKE2B e1059a929776ba1769515b0a4d9e118c471a48050be77fbcda885c572537a9a7051c0a6deb9a6b9c913af0ea0087b4c826bb905a9c98e4fab04aeaa755da9127 SHA512 8f15428e126bd11e76ca48f21ad98022e20443acca6344e3e27abafe09225cc1dfe0f300235e083abd39ff72d03946613b731d4067a3a11f42c265fe37266c74
 DIST tdesktop-4.8.1-full.tar.gz 63997319 BLAKE2B daac461f0b3205bf647027329660b43f4646db987e27bfe2a2848bfbfb3309c503132d1533f26e95512520417d30f5063b1c395b174787aa7533727549ee77e5 SHA512 4dc495e4502bdba634c4468af4f1321aef1152d619c811f004489f8616504a465069508239eae41a08a83e190a61d26881733ebc38dd88160f81dce070bb0567
 DIST tdesktop-4.8.4-full.tar.gz 69090626 BLAKE2B e2c6072b7b90911068ed57ed651176fb4d772f14710d2a4012bda47dae50be7f3050242c3a6950035f3f33a4041257cadac54e639691735f6acfda98c8db8b7b SHA512 7988d047cb72888e303f9902f04bd2168f67fb18a4451e5122ce80b0aef726173f0ee10f83b8bb713a46e02c9ec4150ad6128e4288be432ed3d590011f80e4dd
 EBUILD telegram-desktop-4.10.3-r1.ebuild 7225 BLAKE2B bb9087d2f3f41bef63f5e1de900665b4a9897150be6538bae4b1b5eefd45a9662629ad94f73672dc455627bcd7adc03510fe7a7391e52b2bce2e1b77cf732e8f SHA512 57ffa3c86b7037ef3d78d3991bb8337e7eea7a66d15b0fcdcec0525eb2a10d76bd37f3443ecb78a3b55a9d02a0e91bd2f673b24391003d51248ba8cd150d601e
+EBUILD telegram-desktop-4.10.5.ebuild 7268 BLAKE2B d5904b9ca3f6ef7d71ff4497c5182a6f720c79eb4ce04e589e0c4cb3c938406988e0b4697222aae47b50c077373c425f9f97db10b91e16ba656afa85e9764c95 SHA512 124539fc70b4fee76ed03973cc9935a54d34dd756a118d14b7ee2096f28c3d857d3416562809f3a7f650a12bffbf078676c120900af6a5981c298dbd48213c33
 EBUILD telegram-desktop-4.8.1-r3.ebuild 6537 BLAKE2B 7cd698ad91e5ce00b4d6dba7a696a4cb9250b1aa696fe446ca08086e155c511b2419a384cbd03179280fd6e206964ac648732f66b64e476f4fcf44abd873bc11 SHA512 703eb9c6afd01d9ffa901dbb1d710bfd8dd9956ade0eed49cec16948a49b1da49cc6af3a81c604c0bf1de3b5b838e4bff65178a99cde99bfae97c911fe9dc917
 EBUILD telegram-desktop-4.8.4-r1.ebuild 6664 BLAKE2B 2f12560bae1643edebc244d1dcd1a04a588427ebe36dd4f136b8c9ac03e402eede3133a7b570b5abb38ffafb32d57c535b4312e5f24a85c08f7f344b5a93947e SHA512 c78bfbc8b972832edd2cfc11d2cef6b029c69f987bc8fc875c6c7c0e7841a547a7024fbe0d17f420b7ba8ef5b56c0ce811168cb9a3f1951f579b6e2ae8d6df15
 EBUILD telegram-desktop-4.8.4-r2.ebuild 6982 BLAKE2B ab3a8274c0534153cffbc3c1b1af33c546a56c8c46179648f7d635ce60080d3e457a8727961c7364ab49cb182d3fd111df13d1bb03fd69d344d63c2f5a9f627f SHA512 15a63bcf6355fe003306f3a98c1b266d89f2695c8a13f1c662ed33eea557bd792f2b2436f30ec060c4f8a4330a7327465b2e37c474c6a195d95e87717ea8a324
diff --git a/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch b/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch
new file mode 100644
index 000000000000..f481ddd74d7c
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-4.10.5-qt_compare.patch
@@ -0,0 +1,12 @@
+diff --git a/Telegram/lib_base/base/qt/qt_compare.h b/Telegram/lib_base/base/qt/qt_compare.h
+index ca03fa2..d1eb6ab 100644
+--- a/Telegram/lib_base/base/qt/qt_compare.h
++++ b/Telegram/lib_base/base/qt/qt_compare.h
+@@ -10,6 +10,7 @@
+ #include <gsl/pointers>
+ 
+ #include <QString>
++#include <variant>
+ 
+ #if !defined(__apple_build_version__) || (__apple_build_version__ > 12000032)
+ 
diff --git a/net-im/telegram-desktop/telegram-desktop-4.10.5.ebuild b/net-im/telegram-desktop/telegram-desktop-4.10.5.ebuild
new file mode 100644
index 000000000000..3d4d93ae110e
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-4.10.5.ebuild
@@ -0,0 +1,234 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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 ~riscv"
+IUSE="dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland webkit +X"
+REQUIRED_USE="
+	qt6-imageformats? ( qt6 )
+"
+
+KIMAGEFORMATS_RDEPEND="
+	media-libs/libavif:=
+	media-libs/libheif:=
+	media-libs/libjxl
+"
+CDEPEND="
+	!net-im/telegram-desktop-bin
+	app-arch/lz4:=
+	dev-cpp/abseil-cpp:=
+	>=dev-cpp/glibmm-2.77:2.68
+	dev-libs/glib:2
+	dev-libs/libdispatch
+	dev-libs/openssl:=
+	dev-libs/protobuf
+	dev-libs/xxhash
+	media-libs/libjpeg-turbo:=
+	~media-libs/libtgvoip-2.4.4_p20221208
+	media-libs/openal
+	media-libs/opus
+	media-libs/rnnoise
+	~media-libs/tg_owt-0_pre20230921:=[screencast=,X=]
+	media-video/ffmpeg:=[opus,vpx]
+	sys-libs/zlib:=[minizip]
+	virtual/opengl
+	!enchant? ( >=app-text/hunspell-1.7:= )
+	enchant? ( app-text/enchant:= )
+	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:5
+		webkit? (
+			>=dev-qt/qtdeclarative-5.15:5
+			>=dev-qt/qtwayland-5.15:5
+		)
+	)
+	qt6? (
+		>=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?]
+		>=dev-qt/qtimageformats-6.5:6
+		>=dev-qt/qtsvg-6.5:6
+		wayland? ( >=dev-qt/qtwayland-6.5:6[compositor] )
+		webkit? (
+			>=dev-qt/qtdeclarative-6.5:6
+			>=dev-qt/qtwayland-6.5:6[compositor]
+		)
+		qt6-imageformats? (
+			>=dev-qt/qtimageformats-6.5:6=
+			${KIMAGEFORMATS_RDEPEND}
+		)
+	)
+	X? (
+		x11-libs/libxcb:=
+		x11-libs/xcb-util-keysyms
+	)
+"
+RDEPEND="${CDEPEND}
+	webkit? ( net-libs/webkit-gtk:4 )
+"
+DEPEND="${CDEPEND}
+	>=dev-cpp/cppgir-0_p20230926
+	>=dev-cpp/ms-gsl-4
+	dev-cpp/range-v3
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-cpp/cppgir-0_p20230926
+	>=dev-util/cmake-3.16
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+"
+# dev-libs/jemalloc:=[-lazy-lock] -> https://bugs.gentoo.org/803233
+
+PATCHES=(
+	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch"
+	"${FILESDIR}/tdesktop-4.10.0-system-cppgir.patch"
+	"${FILESDIR}/tdesktop-4.10.5-qt_compare.patch"
+)
+
+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
+
+	# Happily fail if libraries aren't found...
+	find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \
+		\! -path './cmake/external/expected/CMakeLists.txt' \
+		\! -path './cmake/external/qt/package.cmake' \
+		\! -path './Telegram/lib_webview/CMakeLists.txt' \
+		-print0 | xargs -0 sed -i \
+		-e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \
+		-e '/find_package(/s/)/ REQUIRED)/' || die
+	# Make sure to check the excluded files for new
+	# CMAKE_DISABLE_FIND_PACKAGE entries.
+
+	# Control QtDBus dependency from here, to avoid messing with QtGui.
+	if ! use dbus; then
+		sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \
+			-i cmake/external/qt/package.cmake || die
+	fi
+
+	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 qt=$(usex qt6 6 5)
+	local mycmakeargs=(
+		-DQT_VERSION_MAJOR=${qt}
+
+		# Control automagic dependencies on certain packages
+		## Header-only lib, some git version.
+		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=$(usex !webkit)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland)
+		## Only used in Telegram/lib_webview/CMakeLists.txt
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit)
+
+		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
+		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
+		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
+		## Enables enchant and disables hunspell
+		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)
+		## Use system fonts instead of bundled ones
+		-DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts)
+	)
+
+	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 ! 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 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
+	if ! use qt6; then
+		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl]
+	fi
+}