diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2023-03-24 21:54:45 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-03-26 11:50:05 +0200 |
commit | 3ded8160a8f1446c1d923adb8bb737bad58d1563 (patch) | |
tree | d947932e51e3d6ce04c040e3ebe2dbafecb698a4 /kde-plasma/kscreen | |
parent | kde-plasma/kde-gtk-config: drop 5.27.3-r1 (diff) | |
download | gentoo-3ded8160a8f1446c1d923adb8bb737bad58d1563.tar.gz gentoo-3ded8160a8f1446c1d923adb8bb737bad58d1563.tar.bz2 gentoo-3ded8160a8f1446c1d923adb8bb737bad58d1563.zip |
kde-plasma/kscreen: Display connector name instead of type name
...when serial number is identical
Upstream commit 7f2c1f8b104efb748cae5814ed2aa87fb2046796
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=466046
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma/kscreen')
-rw-r--r-- | kde-plasma/kscreen/files/kscreen-5.27.3-display-connector-name.patch | 36 | ||||
-rw-r--r-- | kde-plasma/kscreen/kscreen-5.27.3-r1.ebuild | 51 |
2 files changed, 87 insertions, 0 deletions
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-r1.ebuild b/kde-plasma/kscreen/kscreen-5.27.3-r1.ebuild new file mode 100644 index 000000000000..9c1f4faf09a7 --- /dev/null +++ b/kde-plasma/kscreen/kscreen-5.27.3-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=5.102.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.7 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma screen management" +HOMEPAGE="https://invent.kde.org/plasma/kscreen" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="" + +# bug #580440, last checked 5.6.3 +RESTRICT="test" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsensors-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/layer-shell-qt-${PVCUT}:5 + >=kde-plasma/libkscreen-${PVCUT}:5 + x11-libs/libX11 +" +RDEPEND="${DEPEND} + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:5 +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" + +PATCHES=( "${FILESDIR}/${P}-display-connector-name.patch" ) # KDE-bug 466046 |