1 |
commit: de40a4db73bc5972feef63106982b5db8f3f853a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 17 18:41:21 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 17 19:01:49 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de40a4db |
7 |
|
8 |
kde-plasma/kscreen: Backport several 5.24.6 fixes |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
...ct-ext-monitors-when-a-monitor-is-rotated.patch | 31 +++++++++++++ |
14 |
...reen-5.24.5-kcm-fix-choosing-refresh-rate.patch | 28 ++++++++++++ |
15 |
...4.5-kcm-fix-refresh-rate-list-not-updated.patch | 29 ++++++++++++ |
16 |
kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild | 52 ++++++++++++++++++++++ |
17 |
4 files changed, 140 insertions(+) |
18 |
|
19 |
diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch |
20 |
new file mode 100644 |
21 |
index 000000000000..d2efce69b9e5 |
22 |
--- /dev/null |
23 |
+++ b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch |
24 |
@@ -0,0 +1,31 @@ |
25 |
+From ff8dc215e8d2691fcf41d0bb305f820531d95150 Mon Sep 17 00:00:00 2001 |
26 |
+From: Aleix Pol <aleixpol@×××.org> |
27 |
+Date: Sat, 14 May 2022 01:29:01 +0200 |
28 |
+Subject: [PATCH] Fix connecting external monitors when a monitor is rotated |
29 |
+ |
30 |
+It would be placed right by the unrotated geometry and after rotating it |
31 |
+the new output would end up floating in the logical space. |
32 |
+This happened because the explicitLogicalSize is cached and needs |
33 |
+updating after changing its settings. |
34 |
+ |
35 |
+ |
36 |
+(cherry picked from commit cc832fd4296440fcd9298cb03b0cc736a99ed8bb) |
37 |
+--- |
38 |
+ kded/generator.cpp | 1 + |
39 |
+ 1 file changed, 1 insertion(+) |
40 |
+ |
41 |
+diff --git a/kded/generator.cpp b/kded/generator.cpp |
42 |
+index e5117a9..e311b04 100644 |
43 |
+--- a/kded/generator.cpp |
44 |
++++ b/kded/generator.cpp |
45 |
+@@ -85,6 +85,7 @@ KScreen::ConfigPtr Generator::idealConfig(const KScreen::ConfigPtr ¤tConfi |
46 |
+ |
47 |
+ for (const auto &output : connectedOutputs) { |
48 |
+ initializeOutput(output, config->supportedFeatures()); |
49 |
++ output->setExplicitLogicalSize(config->logicalSizeForOutput(*output)); |
50 |
+ } |
51 |
+ |
52 |
+ if (connectedOutputs.count() == 1) { |
53 |
+-- |
54 |
+GitLab |
55 |
+ |
56 |
|
57 |
diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch |
58 |
new file mode 100644 |
59 |
index 000000000000..2d0d3ba1e851 |
60 |
--- /dev/null |
61 |
+++ b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch |
62 |
@@ -0,0 +1,28 @@ |
63 |
+From 6ecb832923612820c721f58d1d12dd176e10528a Mon Sep 17 00:00:00 2001 |
64 |
+From: Xaver Hugl <xaver.hugl@×××××.com> |
65 |
+Date: Thu, 5 May 2022 18:27:38 +0200 |
66 |
+Subject: [PATCH] kcm: fix choosing the refresh rate |
67 |
+ |
68 |
+It always chose the last one, and not the highest one |
69 |
+ |
70 |
+ |
71 |
+(cherry picked from commit 5e1be88dbe6e5160dcc232631df81d9bdc9d179e) |
72 |
+--- |
73 |
+ kcm/output_model.cpp | 1 + |
74 |
+ 1 file changed, 1 insertion(+) |
75 |
+ |
76 |
+diff --git a/kcm/output_model.cpp b/kcm/output_model.cpp |
77 |
+index 92e4ea3..3672b49 100644 |
78 |
+--- a/kcm/output_model.cpp |
79 |
++++ b/kcm/output_model.cpp |
80 |
+@@ -394,6 +394,7 @@ bool OutputModel::setResolution(int outputIndex, int resIndex) |
81 |
+ auto it = modes.begin(); |
82 |
+ while (it != modes.end()) { |
83 |
+ if ((*it)->size() == size && (*it)->refreshRate() > bestRefreshRate) { |
84 |
++ bestRefreshRate = (*it)->refreshRate(); |
85 |
+ modeIt = it; |
86 |
+ } |
87 |
+ it++; |
88 |
+-- |
89 |
+GitLab |
90 |
+ |
91 |
|
92 |
diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch |
93 |
new file mode 100644 |
94 |
index 000000000000..e7d85fd87013 |
95 |
--- /dev/null |
96 |
+++ b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch |
97 |
@@ -0,0 +1,29 @@ |
98 |
+From 584ed8a067a7c0329e1572dd9970b6e3dae6a56f Mon Sep 17 00:00:00 2001 |
99 |
+From: Xaver Hugl <xaver.hugl@×××××.com> |
100 |
+Date: Thu, 5 May 2022 18:22:46 +0200 |
101 |
+Subject: [PATCH] kcm: fix refresh rate list not being updated |
102 |
+ |
103 |
+BUG: 453392 |
104 |
+ |
105 |
+ |
106 |
+(cherry picked from commit 8c1e2cffda762fef83ea48658a08847382c71486) |
107 |
+--- |
108 |
+ kcm/output_model.cpp | 2 +- |
109 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
110 |
+ |
111 |
+diff --git a/kcm/output_model.cpp b/kcm/output_model.cpp |
112 |
+index fcdb738..92e4ea3 100644 |
113 |
+--- a/kcm/output_model.cpp |
114 |
++++ b/kcm/output_model.cpp |
115 |
+@@ -417,7 +417,7 @@ bool OutputModel::setResolution(int outputIndex, int resIndex) |
116 |
+ QModelIndex index = createIndex(outputIndex, 0); |
117 |
+ // Calling this directly ignores possible optimization when the |
118 |
+ // refresh rate hasn't changed in fact. But that's ok. |
119 |
+- Q_EMIT dataChanged(index, index, {ResolutionIndexRole, ResolutionRole, SizeRole, RefreshRateIndexRole}); |
120 |
++ Q_EMIT dataChanged(index, index, {ResolutionIndexRole, ResolutionRole, SizeRole, RefreshRatesRole, RefreshRateIndexRole}); |
121 |
+ Q_EMIT sizeChanged(); |
122 |
+ return true; |
123 |
+ } |
124 |
+-- |
125 |
+GitLab |
126 |
+ |
127 |
|
128 |
diff --git a/kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild b/kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild |
129 |
new file mode 100644 |
130 |
index 000000000000..0fa224e22205 |
131 |
--- /dev/null |
132 |
+++ b/kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild |
133 |
@@ -0,0 +1,52 @@ |
134 |
+# Copyright 1999-2022 Gentoo Authors |
135 |
+# Distributed under the terms of the GNU General Public License v2 |
136 |
+ |
137 |
+EAPI=8 |
138 |
+ |
139 |
+ECM_TEST="forceoptional" |
140 |
+KFMIN=5.90.0 |
141 |
+PVCUT=$(ver_cut 1-3) |
142 |
+QTMIN=5.15.2 |
143 |
+inherit ecm kde.org |
144 |
+ |
145 |
+DESCRIPTION="KDE Plasma screen management" |
146 |
+HOMEPAGE="https://invent.kde.org/plasma/kscreen" |
147 |
+ |
148 |
+LICENSE="GPL-2" # TODO: CHECK |
149 |
+SLOT="5" |
150 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
151 |
+IUSE="" |
152 |
+ |
153 |
+# bug #580440, last checked 5.6.3 |
154 |
+RESTRICT="test" |
155 |
+ |
156 |
+DEPEND=" |
157 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
158 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] |
159 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
160 |
+ >=dev-qt/qtsensors-${QTMIN}:5 |
161 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
162 |
+ >=kde-frameworks/kcmutils-${KFMIN}:5 |
163 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
164 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
165 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
166 |
+ >=kde-frameworks/kdeclarative-${KFMIN}:5 |
167 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
168 |
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
169 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
170 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
171 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
172 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
173 |
+ >=kde-frameworks/plasma-${KFMIN}:5 |
174 |
+ >=kde-plasma/libkscreen-${PVCUT}:5 |
175 |
+" |
176 |
+RDEPEND="${DEPEND} |
177 |
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5 |
178 |
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5 |
179 |
+" |
180 |
+ |
181 |
+PATCHES=( |
182 |
+ "${FILESDIR}/${P}-kcm-fix-refresh-rate-list-not-updated.patch" # KDE-bug 453392 |
183 |
+ "${FILESDIR}/${P}-kcm-fix-choosing-refresh-rate.patch" |
184 |
+ "${FILESDIR}/${P}-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch" |
185 |
+) |