gentoo auto-resync : 14:06:2024 - 00:09:04

6 files changed, 47 insertions, 2 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 1541293ba465..8ba15e5c587b 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index fec424ed0f0e..5b127d9842af 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,6 +1,7 @@
 AUX kwin-5.26.80-gstreamer-optional.patch 948 BLAKE2B 880e77ce6462c115953471dfd4985cc4891a05a910323c1760e01870f04a6930d6d4680811701e12094f1bc3eabbba6b097535408b9148dea4beca31496c7e35 SHA512 66e839c7d603873d675b96430ae48d89366a7f1c5019686c9471ef4fd66449bc4bc22752856665a5d90ab8e503e40d307c4671ac0c2f2991b869e211f7b46c86
+AUX kwin-6.0.90.1-libcxx.patch 857 BLAKE2B d2f2e1a84c2f6dda36c8ede210b09e3575510aadddf5a8c2645db92bdc746497cf77832caf537a759053f9ce99d890a350521a331b464b14f3c6acd8c712f1df SHA512 378af1a38ce29f022e5a52dfc4243b58da0544c16afb1d8fc454ae90093e83cda7947b6abc32daf5d5359c1be2539837fea98b5a55bae9141cc4c7847b0a08c3
 DIST kwin-5.27.11.tar.xz 7644856 BLAKE2B a21fa8d60418bf109b3f651f266185b1e97bdc92e7c7d7ab4b73271d91e8c2b629fd22851b3fff88d7ecd8277fdd8a70bf1c3bd93aa1e379377b86f56cfe2bd2 SHA512 8c76695f71ce67142d16ad16aed342375ae3aefa59ff2628a28003025701bc6b48999adaac79fc5ab09ec22c8d8407fc29f011fd3da6f992c36531fd6c3fc37b
 DIST kwin-6.0.90.1-4b3f6a43.tar.gz 12857248 BLAKE2B d9004dbc43e4c4a44411cf089700a7c74b7095cde099786b3fc6c53e78167150d1fb0b10dd45530a0ade8bd2c8450f22e1719026dfee6c559cf83911f894a29f SHA512 570c37411b5d32d8a278dd6d0d6902e668d09d5613ef2e4a267dc1796d236f71af021018f401516d178fe672db76b34ec26beb2e8aee463fdd5f946552bd1d7b
 EBUILD kwin-5.27.11-r1.ebuild 4305 BLAKE2B f6aacf67667be303f5bf6cf328a186f113d458560f6438c65ec1e0ea12b47d4585ac9abcb510cf817c99fd00685e2de2cf6b2b1a7e2647e0d888c4b0923e1beb SHA512 ce094346e507377f8b1d3e30ed2154886ea3195aeaf5790331e7f0e8f963841837363ab353e70b73bf1ea70b189743121c5bdf53447ba42ae815dddfabe24fea
-EBUILD kwin-6.0.90.1-r3.ebuild 4350 BLAKE2B 60fe6dc44912215483f1ebca2835baa6a77c52eaf600df5aee5452abcc0a8ce2844265e861cc85276a1fa6969fe93a3d8b7039effc44dbda57fdb923bb60ecf3 SHA512 29ba6a40509e9fb3d9ad0c35c4308967cb272a94757d3b061366e98ff5971d9a962d3e5119221b60520c79a1b710e4240d3c7c527e874bd42540b564cd987b0b
+EBUILD kwin-6.0.90.1-r3.ebuild 4406 BLAKE2B 87532c3be4e503dfc303f4230b71471e3ac957feedcec422c33d70428155d75f8b9de74909acf6a505f2206d85e3c8874e857b53b18fdf67ee4b75cfa9ff6c87 SHA512 d25b037740089cc86eb0aff38680c5c5f7daf8838bfb243065d9df77d958cd298821b5c738079081f8a3341fe4e061d1d1d9f3862b5e63078c58611bdd2e7c40
 MISC metadata.xml 760 BLAKE2B 3592da53cc329bc726ca8d4a33e6f4af27fb40c0bf3ce4e4d30374b5a704d29bb787d9a9b84f5352deb9627130912a7832aa8d0c9261970a5179ecbafcba1a28 SHA512 20892d3ff5e1dd1980e83006ee3b07b06f48bc4f0af8d2204a41a62c7768552a14208d19408852c619b10b1e83deda93c9f7e4ca68c5ea9d1bf04312770c74cf
diff --git a/kde-plasma/kwin/files/kwin-6.0.90.1-libcxx.patch b/kde-plasma/kwin/files/kwin-6.0.90.1-libcxx.patch
new file mode 100644
index 000000000000..8ba9615adaeb
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-6.0.90.1-libcxx.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/933120
+https://invent.kde.org/plasma/kwin/-/merge_requests/5892
+
+From b9ec66615f08e2bad3928b8b207be904ab62e745 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 2 Jun 2024 00:25:26 +0100
+Subject: [PATCH] watchdog: add includes for geteuid
+
+05a3e2bad9a3baf27293f0b5ed4bef4f38952804 added `geteuid` use but didn't
+add the needed headers. This works by chance on libstdc++ systems via
+transitive includes, but it doesn't work on libc++ systems, as reported
+downstream in Gentoo at https://bugs.gentoo.org/933120.
+
+(cherry picked from commit 31a3961c4cd387aa4aa1a0c7bf197445a346e5f0)
+--- a/src/watchdog.cpp
++++ b/src/watchdog.cpp
+@@ -8,6 +8,8 @@
+ */
+ 
+ #include "watchdoglogging.h"
++#include <unistd.h>
++#include <sys/types.h>
+ #include <QCoreApplication>
+ #include <QTimer>
+ #include <systemd/sd-daemon.h>
+-- 
+GitLab
diff --git a/kde-plasma/kwin/kwin-6.0.90.1-r3.ebuild b/kde-plasma/kwin/kwin-6.0.90.1-r3.ebuild
index 5e6849f9371d..cb02d4f27603 100644
--- a/kde-plasma/kwin/kwin-6.0.90.1-r3.ebuild
+++ b/kde-plasma/kwin/kwin-6.0.90.1-r3.ebuild
@@ -118,6 +118,10 @@ BDEPEND="
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.90.1-libcxx.patch
+)
+
 src_prepare() {
 	ecm_src_prepare
 
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 5cee59a0ee7d..212e97e8a974 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.27.11-r1.ebuild 4212 BLAKE2B c1db8c8defe4a168fa0b195635907ba3b6e257db3fe2d4cb82e4808ff1dacb28428b41a36812c8dc0579decef2ca0e499f8ef3fec17e14b802988248e005f3e4 SHA512 79e1eca7478ca7d873e9d16532f8b602b9accad10360922bcf09846f388e21df702254ccafb9e0c42a2f662dedc4177f01602bd6e4889a2a6a555edb28c1e735
-EBUILD plasma-meta-6.0.90-r1.ebuild 4707 BLAKE2B 1c319a44416062601459fbfed2552b57bf51453dc7a484b67d7e9711f1fd0efc4cfedac562dce1283ad09112ae5b69fd8d9f9f3da8d20b620a99c4f797b46785 SHA512 a188ad44af90b04050a8fb8c7016e33fc6b3203b894e58ebf340018f16f3d40cf5bd3735f1847c7b9539e1b9c879b517619cdbcc524cc7e12d1ac4a38e9c9fe4
+EBUILD plasma-meta-6.0.90-r1.ebuild 5255 BLAKE2B 52533730a35df32c0529a2f350b4c6c137d3dc1d3ea231e25aa19ff1e50bb50160bfc543e14197cb4425fee83c425ad9afba987633fca23aa27248532191ebeb SHA512 884130308313d1ba7497ebdc0e9d7f4600024611359eed817408414a1adcb97c0e5ca7d5c74b51a5f8966b35c9920791f29e23ac4171c6754dfd0126b21858d6
 MISC metadata.xml 3059 BLAKE2B d3e3485ebb608a603d13f0263533dd97d04ed0f9e9610ee429808f521770a92e59f9fea4992c8d280139cfbe5468029af073813d8195745c7182ae56a95e5d2a SHA512 0576008409be1377c1ac443aad3d039a525e62aba4b7fc93230869a0054640abea0ba40ea69aa3013a8ec7ad48e0c35ba312468626fee5662b41ccaaf86ceb63
diff --git a/kde-plasma/plasma-meta/plasma-meta-6.0.90-r1.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.0.90-r1.ebuild
index 65f6cd6ca2c5..c7d62908795b 100644
--- a/kde-plasma/plasma-meta/plasma-meta-6.0.90-r1.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-6.0.90-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit toolchain-funcs
+
 DESCRIPTION="Merge this to pull in all Plasma 6 packages"
 HOMEPAGE="https://kde.org/plasma-desktop/"
 
@@ -118,6 +120,17 @@ RDEPEND="${RDEPEND}
 "
 
 pkg_postinst() {
+	if [[ $(tc-get-cxx-stdlib) == "libc++" ]] ; then
+		# Workaround for bug #923292 (KDE-bug 479679)
+		ewarn "plasmashell and other KDE Plasma components are known to misbehave"
+		ewarn "when built with sys-libs/libcxx, e.g. crashing when right-clicking"
+		ewarn "on a panel. See bug #923292."
+		ewarn ""
+		ewarn "A possible (no warranty!) workaround is building sys-libs/libcxx and"
+		ewarn "sys-libs/libcxxabi with the following in package.env:"
+		ewarn " MYCMAKEARGS=\"-DLIBCXX_TYPEINFO_COMPARISON_IMPLEMENTATION=1\""
+	fi
+
 	if ! use qt5 && has_version dev-qt/qtgui; then
 		ewarn "KF5- and Qt5-based applications will exhibit various integration bugs"
 		ewarn "and generally look out of place in Plasma 6 without the dependencies"