summaryrefslogtreecommitdiff
path: root/kde-plasma/kscreen
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma/kscreen')
-rw-r--r--kde-plasma/kscreen/Manifest7
-rw-r--r--kde-plasma/kscreen/files/kscreen-6.3.4-kcm-fix-wrong-settings-after-revert.patch40
-rw-r--r--kde-plasma/kscreen/kscreen-6.3.4-r1.ebuild (renamed from kde-plasma/kscreen/kscreen-6.2.5.ebuild)8
-rw-r--r--kde-plasma/kscreen/kscreen-6.3.5.ebuild (renamed from kde-plasma/kscreen/kscreen-6.3.4.ebuild)0
4 files changed, 49 insertions, 6 deletions
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 8bbc2d6a145b..d4eb548e2cc0 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,6 @@
-DIST kscreen-6.2.5.tar.xz 211884 BLAKE2B 2751d0395a436d3b8003ad2d2087a9e29dc367bfebc72f18818bbf970c9e0ceb38bb5ea36945006d9430c0804fd681743dc63b8c256193a999e062b946fa249b SHA512 ca749f9acb18ceb0531017e9d7ec6aafeced699550f75ab7bd02af13fe7e6826d1bc8149e5b650aa6066d3fe920b5bc6ed09d1f3f991f6b934bccc37aa3cf839
+AUX kscreen-6.3.4-kcm-fix-wrong-settings-after-revert.patch 1431 BLAKE2B cc67a4288df498927c4313228edc24e01bc47f3dca6669803c674b271320150e2d9557c1c3faf8fc4e56bcff85650aaa4b40840386041930ee8e09f6a3ce6b14 SHA512 78a07e965eeb484f6f1273cb8fe6b81fb10b621f3c637fa117895a8e5cf85a70b241b5e7f82d8b6bc8bee38cadb98e21e98eafcba8082c5a658a9c707a443ea9
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.ebuild 1376 BLAKE2B 51273876b558b73a8307bae93cd2dea432b84e05be0e95399a3565883d94bfe76a9e42c79f1201a103e1a297f1fc1789c60b0e7e1cd0af81d91910820e84bbe1 SHA512 e81c938ad672267578a7a29d448a6da3007e7b67e566cb48e6fec8531236635aaac858243ae57be1abda7d5af486e003a6413e5b6a77ce1bf69c40ad85709d79
+DIST kscreen-6.3.5.tar.xz 226848 BLAKE2B 6bc32d3c234c69dee1919ff5a9caf1fca508dad23b58a21d1e67c93e538743a5f6892fe7b8cd54090c009076e7683996ab86a0765e546ddf29774636dfedb89d SHA512 5e58acdbd54f7e791e8a7c1ce77536679128325ab31269488697a42c6c808cec9185469edc873d75d5f9ea5ee95cc22318f79387ebe765eb274914d7c05b98db
+EBUILD kscreen-6.3.4-r1.ebuild 1475 BLAKE2B ec900a4d85efe96023743e6a2981b4945a649b18c8e69b298956bb079143e2e696a94f60dba92fce1b733bf3a3065cc8b2ae58763d4a1b806f046f4b39151d79 SHA512 98a20f371cd2d69a7a32909931e0321a1edd24c7988c64657ecaf19592526f864e0f448f13aaa4ebb12f5eb318e938d7157e64e97ba2a8074272866220fe616f
+EBUILD kscreen-6.3.5.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.2.5.ebuild b/kde-plasma/kscreen/kscreen-6.3.4-r1.ebuild
index e2b694520cbe..393883d5bbfc 100644
--- a/kde-plasma/kscreen/kscreen-6.2.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-6.3.4-r1.ebuild
@@ -4,9 +4,9 @@
EAPI=8
ECM_TEST="forceoptional"
-KFMIN=6.6.0
-QTMIN=6.7.2
-inherit ecm plasma.kde.org
+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"
@@ -48,6 +48,8 @@ RDEPEND="${DEPEND}
"
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)
diff --git a/kde-plasma/kscreen/kscreen-6.3.4.ebuild b/kde-plasma/kscreen/kscreen-6.3.5.ebuild
index a4b20ef00b42..a4b20ef00b42 100644
--- a/kde-plasma/kscreen/kscreen-6.3.4.ebuild
+++ b/kde-plasma/kscreen/kscreen-6.3.5.ebuild