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

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

[Andreas Sturmlechner]

commit:     155411faf50aa7a1712c6ca38840a8c9b1a9cc2b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 20:20:38 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 20:32:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155411fa

kde-plasma/kscreen: drop 5.27.3-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kscreen-5.27.3-display-connector-name.patch    | 36 ---------------
 kde-plasma/kscreen/kscreen-5.27.3-r1.ebuild        | 51 ----------------------
 2 files changed, 87 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
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-r1.ebuild
deleted file mode 100644
index 9c1f4faf09a7..000000000000
--- a/kde-plasma/kscreen/kscreen-5.27.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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

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

[Andreas Sturmlechner]

commit:     bc3f23f40dea972813f9d8e6a348888f2844603a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 14:50:04 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 15:23:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc3f23f4

kde-plasma/kscreen: 5.27.8-r1 version bump

Closes: https://bugs.gentoo.org/914142
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../kscreen/files/kscreen-5.27.8-cmake.patch       | 26 +++++++++++
 kde-plasma/kscreen/kscreen-5.27.8-r1.ebuild        | 52 ++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/kde-plasma/kscreen/files/kscreen-5.27.8-cmake.patch b/kde-plasma/kscreen/files/kscreen-5.27.8-cmake.patch
new file mode 100644
index 000000000000..e8092f817e97
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.27.8-cmake.patch
@@ -0,0 +1,26 @@
+From 6c3ec4b19a6948b829573282ce7820853b149423 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 18 Sep 2023 13:32:14 +0200
+Subject: [PATCH] Drop unused KIconThemes dependency
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+(cherry picked from commit 9f923c45d540411ae559e796d907e773c149722d)
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4ce4c3bd..337136fd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,7 +38,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+     Declarative
+     GlobalAccel
+     I18n
+-    IconThemes
+     KCMUtils
+     Plasma
+     PlasmaQuick
+-- 
+2.42.0
+

diff --git a/kde-plasma/kscreen/kscreen-5.27.8-r1.ebuild b/kde-plasma/kscreen/kscreen-5.27.8-r1.ebuild
new file mode 100644
index 000000000000..dc45c927477a
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.27.8-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.9
+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
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${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/kwindowsystem-${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
+	x11-libs/libxcb:=
+	x11-libs/libXi
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 914142

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

[Andreas Sturmlechner]

commit:     ed9bf039e09be1b1c5838e39589cbe1e53bd5eb8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 17:37:17 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 17:38:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed9bf039

kde-plasma/kscreen: don't stumble over nullptrs if outputs changed

...during saving

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=466960

Bug: https://bugs.gentoo.org/899706
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...nullptrs-if-outputs-changed-during-saving.patch | 39 ++++++++++++++++
 kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild        | 54 ++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch b/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch
new file mode 100644
index 000000000000..795773a679f6
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.27.4-avoid-nullptrs-if-outputs-changed-during-saving.patch
@@ -0,0 +1,39 @@
+From 8af1cfac332f6f7c4e6db40c851dd5ac719236f1 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Mon, 17 Apr 2023 16:01:50 +0200
+Subject: [PATCH] don't stumble over nullptrs if outputs changed during saving
+
+exec() opens a nested eventloop that does event processing and may end
+up processing output changes when e.g. a screen is getting unplugged. as
+part of this our m_configHandler may get reset to null, so make sure the
+pointers are still valid after exec
+
+BUG: 466960
+
+
+(cherry picked from commit 0bfa16bd2b59ac9b2ce8112c06d86e5e29c69654)
+---
+ kcm/kcm.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
+index f292699c..931509eb 100644
+--- a/kcm/kcm.cpp
++++ b/kcm/kcm.cpp
+@@ -172,6 +172,13 @@ void KCMKScreen::doSave()
+     m_stopUpdatesFromBackend = true;
+     op->exec();
+ 
++    // exec() opens a nested eventloop that may have unset m_configHandler if (e.g.)
++    // outputs changed during saving. https://bugs.kde.org/show_bug.cgi?id=466960
++    if (!m_configHandler || !m_configHandler->config()) {
++        Q_EMIT errorOnSave();
++        return;
++    }
++
+     const auto updateInitialData = [this]() {
+         if (!m_configHandler || !m_configHandler->config()) {
+             return;
+-- 
+GitLab
+

diff --git a/kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild b/kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild
new file mode 100644
index 000000000000..b462d1c4519b
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.27.4-r2.ebuild
@@ -0,0 +1,54 @@
+# 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}-kcm-notify-changes-when-global-scale-changes.patch" # KDE-bug 468203
+	"${FILESDIR}/${P}-avoid-nullptrs-if-outputs-changed-during-saving.patch" # KDE-bug 466960
+)

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

[Andreas Sturmlechner]

commit:     591b28d3c215f9bab4ee3cc77087191b3403a08a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 15:25:40 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 30 16:09:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591b28d3

kde-plasma/kscreen: X11: fix kded xcb resource leak

Upstream commit 93cfd297506e4106a7b6e7bcc649442c5bf0f7d1
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=453280

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

 ...screen-5.24.5-fix-kded-xcb-resources-leak.patch | 61 ++++++++++++++++++++++
 kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild        | 53 +++++++++++++++++++
 2 files changed, 114 insertions(+)

diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-fix-kded-xcb-resources-leak.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-kded-xcb-resources-leak.patch
new file mode 100644
index 000000000000..ecba1664c51c
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-kded-xcb-resources-leak.patch
@@ -0,0 +1,61 @@
+From 93cfd297506e4106a7b6e7bcc649442c5bf0f7d1 Mon Sep 17 00:00:00 2001
+From: Stefan Becker <chemobejk@gmail.com>
+Date: Sun, 29 May 2022 23:33:55 +0300
+Subject: [PATCH] X11: fix kded xcb resource leak
+
+This fixes commit 579358f501ae978aa527a25eb3ef9dd42557db46
+
+XOpenDisplay() internally calls xcb_connect(), creating a new XCB client
+connection. This means that on every KScreen configuration change event
+the kded5 process creates a new connection until XCB runs into the hard
+limit of 256 of clients, leading to the dreaded "Maximum number of
+clients reached" error.
+
+Re-use the display from QX11Info instead of calling XOpenDisplay().
+
+BUG: 453280
+
+
+(cherry picked from commit 0270a49328aa70b14dd08e2ed5a425ca3f8e4fd5)
+---
+ kded/daemon.cpp | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/kded/daemon.cpp b/kded/daemon.cpp
+index e8ed4ac..443d98d 100644
+--- a/kded/daemon.cpp
++++ b/kded/daemon.cpp
+@@ -361,6 +361,14 @@ void KScreenDaemon::alignX11TouchScreen()
+     if (qGuiApp->platformName() != QStringLiteral("xcb")) {
+         return;
+     }
++    auto *display = QX11Info::display();
++    if (!display) {
++        return;
++    }
++    auto *connection = QX11Info::connection();
++    if (!connection) {
++        return;
++    }
+ 
+     const QRect totalRect(QPoint(0, 0), m_monitoredConfig->data()->screen()->currentSize());
+     QRect internalOutputRect;
+@@ -411,15 +419,6 @@ void KScreenDaemon::alignX11TouchScreen()
+         break;
+     }
+ 
+-    auto *display = XOpenDisplay(nullptr);
+-    if (!display) {
+-        return;
+-    }
+-    auto *connection = QX11Info::connection();
+-    if (!connection) {
+-        return;
+-    }
+-
+     auto getAtom = [](xcb_connection_t *connection, const char *name) {
+         auto cookie = xcb_intern_atom(connection, true, strlen(name), name);
+         auto reply = xcb_intern_atom_reply(connection, cookie, nullptr);
+-- 
+GitLab
+

diff --git a/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild b/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild
new file mode 100644
index 000000000000..400f3ae8d7a2
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.90.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}-kcm-fix-refresh-rate-list-not-updated.patch" # KDE-bug 453392
+	"${FILESDIR}/${P}-kcm-fix-choosing-refresh-rate.patch"
+	"${FILESDIR}/${P}-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch"
+	"${FILESDIR}/${P}-fix-kded-xcb-resources-leak.patch" # KDE-bug 453280
+)

[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@kde.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