1 |
commit: 6e2e1bbbd7b0a508a96e95a2f77457d2da0113e2 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 9 21:05:38 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 19 16:26:31 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e2e1bbb |
7 |
|
8 |
kde-plasma/plasma-desktop: Mitigate KNS/Discover impact on KDE servers |
9 |
|
10 |
See also: |
11 |
https://mail.kde.org/pipermail/distributions/2022-February/001140.html |
12 |
|
13 |
Upstream commits: |
14 |
798027fd17ab86eea022e5d269aa86138b28b130 |
15 |
8e164050c594855ee3728678d6d0907a10b28db6 |
16 |
b85cf34298c274b5f16cb6c2aead7b87f0dabbb8 |
17 |
6e8626f2d65a03af3cd12fb5390040c56ca3258d |
18 |
|
19 |
Also, move virtual/crypt dependency behind IUSE=policykit as it should be. |
20 |
|
21 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
22 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
23 |
|
24 |
...top-5.23.5-attica-add-granular-cache-pref.patch | 57 +++++++ |
25 |
.../plasma-desktop/plasma-desktop-5.23.5-r1.ebuild | 190 +++++++++++++++++++++ |
26 |
2 files changed, 247 insertions(+) |
27 |
|
28 |
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.5-attica-add-granular-cache-pref.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.5-attica-add-granular-cache-pref.patch |
29 |
new file mode 100644 |
30 |
index 000000000000..fb4d0bacbd90 |
31 |
--- /dev/null |
32 |
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.23.5-attica-add-granular-cache-pref.patch |
33 |
@@ -0,0 +1,57 @@ |
34 |
+From 346dafd3a0e19805f77147a9515a7333a05ed584 Mon Sep 17 00:00:00 2001 |
35 |
+From: Dan Leinir Turthra Jensen <admin@××××××.dk> |
36 |
+Date: Tue, 8 Feb 2022 11:16:16 +0000 |
37 |
+Subject: [PATCH] Add a granular cache preference thing to attica-kde |
38 |
+ |
39 |
+Commit 798027fd17ab86eea022e5d269aa86138b28b130 |
40 |
+ |
41 |
+This allows us to explicitly add cache preference to specific calls. |
42 |
+Usually attica calls want to be very current, but in some cases we can |
43 |
+assume things aren't going to change often (such as the categories |
44 |
+call), and we can just use the cached version for those calls. |
45 |
+ |
46 |
+Fix missing variable name |
47 |
+Commit 8e164050c594855ee3728678d6d0907a10b28db6 |
48 |
+ |
49 |
+Only trust the expiration date if it's less than 24 hours |
50 |
+Commit b85cf34298c274b5f16cb6c2aead7b87f0dabbb8 |
51 |
+ |
52 |
+Fix build |
53 |
+Commit 6e8626f2d65a03af3cd12fb5390040c56ca3258d |
54 |
+--- |
55 |
+ attica-kde/kdeplugin/kdeplatformdependent.cpp | 20 ++++++++++++++++++- |
56 |
+ 1 file changed, 19 insertions(+), 1 deletion(-) |
57 |
+ |
58 |
+diff --git a/attica-kde/kdeplugin/kdeplatformdependent.cpp b/attica-kde/kdeplugin/kdeplatformdependent.cpp |
59 |
+index c2c90107e..850c91284 100644 |
60 |
+--- a/attica-kde/kdeplugin/kdeplatformdependent.cpp |
61 |
++++ b/attica-kde/kdeplugin/kdeplatformdependent.cpp |
62 |
+@@ -125,6 +125,25 @@ QNetworkRequest KdePlatformDependent::addOAuthToRequest(const QNetworkRequest &r |
63 |
+ const QString bearer = bearer_format.arg(token); |
64 |
+ notConstReq.setRawHeader("Authorization", bearer.toUtf8()); |
65 |
+ } |
66 |
++ |
67 |
++ // Add cache preference in a granular fashion (we will almost certainly want more of these, but...) |
68 |
++ static const QStringList preferCacheEndpoints{QLatin1String{"/content/categories"}}; |
69 |
++ for (const QString &endpoint : preferCacheEndpoints) { |
70 |
++ if (notConstReq.url().toString().endsWith(endpoint)) { |
71 |
++ QNetworkCacheMetaData cacheMeta{m_accessManager->cache()->metaData(notConstReq.url())}; |
72 |
++ if (cacheMeta.isValid()) { |
73 |
++ // If the expiration date is valid, but longer than 24 hours, don't trust that things |
74 |
++ // haven't changed and check first, otherwise just use the cached version to relieve |
75 |
++ // server strain and reduce network traffic. |
76 |
++ const QDateTime tomorrow{QDateTime::currentDateTime().addDays(1)}; |
77 |
++ if (cacheMeta.expirationDate().isValid() && cacheMeta.expirationDate() < tomorrow) { |
78 |
++ notConstReq.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache); |
79 |
++ } |
80 |
++ } |
81 |
++ break; |
82 |
++ } |
83 |
++ } |
84 |
++ |
85 |
+ return notConstReq; |
86 |
+ } |
87 |
+ |
88 |
+-- |
89 |
+2.34.1 |
90 |
+ |
91 |
|
92 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.23.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.23.5-r1.ebuild |
93 |
new file mode 100644 |
94 |
index 000000000000..742364236aea |
95 |
--- /dev/null |
96 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.23.5-r1.ebuild |
97 |
@@ -0,0 +1,190 @@ |
98 |
+# Copyright 1999-2022 Gentoo Authors |
99 |
+# Distributed under the terms of the GNU General Public License v2 |
100 |
+ |
101 |
+EAPI=8 |
102 |
+ |
103 |
+ECM_HANDBOOK="forceoptional" |
104 |
+ECM_TEST="true" |
105 |
+KFMIN=5.86.0 |
106 |
+PVCUT=$(ver_cut 1-3) |
107 |
+QTMIN=5.15.2 |
108 |
+VIRTUALX_REQUIRED="test" |
109 |
+inherit ecm kde.org optfeature |
110 |
+ |
111 |
+DESCRIPTION="KDE Plasma desktop" |
112 |
+XORGHDRS="${PN}-override-include-dirs-1" |
113 |
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" |
114 |
+ |
115 |
+LICENSE="GPL-2" # TODO: CHECK |
116 |
+SLOT="5" |
117 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
118 |
+IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop telemetry" |
119 |
+ |
120 |
+COMMON_DEPEND=" |
121 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
122 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
123 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5 |
124 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
125 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
126 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
127 |
+ >=dev-qt/qtsql-${QTMIN}:5 |
128 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
129 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
130 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
131 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
132 |
+ >=kde-frameworks/attica-${KFMIN}:5 |
133 |
+ >=kde-frameworks/kactivities-${KFMIN}:5 |
134 |
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5 |
135 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
136 |
+ >=kde-frameworks/kauth-${KFMIN}:5 |
137 |
+ >=kde-frameworks/kbookmarks-${KFMIN}:5 |
138 |
+ >=kde-frameworks/kcmutils-${KFMIN}:5 |
139 |
+ >=kde-frameworks/kcodecs-${KFMIN}:5 |
140 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
141 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
142 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
143 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
144 |
+ >=kde-frameworks/kcrash-${KFMIN}:5 |
145 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
146 |
+ >=kde-frameworks/kdeclarative-${KFMIN}:5 |
147 |
+ >=kde-frameworks/kded-${KFMIN}:5 |
148 |
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5 |
149 |
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
150 |
+ >=kde-frameworks/kguiaddons-${KFMIN}:5 |
151 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
152 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
153 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
154 |
+ >=kde-frameworks/kitemmodels-${KFMIN}:5 |
155 |
+ >=kde-frameworks/kitemviews-${KFMIN}:5 |
156 |
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
157 |
+ >=kde-frameworks/knewstuff-${KFMIN}:5 |
158 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
159 |
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5 |
160 |
+ >=kde-frameworks/kparts-${KFMIN}:5 |
161 |
+ >=kde-frameworks/krunner-${KFMIN}:5 |
162 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
163 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
164 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
165 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
166 |
+ >=kde-frameworks/plasma-${KFMIN}:5 |
167 |
+ >=kde-frameworks/solid-${KFMIN}:5 |
168 |
+ >=kde-frameworks/sonnet-${KFMIN}:5 |
169 |
+ >=kde-plasma/kwin-${PVCUT}:5 |
170 |
+ >=kde-plasma/libksysguard-${PVCUT}:5 |
171 |
+ >=kde-plasma/libkworkspace-${PVCUT}:5 |
172 |
+ >=kde-plasma/plasma-workspace-${PVCUT}:5 |
173 |
+ >=media-libs/phonon-4.11.0 |
174 |
+ x11-libs/libX11 |
175 |
+ x11-libs/libXfixes |
176 |
+ x11-libs/libXi |
177 |
+ x11-libs/libxcb[xkb] |
178 |
+ x11-libs/libxkbfile |
179 |
+ emoji? ( |
180 |
+ app-i18n/ibus[emoji] |
181 |
+ dev-libs/glib:2 |
182 |
+ media-fonts/noto-emoji |
183 |
+ ) |
184 |
+ ibus? ( |
185 |
+ app-i18n/ibus |
186 |
+ dev-libs/glib:2 |
187 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
188 |
+ x11-libs/libxcb |
189 |
+ x11-libs/xcb-util-keysyms |
190 |
+ ) |
191 |
+ kaccounts? ( |
192 |
+ kde-apps/kaccounts-integration:5 |
193 |
+ net-libs/accounts-qt |
194 |
+ ) |
195 |
+ policykit? ( |
196 |
+ >=kde-frameworks/kwallet-${KFMIN}:5 |
197 |
+ virtual/libcrypt:= |
198 |
+ ) |
199 |
+ scim? ( app-i18n/scim ) |
200 |
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) |
201 |
+ telemetry? ( dev-libs/kuserfeedback:5 ) |
202 |
+" |
203 |
+DEPEND="${COMMON_DEPEND} |
204 |
+ dev-libs/boost |
205 |
+ x11-base/xorg-proto |
206 |
+" |
207 |
+RDEPEND="${COMMON_DEPEND} |
208 |
+ !kde-plasma/user-manager |
209 |
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5 |
210 |
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
211 |
+ >=kde-frameworks/kirigami-${KFMIN}:5 |
212 |
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 |
213 |
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5 |
214 |
+ >=kde-plasma/oxygen-${PVCUT}:5 |
215 |
+ sys-apps/util-linux |
216 |
+ x11-apps/setxkbmap |
217 |
+ x11-misc/xdg-user-dirs |
218 |
+ kaccounts? ( net-libs/signon-oauth2 ) |
219 |
+ policykit? ( sys-apps/accountsservice ) |
220 |
+" |
221 |
+BDEPEND="virtual/pkgconfig" |
222 |
+ |
223 |
+PATCHES=( |
224 |
+ "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch |
225 |
+ # https://mail.kde.org/pipermail/distributions/2022-February/001140.html |
226 |
+ "${FILESDIR}/${P}-attica-add-granular-cache-pref.patch" |
227 |
+) |
228 |
+ |
229 |
+src_prepare() { |
230 |
+ ecm_src_prepare |
231 |
+ |
232 |
+ if ! use policykit; then |
233 |
+ ecm_punt_kf_module Wallet |
234 |
+ cmake_run_in kcms cmake_comment_add_subdirectory users |
235 |
+ fi |
236 |
+ |
237 |
+ if ! use ibus; then |
238 |
+ sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ |
239 |
+ -i applets/kimpanel/backend/ibus/CMakeLists.txt || die |
240 |
+ fi |
241 |
+ |
242 |
+ use emoji || cmake_run_in applets/kimpanel/backend/ibus \ |
243 |
+ cmake_comment_add_subdirectory emojier |
244 |
+ |
245 |
+ # TODO: try to get a build switch upstreamed |
246 |
+ if ! use scim; then |
247 |
+ sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die |
248 |
+ fi |
249 |
+} |
250 |
+ |
251 |
+src_configure() { |
252 |
+ local mycmakeargs=( |
253 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged |
254 |
+ -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
255 |
+ -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
256 |
+ -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
257 |
+ -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include |
258 |
+ $(cmake_use_find_package kaccounts AccountsQt5) |
259 |
+ $(cmake_use_find_package kaccounts KAccounts) |
260 |
+ $(cmake_use_find_package semantic-desktop KF5Baloo) |
261 |
+ $(cmake_use_find_package telemetry KUserFeedback) |
262 |
+ ) |
263 |
+ if ! use emoji && ! use ibus; then |
264 |
+ mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON ) |
265 |
+ fi |
266 |
+ |
267 |
+ ecm_src_configure |
268 |
+} |
269 |
+ |
270 |
+src_test() { |
271 |
+ # parallel tests fail, foldermodeltest,positionertest hang, bug #646890 |
272 |
+ # test_kio_fonts needs D-Bus, bug #634166 |
273 |
+ # lookandfeel-kcmTest is unreliable for a long time, bug #607918 |
274 |
+ local myctestargs=( |
275 |
+ -j1 |
276 |
+ -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)" |
277 |
+ ) |
278 |
+ |
279 |
+ ecm_src_test |
280 |
+} |
281 |
+ |
282 |
+pkg_postinst() { |
283 |
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then |
284 |
+ optfeature "screen reader support" app-accessibility/orca |
285 |
+ fi |
286 |
+ ecm_pkg_postinst |
287 |
+} |