gentoo auto-resync : 01:12:2024 - 02:06:42

3 files changed, 42 insertions, 44 deletions

diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index f4553f0250b6..87470343ccdf 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -3,10 +3,11 @@ AUX tdesktop-4.2.4-jemalloc-only-telegram-r1.patch 1307 BLAKE2B b27f65973a6fa8c8
 AUX tdesktop-5.2.2-libdispatch.patch 1101 BLAKE2B 27cf706c7d77dbb9080cc9cf4891c83f0067b505bc5ae461f8ddfeb147c2ca04efa624f9e37fac9fe723cf704671eb4884c1e26316e0cc53d2c1825984ee7e75 SHA512 f1f6670476178a7b66ce080edbcdc5d49bbce685b08cc9e0dc98053ee9e2f70f106e0f7615b3f13a00e42171a8094053a35bbdcaca712d7ab87ff86de3d4509a
 AUX tdesktop-5.2.2-qt6-no-wayland.patch 3630 BLAKE2B c573d04493233efc065a74644e0d8fcb5f61a6fd2fe8be7a15f6ee61d13934eeb62a848fa91f18f9684bee40833f4266cc949396ff08fe5f66bd55f6d9aaf056 SHA512 8c77d17e2cd1261a83701a0be967a38df054982319612dc69921604deb0eec380a16f6879137b0ba3b0e94a2aada33efbd0cbbd878097c2ef9dd1f873336536d
 AUX tdesktop-5.7.2-cstring.patch 350 BLAKE2B f6a7922d7a4fc6c2230e82f8e31d69a456ba4726fc09ee1406d1b2a6bef12d3cdcec614a58f6c12b21a7cda6318d02cabba420ef293e1bcca9deb8f699298103 SHA512 36fac80b3c4212c15daf6cb4a912dd30031bede7c120509aadf44958d6a04af5647fcb4ca2bf158065d7fadd53a837e7f8e5a2b8ec32947afb32671d37652ff6
+AUX tdesktop-5.8.3-webkit-no-wayland.patch 547 BLAKE2B f1163a59d779d56c7e999f6fd451d7060c8c4087c55670321993d02f09e3a0e0688842b51bd6e9a50a459e4cf84e8e43ec530a977c900a32f6e5d8c19ef1b33e SHA512 4479315690d00480dc0005b6d198fca03e07935fb5231669b45d1f80ae4a4757e5ed9fdf855cc57ee01d1ad94e6b4447764500a74fe20f982afac65dde45d35f
 DIST tdesktop-5.5.5-full.tar.gz 70112426 BLAKE2B 21cdb01d66ea1d1b7479995d790fc44d65248c807dafb25d865970a0d619483ccccd99c8d64b6853d8aa29c78c73010f14e720bf707c918e7c3bb5cb2428dde5 SHA512 88cd526fb02b7b0459cb1bd1b0c57147b2261e57c392d2cb62964015ef6b26e202fba717b35d74201c41becf0a5d78ef4d9d593b5666b3f0a0db646e40bfd1fc
-DIST tdesktop-5.6.3-full.tar.gz 70333924 BLAKE2B a42ded12ef7403153e36073cec5b1343d7c4f5e6db0db561b9df4db7f59157dcf57d5c487fbb6543305cdb1c4b4e772e1fd21037f79570f26fbc9bdc4522c4ee SHA512 0cce16f780f1350199d8a10a9eff6e8052888aede5d3839d3435acdfb34f445098ec24cac21d1950f704350c22bec86020e6c746706bb34c5533e2086e6cb597
 DIST tdesktop-5.7.2-full.tar.gz 70396886 BLAKE2B 5e592e06f5c85290d06deb1ecef8e18bdafd5de3205046ddf0ca2574d480e95d3c81db55c0955d05251d9df3cf558edec9681603cdb0e85f39e2dac44f1c53d0 SHA512 55fa4f20ceae71f2b869c00abdcf6a27f505156f7b254e38a68a97ea34b09e2e9deeef1fec6c5633e93043fb2e9e9ea72502ec9daeed319c8de65cbe825ca916
+DIST tdesktop-5.8.3-full.tar.gz 70450970 BLAKE2B 475d70beaf08898d69888a7484409886f894f2327eaae3027b22d10bf0926369542141a959474f74c7a1bb7c50c8981f407a7695e363708dbdb32c4eed393d9a SHA512 272c677544fdca4e2a7e24a5821fb0e99f9caef4388d577c47442351ff1939837163fb2d83a2ec929b92c60197608ed968b5f98b180735218b6cf57cdd501327
 EBUILD telegram-desktop-5.5.5.ebuild 8625 BLAKE2B 897d8c05f56262d293108c27f0e77b4caa77d8e572f7e93e035c0ebdf1077aec867dedd0362874eaddcea80da9ac631f3bba443eaa5bb4e93f89468a88128863 SHA512 278dca209afee79157ebb81aa772ceb31da88037c986c5370ec575e456247ef34bf1c9b7152ebbe46bd58d16b8742c9fea2a28518178a76056e37a4b394e903a
-EBUILD telegram-desktop-5.6.3.ebuild 8633 BLAKE2B ffb1ee84d2b595f68abb0274e86c131b44daea256452b086dea4b73a8eeb6c10897b78126211f8c4b6930b4ddb84ede3ad4ef411c76f183dece749170e1a1019 SHA512 8da0dd0a0734e6ea8427a1bee6f82f7f5158c8c3731e59ec07bb873bc34e0e2da0a43c1809c2e90e2aa62687210d47df1fe61bb2228cc9998a6a7131ef6e33e2
 EBUILD telegram-desktop-5.7.2.ebuild 8674 BLAKE2B dfdf908bceb6f1b777e3d4eba6f7633548948a5eaf9e5336520482d0a69e2a2cc3c2bbfe7b840e54eb6806c51f15e3465c645bfbebe71e185a8354b803770d7c SHA512 a88799799cb507d6e8a45d45777bbe3f76c6782e6b1b919acbf67244112aa6fec3d75a0198c5b21f776b49e4230ae1883f657fca3f955ec18c721e7bf035cd16
+EBUILD telegram-desktop-5.8.3.ebuild 8272 BLAKE2B 7d10b6bcef659edf311dfec6cf5ca64707915059381950eb8512e0db860a4d9f72a63c4ae6bc545dba178d8390061f97fcae55761462adba638f207365648e95 SHA512 07a16f3b67cff991aae6d6241801e097f200427f29e1d32a30c32a8140d43fc777ff4ce71002e59f86b23d6b79284918729ae5d2eefb42f06d910a4b842421c1
 MISC metadata.xml 1415 BLAKE2B ff67e288b209502228591761d9a7774a95b52cca610ddcfb4398b1aa6db264d84df36aec1f8f109679cd09d5858c8b8237bbf9fa0643fef4974864c5f9e1e192 SHA512 609618e13e7fd77b17797ca5f3fcd4a4a508f5f13a5a4c4a84e002f0634b44dd231b75a52635b65fbe76aad0e75fa6deb3b366dbff7e54316fe143367f6c0c89
diff --git a/net-im/telegram-desktop/files/tdesktop-5.8.3-webkit-no-wayland.patch b/net-im/telegram-desktop/files/tdesktop-5.8.3-webkit-no-wayland.patch
new file mode 100644
index 000000000000..b2235fbb4481
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-5.8.3-webkit-no-wayland.patch
@@ -0,0 +1,16 @@
+Fix failure when building webkit without wayland support
+
+--- tdesktop-5.8.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk.cpp
++++ tdesktop-5.8.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk.cpp
+@@ -730,9 +730,11 @@
+ 
+ void Instance::setOpaqueBg(QColor opaqueBg) {
+ 	if (_remoting) {
++#ifdef DESKTOP_APP_WEBVIEW_WAYLAND_COMPOSITOR
+ 		if (const auto widget = qobject_cast<QQuickWidget*>(_widget.get())) {
+ 			widget->setClearColor(opaqueBg);
+ 		}
++#endif
+ 
+ 		if (!_helper) {
+ 			return;
diff --git a/net-im/telegram-desktop/telegram-desktop-5.6.3.ebuild b/net-im/telegram-desktop/telegram-desktop-5.8.3.ebuild
index 9ffb2c1ca55c..b92f8063282b 100644
--- a/net-im/telegram-desktop/telegram-desktop-5.6.3.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-5.8.3.ebuild
@@ -16,17 +16,9 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
-IUSE="dbus enchant +fonts +jemalloc +libdispatch screencast qt6 qt6-imageformats wayland webkit +X"
-REQUIRED_USE="
-	qt6-imageformats? ( qt6 )
-"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="dbus enchant +fonts +jemalloc +libdispatch screencast qt6 wayland webkit +X"
 
-KIMAGEFORMATS_RDEPEND="
-	media-libs/libavif:=
-	media-libs/libheif:=
-	>=media-libs/libjxl-0.8.0:=
-"
 CDEPEND="
 	!net-im/telegram-desktop-bin
 	app-arch/lz4:=
@@ -57,23 +49,19 @@ CDEPEND="
 		>=dev-qt/qtsvg-5.15:5
 		>=dev-qt/qtwidgets-5.15:5[png,X?]
 		kde-frameworks/kcoreaddons:5
-		webkit? (
+		webkit? ( wayland? (
 			>=dev-qt/qtdeclarative-5.15:5
 			>=dev-qt/qtwayland-5.15:5[compositor(+)]
-		)
+		) )
 	)
 	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
-		webkit? (
+		webkit? ( wayland? (
 			>=dev-qt/qtdeclarative-6.5:6
 			>=dev-qt/qtwayland-6.5:6[compositor,qml]
-		)
-		qt6-imageformats? (
-			>=dev-qt/qtimageformats-6.5:6=
-			${KIMAGEFORMATS_RDEPEND}
-		)
+		) )
 	)
 	X? (
 		x11-libs/libxcb:=
@@ -85,7 +73,7 @@ RDEPEND="${CDEPEND}
 "
 DEPEND="${CDEPEND}
 	>=dev-cpp/cppgir-2.0_p20240315
-	>=dev-cpp/ms-gsl-4
+	>=dev-cpp/ms-gsl-4.1.0
 	dev-cpp/expected-lite
 	dev-cpp/range-v3
 "
@@ -103,6 +91,8 @@ PATCHES=(
 	"${FILESDIR}"/tdesktop-4.10.0-system-cppgir.patch
 	"${FILESDIR}"/tdesktop-5.2.2-qt6-no-wayland.patch
 	"${FILESDIR}"/tdesktop-5.2.2-libdispatch.patch
+	"${FILESDIR}"/tdesktop-5.7.2-cstring.patch
+	"${FILESDIR}"/tdesktop-5.8.3-webkit-no-wayland.patch
 )
 
 pkg_pretend() {
@@ -115,19 +105,6 @@ pkg_pretend() {
 }
 
 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.
-
 	# Happily fail if libraries aren't found...
 	find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \
 		\! -path './Telegram/lib_webview/CMakeLists.txt' \
@@ -148,6 +125,12 @@ src_prepare() {
 			-i cmake/external/qt/package.cmake || die
 	fi
 
+	# Control automagic dep only needed when USE="webkit wayland"
+	if ! use webkit || ! use wayland; then
+		sed -e 's/QT_CONFIG(wayland_compositor_quick)/0/' \
+			-i Telegram/Telegram/lib_webview/webview/platform/linux/webview_linux_compositor.h
+	fi
+
 	cmake_src_prepare
 }
 
@@ -164,11 +147,12 @@ 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'
+	append-cppflags -DNDEBUG
 
 	# https://github.com/telegramdesktop/tdesktop/issues/17437#issuecomment-1001160398
 	use !libdispatch && append-cppflags -DCRL_FORCE_QT
 
+	local use_webkit_wayland=$(use webkit && use wayland && echo yes || echo no)
 	local qt=$(usex qt6 6 5)
 	local mycmakeargs=(
 		-DQT_VERSION_MAJOR=${qt}
@@ -180,11 +164,10 @@ src_configure() {
 		# 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}Quick=${use_webkit_wayland}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=${use_webkit_wayland}
 		-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)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=${use_webkit_wayland}
 		## KF6CoreAddons is currently unavailable in ::gentoo
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6)
 
@@ -250,12 +233,10 @@ pkg_postinst() {
 		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]
+		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats:5[avif,heif,jpegxl]
+	else
+		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats:6[avif,heif,jpegxl]
 	fi
 }