gentoo auto-resync : 29:03:2023 - 03:52:19

3 files changed, 4 insertions, 39 deletions

diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 52f8d57a587b..0c908e181754 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,6 +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-patchset-1.tar.xz 1304 BLAKE2B bbf68dbeef2134498af481bb2556bfd214140688e9d5917391fe84b5c70ef6bd8bf5081ee0e7051d8ceca8895f02eeeeff2a6bf00d5f22da95814e791137850c SHA512 b9cc71d82e91ffa94bf9e4bace9c575330c96ed5690094066de481e25f15d2a95bfd4ff5aa767c1399d4d582f0fa6a1d19304759ce67a5badc6c5778fd222338
 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-r1.ebuild 1430 BLAKE2B d4d4927663dc12d80f59f46a6e68f3186a86fda7114b16f36f89466a71a3e3ed6ffa72d7960f21c41b52340c4f9629cf96fcf217a4ae68b04183c381493ea119 SHA512 405fa1f4f8849d69042a40cc7596e0802c269d068db10cb7e5b45389f48fb346577be555eb71105a7857b5e2c36bb290773702bb6b9702174eb34a1676a0b0bb
+EBUILD kscreen-5.27.3-r2.ebuild 1497 BLAKE2B 34b12361882c93277b90d68064599f2924323b176a2225daa66437d7c8cd0a13630202ea6937306aa7c671671d41b9a6b07e9e152aa52fdc36c7d7ffda30229a SHA512 73fe79788c9fd24a72550b6201a53432af0aa5158c0f1831b1deac928584ac967dac4d9409c0c91397e9d129aabf31055b974330d9b681db12d89758cef7b2de
 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
deleted file mode 100644
index 54497b3d99f8..000000000000
--- a/kde-plasma/kscreen/files/kscreen-5.27.3-display-connector-name.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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-r1.ebuild b/kde-plasma/kscreen/kscreen-5.27.3-r2.ebuild
index 9c1f4faf09a7..bc83dfb7deb0 100644
--- a/kde-plasma/kscreen/kscreen-5.27.3-r1.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.27.3-r2.ebuild
@@ -11,6 +11,7 @@ inherit ecm plasma.kde.org
 
 DESCRIPTION="KDE Plasma screen management"
 HOMEPAGE="https://invent.kde.org/plasma/kscreen"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
@@ -48,4 +49,4 @@ RDEPEND="${DEPEND}
 "
 BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
 
-PATCHES=( "${FILESDIR}/${P}-display-connector-name.patch" ) # KDE-bug 466046
+PATCHES=( "${WORKDIR}/${P}-patchset-1" )  # KDE-bugs 466046, 466914