gentoo auto-resync : 28:03:2023 - 09:49:10

3 files changed, 40 insertions, 1 deletions

diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 74c598f495d2..52f8d57a587b 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,6 @@
+AUX kscreen-5.27.3-display-connector-name.patch 1186 BLAKE2B 279da075ac92c622be99f73610babc17121293d5b25de33be7061da7e2621a946a834fccab9e6a0f46917b6ac9cba2779092458a0a561ea3f669216d18eb525e SHA512 2abdb28310a1c22a7a3e094b12fbf3a42580e0258e6ede867b320fccad97c2a6aba3f9952e0450e88062c358af27cb100ccef107f2ae60dde5dc31af28fd73c4
 DIST kscreen-5.26.5.tar.xz 154600 BLAKE2B 202f7ec24b01ca057a5e52b796176e6ae09518693cb50e16b0d3901351fba58d5554d959f4afa48b5539981870e02f14bde8c25402d4c2b6427acf5c896ca75f SHA512 58635bc2c5cb3e3cee6b838ddc3a9068c9b22bcedef6ddd9c4b6aa59889b59242118227e706208c17c89241a701f850d42e9c5617d876068367246d35d1800c2
 DIST kscreen-5.27.3.tar.xz 184224 BLAKE2B 7929835a8d757fa06e5c27fd455435441c8e593cd4709dee237a6d23d2fa2a2439eb3d79e8482fb4676c96c7ec5108f364e94d069a3062aabc38d29e73f0b2e9 SHA512 02d7bb8e701fe8c47ac3e8cf7afe86410fd38a646fb4597a98710ab6afd5f0841b128178bab498973305f8c9f6ca4b340d9adae087f6996ccd04c2ec33e959cc
 EBUILD kscreen-5.26.5.ebuild 1348 BLAKE2B f06076f8cedb330a598c9aeb630027949cbc0c99a0fe5023f337494365da903a24194f28edb7e7946a3088cec9e666fd226eb43695761f38826311eb4b8e08c0 SHA512 3a0088c16d2a7f1486744a871d87ed3a2db8a57d97cffd930a852b1024f0b0d0618c99b86b8e37b2f5f02971b063d4919faf044e5c3bbcb21824aa3d82cb71e3
-EBUILD kscreen-5.27.3.ebuild 1352 BLAKE2B 7ec94f34a0e1149e4f803041c48c19c639ea729750cca73f6b526f1ffffed1015851f767976eb48b4e0a0a784629158bc1a98a4ffede347c0919a8efb01fba3d SHA512 4909ce2d28e0ece3dbae30bbf61f3349940524846f61443c84ffab671d1fea83e5dd958d90a9c3d1f16633f400cf89241b623159151c9de8437639d7d19d494c
+EBUILD kscreen-5.27.3-r1.ebuild 1430 BLAKE2B d4d4927663dc12d80f59f46a6e68f3186a86fda7114b16f36f89466a71a3e3ed6ffa72d7960f21c41b52340c4f9629cf96fcf217a4ae68b04183c381493ea119 SHA512 405fa1f4f8849d69042a40cc7596e0802c269d068db10cb7e5b45389f48fb346577be555eb71105a7857b5e2c36bb290773702bb6b9702174eb34a1676a0b0bb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreen/files/kscreen-5.27.3-display-connector-name.patch b/kde-plasma/kscreen/files/kscreen-5.27.3-display-connector-name.patch
new file mode 100644
index 000000000000..54497b3d99f8
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.27.3-display-connector-name.patch
@@ -0,0 +1,36 @@
+From 74c99d3afda09d9a715c84150f0bb9afe4003c33 Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Thu, 23 Mar 2023 09:37:27 +0100
+Subject: [PATCH] Display connector name instead of type name when serial
+ number is identical
+
+Displays the name of the connector ("DP-1") instead of just
+typeName ("DisplayPort"). When two identical outputs are connected
+to the same connector type it doesn't help differntiating.
+Furthermore it matches what will be shown by the output locator
+effect.
+BUG:466046
+FIXED-IN:5.27.4
+
+
+(cherry picked from commit 21155f81fee953d5b5e1bab92565b85ef99a0260)
+---
+ common/utils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/utils.cpp b/common/utils.cpp
+index 7aaa926..a9eb80c 100644
+--- a/common/utils.cpp
++++ b/common/utils.cpp
+@@ -35,7 +35,7 @@ QString Utils::outputName(const KScreen::Output *output, bool shouldShowSerialNu
+             name += output->edid()->serial() + QLatin1Char(' ');
+         }
+         if (shouldShowConnector) {
+-            name += output->typeName();
++            name += output->name();
+         }
+         if (!name.trimmed().isEmpty()) {
+             return name;
+-- 
+2.40.0
+
diff --git a/kde-plasma/kscreen/kscreen-5.27.3.ebuild b/kde-plasma/kscreen/kscreen-5.27.3-r1.ebuild
index 65c59cbc0f15..9c1f4faf09a7 100644
--- a/kde-plasma/kscreen/kscreen-5.27.3.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.27.3-r1.ebuild
@@ -47,3 +47,5 @@ RDEPEND="${DEPEND}
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
+
+PATCHES=( "${FILESDIR}/${P}-display-connector-name.patch" ) # KDE-bug 466046