12 files changed, 282 insertions, 4 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index ce9a3c199978..1115af56cff6 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/aurorae/Manifest b/kde-plasma/aurorae/Manifest
index 1863f77fa10e..2c70912723f3 100644
--- a/kde-plasma/aurorae/Manifest
+++ b/kde-plasma/aurorae/Manifest
@@ -1,5 +1,5 @@
 DIST aurorae-6.3.2-decouple-from-libkwin.patch.xz 4256 BLAKE2B 800376975ac6e2cdf5d3713a94a2d9f55d23d27d8da0437d914fa0d79df6082225183d8f427980967bdd41b7388221e99d1301517b78c2732090c65b91938d80 SHA512 10bfa3ea8c7e1ffda8284954176eea34effa0414811a012822e46c8291f06bc17791de66487693e415cc96aa548ec34f6bc33890fe18f1fa2af96e75544eb398
 DIST aurorae.CMakeLists.txt.xz 1136 BLAKE2B f2501ac110f1250fa35fdac117f794d9ec4cfbdd858eb9999a1e8b7da936c75537339924503efa43bacb56ea102a08a37c3d7d20ba4a4853bd70e3dbcd233247 SHA512 2c065d64c39a1b5ca235cd3fcb7e54c1ab85401b48252bcc4b00dae2a03bffbb2802bab79f47c0678d11eb6f8356e4872d55e9ad237451da09e7858cb22788c4
 DIST kwin-6.3.4.tar.xz 8977144 BLAKE2B c60e38763f74ecfa137b3cb0c37af9e537242032d8c3df6be0df4d78836c07f7cf2ad0be35d3fc545a9fab2e543d7aefcacb1f0358f3c5d296545dc827e8d55a SHA512 34205039e0499a988babdb7081df4d908c2b1e8d93cd4f8d6fff14c275b54ab0f5e80b5ca830612f5176d11969e71fe4174b806fb9da3ab04580caa88463131f
-EBUILD aurorae-6.3.4.ebuild 1488 BLAKE2B fdc1854f19257d1e9259629372f041d2f5cd21164f5e2935032daed2c465dcca3ae5bf3dad68c083c1ae0eeffa6a7fd3027ddc01000ccf4b358e6b32a1468a44 SHA512 cec6ac37fe74cd688dfa03cb5dd0d0055d3dd2d06b644976b7cff87d822546be85978fc68a42d673129b355884938d4485007b78f785ef39689bb790cc8925b0
+EBUILD aurorae-6.3.4.ebuild 1486 BLAKE2B 8bd36ecf50053cf152ec2621a8e168f277f3a3bd51b2654277e3bef2c3ead520e57217d79a82792657a6912b2545b39ad8f8a75ec7212e395eb616e3f4262650 SHA512 36bea3083a48766469078ee11fcb8756e733d94647f624c50071ba65a3bfd250a36defc12b7e4a871d3a9e277dbd51681e449b390ed4f8de02c86201d8e0ceec
 MISC metadata.xml 376 BLAKE2B 4831915b7eb9925c7bdff4151a30f6805c50d2ba1adbdeb72fb68905f653a727e86eb79f886e898a21249c78050473fc763b43f8d134ee5fb084ba361b41a7d5 SHA512 99e9699346d41bc835e628229ac63774513148708586a08751453700a2f297f87736850ba6eecc6474e40273d24a30881038a6f43ea0227db9c36e6d51e28bf9
diff --git a/kde-plasma/aurorae/aurorae-6.3.4.ebuild b/kde-plasma/aurorae/aurorae-6.3.4.ebuild
index aaebf1dea959..5aa19a0d0f16 100644
--- a/kde-plasma/aurorae/aurorae-6.3.4.ebuild
+++ b/kde-plasma/aurorae/aurorae-6.3.4.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	>=kde-frameworks/kirigami-${KFMIN}:6
-	!<kde-plasma/kwin-6.3.2:6
+	!<kde-plasma/kwin-6.3.2
 "
 
 DOCS=( README )
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 8bbc2d6a145b..496d66f81f00 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,7 @@
+AUX kscreen-6.3.4-kcm-fix-wrong-settings-after-revert.patch 1431 BLAKE2B cc67a4288df498927c4313228edc24e01bc47f3dca6669803c674b271320150e2d9557c1c3faf8fc4e56bcff85650aaa4b40840386041930ee8e09f6a3ce6b14 SHA512 78a07e965eeb484f6f1273cb8fe6b81fb10b621f3c637fa117895a8e5cf85a70b241b5e7f82d8b6bc8bee38cadb98e21e98eafcba8082c5a658a9c707a443ea9
 DIST kscreen-6.2.5.tar.xz 211884 BLAKE2B 2751d0395a436d3b8003ad2d2087a9e29dc367bfebc72f18818bbf970c9e0ceb38bb5ea36945006d9430c0804fd681743dc63b8c256193a999e062b946fa249b SHA512 ca749f9acb18ceb0531017e9d7ec6aafeced699550f75ab7bd02af13fe7e6826d1bc8149e5b650aa6066d3fe920b5bc6ed09d1f3f991f6b934bccc37aa3cf839
 DIST kscreen-6.3.4.tar.xz 226552 BLAKE2B fb0a826fe812d862557a6ea2b5ac8abe5a0adfea9319eac2c78c34688617c888df4873263a60e8c01b1eb17b47b05225beca1f42d6640e00ae934db799ec13a1 SHA512 a9ea8927ad5c110f8e08101217f1069fa82dfb063df24157b87479075f1f36715f05d48217f3f85bd1674e2ade30e4d554f13b8f58233383a0b0ac3de83d4d1b
 EBUILD kscreen-6.2.5.ebuild 1369 BLAKE2B ff7226ee8ff6d335cf2d58130b806a8f938f5f2733202e6ec7a502727c0f9f2f67947d9ef0440589de168260f3bb957604e2921549351c9de6728b662fa00967 SHA512 de6a85d6ca40b9377e6f9598c43b7c443eed9aa224c3f5a2a090630e0d646671e2020d4c2f6cb19788e6cbafc364abdfdad5a595f287604b5061b5a00ba5220a
+EBUILD kscreen-6.3.4-r1.ebuild 1477 BLAKE2B f5fa3267e78936ae977ade1596b834fa8d44f5dfce1a221642287af1757d60d64b19c9ae0ce70bed82dbb4ecb4b54b2e6192b5af150024fa48fd981ebff3e7a9 SHA512 c888a4840083ebb05defcffc2dea323854e64cf3413beff1ac53eb2bf3dee8f10f8ea3268f7b7e4104216e7da9fe371cee1b42e5e8bd9894dae1f7991ff899c8
 EBUILD kscreen-6.3.4.ebuild 1376 BLAKE2B 51273876b558b73a8307bae93cd2dea432b84e05be0e95399a3565883d94bfe76a9e42c79f1201a103e1a297f1fc1789c60b0e7e1cd0af81d91910820e84bbe1 SHA512 e81c938ad672267578a7a29d448a6da3007e7b67e566cb48e6fec8531236635aaac858243ae57be1abda7d5af486e003a6413e5b6a77ce1bf69c40ad85709d79
 MISC metadata.xml 376 BLAKE2B a743b33e08a1a279c0891824690a4b000135c25bfd1274bb8903f7f3876a1aeb058f7dd283455b3bb8f2e39f83f850b21207bfa14bf9700833d07bde19b9bdc4 SHA512 059438335c8318b7287d3f84f823036d33cb10397cc1e780e9520435818bdc2c3dd7c70dd97b4d041ef3d19219abc22e45ae6244d72c44eb005889b350933c59
diff --git a/kde-plasma/kscreen/files/kscreen-6.3.4-kcm-fix-wrong-settings-after-revert.patch b/kde-plasma/kscreen/files/kscreen-6.3.4-kcm-fix-wrong-settings-after-revert.patch
new file mode 100644
index 000000000000..3e71d8cb3893
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-6.3.4-kcm-fix-wrong-settings-after-revert.patch
@@ -0,0 +1,40 @@
+From 50a3ee595f5f5c6cebed220b79f13483f3ecad97 Mon Sep 17 00:00:00 2001
+From: Oliver Beard <olib141@outlook.com>
+Date: Fri, 4 Apr 2025 12:51:04 +0000
+Subject: [PATCH] kcm: Fix wrong settings shown when reverting changes When
+ reverting display changes, due to model changes, the StackLayout's
+ currentIndex is changed by the stackLayout. This is a behaviour added in Qt
+ 6.5, and requires working around to ensure we keep it the same as
+ selectedOutput.
+
+BUG: 490586
+FIXED-IN: 6.3
+
+
+(cherry picked from commit 3e8ccda33895efe9311b5b5f1e142c6d608846da)
+
+Co-authored-by: Oliver Beard <olib141@outlook.com>
+---
+ kcm/ui/Panel.qml | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/kcm/ui/Panel.qml b/kcm/ui/Panel.qml
+index 799477a6f..1b9ebac72 100644
+--- a/kcm/ui/Panel.qml
++++ b/kcm/ui/Panel.qml
+@@ -58,6 +58,12 @@ ColumnLayout {
+                 enabledOutputs: root.enabledOutputs
+                 onReorder: root.reorder()
+             }
++
++            // "Since 6.5, inserting/removing a new Item at an index less than or equal to the current
++            // index will increment/decrement the current index, but keep the current Item."
++            // This causes BUG: 490586 and the following works around it:
++            onItemAdded: panelView.currentIndex = Qt.binding(() => root.selectedOutput)
++            onItemRemoved: panelView.currentIndex = Qt.binding(() => root.selectedOutput)
+         }
+     }
+ 
+-- 
+GitLab
+
diff --git a/kde-plasma/kscreen/kscreen-6.3.4-r1.ebuild b/kde-plasma/kscreen/kscreen-6.3.4-r1.ebuild
new file mode 100644
index 000000000000..e913713844f2
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-6.3.4-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=6.10.0
+QTMIN=6.8.1
+inherit ecm plasma.kde.org xdg
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://invent.kde.org/plasma/kscreen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="X"
+
+# bug #580440, last checked 5.6.3
+RESTRICT="test"
+
+# qtbase slot op: GuiPrivate use in kded daemon
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6[widgets]
+	>=dev-qt/qtsensors-${QTMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/ksvg-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-plasma/layer-shell-qt-${KDE_CATV}:6
+	>=kde-plasma/libkscreen-${KDE_CATV}:6=
+	>=kde-plasma/libplasma-${KDE_CATV}:6
+	X? (
+		>=dev-qt/qtbase-${QTMIN}:6=[X]
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXi
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+PATCHES=( "${FILESDIR}/${P}-kcm-fix-wrong-settings-after-revert.patch" ) # KDE-bug 490586, in 6.3.5
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_X11=$(usex X)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 43a9ae559e15..5fa3670795ab 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-6.2.5-r1.ebuild 5501 BLAKE2B c05575ed0490ea4a46990e772926e39dc15abed255aea4e92b16ebc84b7be3099c368a3f47c527bf2a70bd967d9d0f52286de7a91270b8dbaa49460c787ab94c SHA512 731dcf0a15ce2d94602e7d1f5738740eddabeca5fdc349fc892de921d4a0a1f05814f90a3cfee8afc4f35ccc9d421b20d0df98f3f4b06156aaabdc51572fe6ee
-EBUILD plasma-meta-6.3.4.ebuild 5575 BLAKE2B c9f120bd83265f2512e03bf5d2d36fdf30ece4d7748da0827a915dac60752c0890d959fcc10e205fed08ed3fbf233f1b6746b64bb15b2d37bc8077124a56af82 SHA512 6fa03012c80e5eddfb4397bfcce93d39bdc88fdc90ab7d9028880fa9c601a887f5837ae314dd4a6d11892526c182f43f58b3e2781e0d33dadd08fc5eb135a9a8
+EBUILD plasma-meta-6.3.4.ebuild 6104 BLAKE2B 1a18900fe77282cce03862217836fd1537e88bf9bfc9f29def2d864ad6936abf418b7c4e433c9dc774db66812351e159ceb6305cd9c4ad8b3e5a9a97b0b20adc SHA512 b7e6dc391107ef4b7683867830dc92a4176c7728e12b2f1a8e251b48abdf4b4403e2bcd59998e84bc1ba2c928b53621b4af574074efc2161409507ff4135bff5
 MISC metadata.xml 2687 BLAKE2B 99319291bbde7784d6b13c9884bcfecabb765cc5371cac377d0bad7dc6e94914a9cd44d0119406b2a8fed4fcc03edee5aec564c5ce6a11fae68bbca2d3994eed SHA512 a5160183b07750e326139eb9723e0b0d859cf4c99738301ef09b94affa95fd9c278c8ea8030fc38f449eeada8cbbf67d3e9bb4bb6a3944f27d44c2f5317210bf
diff --git a/kde-plasma/plasma-meta/plasma-meta-6.3.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.3.4.ebuild
index 2b957fa54590..1d8b092486e5 100644
--- a/kde-plasma/plasma-meta/plasma-meta-6.3.4.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-6.3.4.ebuild
@@ -18,6 +18,15 @@ thunderbolt unsupported wacom +wallpapers webengine"
 
 REQUIRED_USE="^^ ( elogind systemd )"
 
+# The =kde-apps/spectacle-6.3* pin is needed because Spectacle moved from
+# KDE Gear => KDE Plasma, but KDE Gear's version scheme is higher than
+# KDE Plasma's, so without such a pin, there's nothing that will cause
+# the in-reality newer (but wrt PV, older) Spectacle to be pulled in for users.
+#
+# It can be changed to =kde-apps/spectacle-6* in due course once newer
+# KDE Plasma and KDE Gear are stabled and old is cleaned up. Changing it
+# to >=kde-plasma/spectacle-${PV}:${SLOT} however can't be done for quite
+# some time.
 RDEPEND="
 	!${CATEGORY}/${PN}:5
 	!kde-plasma/khotkeys:5
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 4d46fba3cf94..88245519c2dd 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -2,8 +2,10 @@ AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099c
 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678
 AUX plasma-workspace-5.22.5-krunner-cwd-at-home.patch 804 BLAKE2B 4bb337ea04037f8992988b70a40896166a2e10b2b557fa5518e3c2bd7129a221fe2efe064465cbffcc3db4abebb13d354599f44884eaf8c1bc029646280921bb SHA512 e49635bbb42c1beeaa9eee6a803f8c96497bc6e768a72d93886281edec922cb641a373fc0a1a482cedb36bd1f400f77b0030247f621373ebc141760a97ef5bbd
 AUX plasma-workspace-6.2.5-cameraindicator-optional.patch 4695 BLAKE2B 4b952b854b0116cabb4b30af1e15b3874619885586d16c4409b61954db64b357d2026e17f0253a2adf37359d50143e88747e59be99abb10d0934e3461ccc9623 SHA512 0093aa8196b9110f9d230b1f0786f770183eef2c722e93b1a0c40293b6638541de5e9b10dbafff2fdd12316bf75b4519e550101a34b0defec0681bd9510abf7a
+AUX plasma-workspace-6.3.4-multiscreen-crash.patch 5182 BLAKE2B 16407daeb68f85de12f32b39a0312239a4651948b62995cb83feb734fdb58eee48e15cdc3c439ecde40f7eb89eb76908c5b42ccf2a3be2bdac98d12b61ba8012 SHA512 8e83f46679d346714da2f4598cc8795fdc75663eb70b45464a3d048ce5bb711baa5f6488665713d882bef994cfb00b127015b47d752d05ed63db8e8919116958
+AUX plasma-workspace-6.3.4-notification-padding.patch 1693 BLAKE2B 1cf27a4ac12fd440a3d6a05351b813d7af90002fa447933210040a179ac13fad1f3ab61d26a4296fb9ae75837387b5bf442de91f64891aa8d705d75b9d2625fb SHA512 ef66d75e8c45a4271cdf2a0e9edabe5e17cb43239d1c702246c3d0ec4d823adfce83c615b7f9455fc49e81cca9809951d0f0c930f31601d6427785388e8c530c
 DIST plasma-workspace-6.2.5.tar.xz 19136676 BLAKE2B 38d211247cfeee10df6f4fff5cbef91d9a7daa760033e29743e1c78577baf876c8c416d0a84e45efb5d6bab007965b3cd8c6d1feec7749bd4dd8cb24df4a71ee SHA512 228d183c9561cbf3d5630582b80c687868eaf420310010bd417de0e9f0ababaa4767805c1ce84f4eb3539ea32bfe6c2849b70d7ddd133f6095ab71f94f854dea
 DIST plasma-workspace-6.3.4.tar.xz 19153368 BLAKE2B 2f3e09a1698af00c24fd143b5c54d45ba2249e72db5fab279e260305026189c75983e08befae2b37f5a488bc3cd4cf89e07b3257ad5242fe26196c64a71982ce SHA512 62fc334b03796bb87fdda627ad2b4914c0832f43a93e9ae82c694c5c08d1373b4a0a5cbe3b421c2bda2fd36bf0ae52131143d9049c13be8c6c098599b7b4b226
 EBUILD plasma-workspace-6.2.5.ebuild 7068 BLAKE2B e695e6d10125ebdcea67eb37a7c60351b9b73a7c67bb608bcc5428e6016ffe9c104cdea5129ce6bae9f80d9fa3ad203b7a3a59fcdf24c8f304a91e68485ae768 SHA512 3c53651f9f86e530497c4631f5f9a685a86bc62ec6fcd2cf5ace0d5750714d4bad799abb244af4b72cca1115bc76f7586520c6d4d5cd9a794a8eb67d79f555ad
-EBUILD plasma-workspace-6.3.4.ebuild 6791 BLAKE2B 75fa45d043e319a4eb39079e2bb1537cc6eef959ea7660a065215f0bdb49b414f900ead3d267f3ebd9f3912f0ded77ebac73005d26e9905d0e217b67aa231e4e SHA512 709e7c392e1dca2ccbf363e951ffeba98b42c63eda57f670983239daa1efc2a793dd53f33864e921d376aac14e7ae10a6ea86af95f8b59035855b5dfd5e7357c
+EBUILD plasma-workspace-6.3.4-r1.ebuild 6924 BLAKE2B 51412e1ae73e1b5c6fe1655f01c6dca198b27af9801ec78b0f14f68d25eb4ea9d8e347057ca87a5702ffbd65d09e8fc0d01ab9c6e8d720404f1ba266c2b3f462 SHA512 30d438e041267b7f12aeb41ce2a1be6c9298432465514a16f7786b264b018fefdd5b7963445ae8369c0bb4e05fd685c1f158d77ae89dbd65659a123cc8e9e7f0
 MISC metadata.xml 1026 BLAKE2B 49c2bc5fdc752caf8f45ce982633df0542a008ba1ef0cc99d32b64d6cd73c237d9c98484cac16fa32210156a080e17ad365c2d4eeb81cd3e9a7dc2119b1f7395 SHA512 4cdf77f6be4ce18148936e2a7012b86c70cdcc9de8b99455b3db65a4a52990eb604082ca098cdaee5fe6762bb9d138861f687f8d5fbedb3f60eef7c7be3a42cb
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.4-multiscreen-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.4-multiscreen-crash.patch
new file mode 100644
index 000000000000..8ba7e6e3cd1b
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.4-multiscreen-crash.patch
@@ -0,0 +1,123 @@
+From 580a2ed1f41640e14adf57c5c7921cdadbdbe14d Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Wed, 2 Apr 2025 08:28:05 +0000
+Subject: [PATCH] multiscreen: fix an incorrect assert in screenInvariants
+
+Since OutputOrderWatcher at the time of screen removing can temporarly contain a dead entry, we can't check on screenInvariants that the count is the same as the real screen count, but check instead that outputorderwatcher doesn't have missing entries instead
+
+BUG:494616
+
+
+(cherry picked from commit 285cfe150efd941eed62b06604db0709977540c9)
+
+Co-authored-by: Marco Martin <notmart@gmail.com>
+---
+ shell/autotests/screenpooltest.cpp | 60 ++++++++++++++++++++++++++++++
+ shell/screenpool.cpp               |  6 ++-
+ 2 files changed, 65 insertions(+), 1 deletion(-)
+
+diff --git a/shell/autotests/screenpooltest.cpp b/shell/autotests/screenpooltest.cpp
+index bbb984a8738..033844e6195 100644
+--- a/shell/autotests/screenpooltest.cpp
++++ b/shell/autotests/screenpooltest.cpp
+@@ -41,6 +41,7 @@ private Q_SLOTS:
+     void testLastScreenRemoval();
+     void testFakeToRealScreen();
+     void testFakeOutputInitially();
++    void testReorderRemoveRace();
+ 
+ private:
+     ScreenPool *m_screenPool;
+@@ -459,6 +460,65 @@ void ScreenPoolTest::testFakeOutputInitially()
+     QCOMPARE(screenPool.idForScreen(newScreen), 0);
+ }
+ 
++void ScreenPoolTest::testReorderRemoveRace()
++{
++    QSignalSpy addedSpy(qGuiApp, SIGNAL(screenAdded(QScreen *)));
++    QSignalSpy orderChangeSpy(m_screenPool, &ScreenPool::screenOrderChanged);
++    QSignalSpy firstScreenResizedSpy(qGuiApp->screens()[0], &QScreen::geometryChanged);
++
++    // Add a new output
++    exec([this] {
++        OutputData data;
++        data.mode.resolution = {1920, 1080};
++        data.position = {1920, 0};
++        data.physicalSize = data.mode.physicalSizeForDpi(96);
++        // NOTE: assumes that when a screen is added it will already have the final geometry
++        auto *out = add<Output>(data);
++        auto *xdgOut = xdgOutput(out);
++        xdgOut->m_name = QStringLiteral("WL-2");
++        outputOrder()->setList({u"WL-1"_s, u"WL-2"_s});
++    });
++
++    QVERIFY(orderChangeSpy.wait());
++
++    QCOMPARE(orderChangeSpy.size(), 1);
++    QCOMPARE(QGuiApplication::screens().size(), 2);
++    QCOMPARE(m_screenPool->screenOrder().size(), 2);
++    QCOMPARE(addedSpy.size(), 1);
++
++    QScreen *newScreen = addedSpy.takeFirst().at(0).value<QScreen *>();
++    QCOMPARE(newScreen->name(), QStringLiteral("WL-2"));
++    QCOMPARE(newScreen->geometry(), QRect(1920, 0, 1920, 1080));
++    // Check mapping
++    QCOMPARE(m_screenPool->idForScreen(newScreen), 1);
++    QCOMPARE(m_screenPool->screenForId(1)->name(), QStringLiteral("WL-2"));
++
++    exec([this] {
++        // BUG 494616:
++        // When there are those 3 things happening in quick order
++        // * Setting the order
++        // * resizing an output
++        // * removing another output
++        // we used to get an inconsistent state in OutputOrderWatcher
++        // where the removed output is *not* removed from outputOrder
++        outputOrder()->setList({u"WL-2"_s, u"WL-1"_s});
++        auto *out = output(0);
++        auto *xdgOut = xdgOutput(output(0));
++        xdgOut->sendLogicalSize(QSize(1024, 600));
++        remove(output(1));
++        out->m_data.physicalSize = QSize(1024, 600);
++        out->sendGeometry();
++        out->sendDone();
++    });
++
++    QVERIFY(orderChangeSpy.wait());
++    QTRY_COMPARE(firstScreenResizedSpy.size(), 1);
++    QCOMPARE(m_screenPool->screenOrder().size(), 1);
++    QCOMPARE(m_screenPool->screenOrder().first()->name(), QStringLiteral("WL-1"));
++    QCOMPARE(qApp->screens().size(), 1);
++    QCOMPARE(qApp->screens().first()->geometry(), QRect(0, 0, 1024, 600));
++}
++
+ QCOMPOSITOR_TEST_MAIN(ScreenPoolTest)
+ 
+ #include "screenpooltest.moc"
+diff --git a/shell/screenpool.cpp b/shell/screenpool.cpp
+index 8d9c92b0d80..3c33dab8e9d 100644
+--- a/shell/screenpool.cpp
++++ b/shell/screenpool.cpp
+@@ -282,6 +282,7 @@ void ScreenPool::handleScreenRemoved(QScreen *screen)
+ void ScreenPool::handleOutputOrderChanged(const QStringList &newOrder)
+ {
+     qCDebug(SCREENPOOL) << "handleOutputOrderChanged" << newOrder;
++
+     QHash<QString, QScreen *> connMap;
+     for (auto s : qApp->screens()) {
+         connMap[s->name()] = s;
+@@ -369,7 +370,10 @@ void ScreenPool::screenInvariants()
+     // QScreen bookeeping integrity
+     auto allScreens = qGuiApp->screens();
+     // Do we actually track every screen?
+-    Q_ASSERT_X((m_availableScreens.count() + m_redundantScreens.count()) == m_outputOrderWatcher->outputOrder().count(),
++    // (m_availableScreens.count() + m_redundantScreens.count() must be less or equal
++    // to the number of screens tracked by OutputOrderWatcher, because it can contain
++    // for a little while a screen that has just been removed
++    Q_ASSERT_X((m_availableScreens.count() + m_redundantScreens.count()) <= m_outputOrderWatcher->outputOrder().count(),
+                Q_FUNC_INFO,
+                qUtf8Printable(debugMessage())); // https://crash-reports.kde.org/organizations/kde/issues/5249/
+     Q_ASSERT_X(allScreens.count() == m_sizeSortedScreens.count(),
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.4-notification-padding.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.4-notification-padding.patch
new file mode 100644
index 000000000000..50617c537dc2
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-6.3.4-notification-padding.patch
@@ -0,0 +1,41 @@
+From 47d502353720004fa2d0e7b0065994b75b3e0ded Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Wed, 2 Apr 2025 20:57:09 +0000
+Subject: [PATCH] applets/notifications: improve paddings again
+
+Zero top padding is fine when there's only a summary label, but looks
+bad when there's body text, an icon, or both. Correct that.
+
+
+(cherry picked from commit 53b6289f84094d91745b79c3bc902e7f80f235ef)
+
+Co-authored-by: Nate Graham <nate@kde.org>
+---
+ .../package/contents/ui/delegates/DelegatePopup.qml           | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/applets/notifications/package/contents/ui/delegates/DelegatePopup.qml b/applets/notifications/package/contents/ui/delegates/DelegatePopup.qml
+index 2038f49de50..e22a8322196 100644
+--- a/applets/notifications/package/contents/ui/delegates/DelegatePopup.qml
++++ b/applets/notifications/package/contents/ui/delegates/DelegatePopup.qml
+@@ -93,6 +93,8 @@ BaseDelegate {
+ 
+     Components.Summary {
+         id: summary
++        // Base layout intentionally has no row spacing, so add top padding here when needed
++        Layout.topMargin: delegateRoot.hasBodyText || icon.visible ? Kirigami.Units.smallSpacing : 0
+         Layout.fillWidth: true
+         Layout.row: 2
+         Layout.column: delegateRoot.__firstColumn
+@@ -108,7 +110,7 @@ BaseDelegate {
+ 
+     Components.Icon {
+         id: icon
+-        // We removed the row spacing from the base layout, so re-add it just here
++        // Base layout intentionally has no row spacing, so add top padding here
+         Layout.topMargin: Kirigami.Units.smallSpacing
+         Layout.row: 2
+         Layout.column: delegateRoot.__firstColumn + 1
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.3.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.3.4-r1.ebuild
index 5432ba093eaf..6a613c749915 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-6.3.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.3.4-r1.ebuild
@@ -154,6 +154,9 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
+	# in Plasma/6.3 branch:
+	"${FILESDIR}/${P}-multiscreen-crash.patch" # KDE-bug 494616
+	"${FILESDIR}/${P}-notification-padding.patch"
 )
 
 src_prepare() {