[gentoo-commits] repo/gentoo:master commit in: kde-plasma/kscreen/files/, kde-plasma/kscreen/

[Andreas Sturmlechner]

commit:     9d610ee80b70f342a0ecd7b724508752d169fd10
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 23 10:19:33 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 14:59:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d610ee8

kde-plasma/kscreen: Fix cut off text in kcm dialog

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=445341
Upstream commit 29343eb7586509dc37ecf5adcb3b6086803fa0ed

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kscreen-5.23.3-make-revert-message-wrap.patch  | 31 ++++++++++++++
 kde-plasma/kscreen/kscreen-5.23.3-r1.ebuild        | 48 ++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/kde-plasma/kscreen/files/kscreen-5.23.3-make-revert-message-wrap.patch b/kde-plasma/kscreen/files/kscreen-5.23.3-make-revert-message-wrap.patch
new file mode 100644
index 000000000000..440834a2971f
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.23.3-make-revert-message-wrap.patch
@@ -0,0 +1,31 @@
+From 29343eb7586509dc37ecf5adcb3b6086803fa0ed Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@×××.org>
+Date: Fri, 12 Nov 2021 15:22:46 -0700
+Subject: [PATCH] kcm: make revert message wrap
+
+This was the intention, but the wrap mode enum was being called from the
+wrong namespace, so it didn't work.
+
+BUG: 445341
+FIXED-IN: 5.23.4
+(cherry picked from commit fc02fb29ba9ffac749762e1577edd4308150fb03)
+---
+ kcm/package/contents/ui/main.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcm/package/contents/ui/main.qml b/kcm/package/contents/ui/main.qml
+index 431999b..43b3ba4 100644
+--- a/kcm/package/contents/ui/main.qml
++++ b/kcm/package/contents/ui/main.qml
+@@ -110,7 +110,7 @@ KCM.SimpleKCM {
+                 text: i18np("Will revert to previous configuration in %1 second.",
+                             "Will revert to previous configuration in %1 seconds.",
+                             revertCountdown);
+-                wrapMode: Qt.WordWrap
++                wrapMode: Text.WordWrap
+             }
+             footer: RowLayout {
+                 Controls.Button {
+-- 
+GitLab
+

diff --git a/kde-plasma/kscreen/kscreen-5.23.3-r1.ebuild b/kde-plasma/kscreen/kscreen-5.23.3-r1.ebuild
new file mode 100644
index 000000000000..3fa3ba0ff984
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.23.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.86.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm 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 ~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/libkscreen-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=( "${FILESDIR}"/${P}-make-revert-message-wrap.patch ) # KDE-bug 445341