| 1 |
commit: 61988d92de81544b00167a289258360b61c7261e |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 22 20:53:47 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 22 21:59:09 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61988d92 |
| 7 |
|
| 8 |
kde-plasma/plasma-workspace: Fix krunner cwd, device notifications |
| 9 |
|
| 10 |
krunner starts applications with cwd "/" with init system other than systemd |
| 11 |
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=432975 |
| 12 |
|
| 13 |
Disk & Devices applet doesn't show removable devices after eject and reconnect |
| 14 |
Upstream commit 61e2ea2323ae63c5805c87353701ba6fb722205a |
| 15 |
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=438874 |
| 16 |
|
| 17 |
Thanks-to: Eric F. Garioud <eric-f.garioud <AT> wanadoo.fr> |
| 18 |
Thanks-to: Andrea Arcangeli <aarcange <AT> redhat.com> |
| 19 |
Bug: https://bugs.gentoo.org/767478 |
| 20 |
Bug: https://bugs.gentoo.org/814284 |
| 21 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
| 22 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 23 |
|
| 24 |
...orkspace-5.22.5-fix-hotplug-notifications.patch | 33 ++++ |
| 25 |
...asma-workspace-5.22.5-krunner-cwd-at-home.patch | 30 +++ |
| 26 |
.../plasma-workspace-5.22.5-r2.ebuild | 210 +++++++++++++++++++++ |
| 27 |
3 files changed, 273 insertions(+) |
| 28 |
|
| 29 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch |
| 30 |
new file mode 100644 |
| 31 |
index 00000000000..e7cd0627a26 |
| 32 |
--- /dev/null |
| 33 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-fix-hotplug-notifications.patch |
| 34 |
@@ -0,0 +1,33 @@ |
| 35 |
+From 61e2ea2323ae63c5805c87353701ba6fb722205a Mon Sep 17 00:00:00 2001 |
| 36 |
+From: Fabio Bas <fabio.bas@××××××××××××××××××××.net> |
| 37 |
+Date: Fri, 3 Sep 2021 19:23:12 +0200 |
| 38 |
+Subject: [PATCH] Update solid connectedSources when a new source gets added by |
| 39 |
+ hotplug BUG: 438874 |
| 40 |
+ |
| 41 |
+--- |
| 42 |
+ applets/devicenotifier/package/contents/ui/devicenotifier.qml | 2 +- |
| 43 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 44 |
+ |
| 45 |
+diff --git a/applets/devicenotifier/package/contents/ui/devicenotifier.qml b/applets/devicenotifier/package/contents/ui/devicenotifier.qml |
| 46 |
+index a1dc20b83..404ae95e6 100644 |
| 47 |
+--- a/applets/devicenotifier/package/contents/ui/devicenotifier.qml |
| 48 |
++++ b/applets/devicenotifier/package/contents/ui/devicenotifier.qml |
| 49 |
+@@ -75,6 +75,7 @@ Item { |
| 50 |
+ onSourceAdded: { |
| 51 |
+ disconnectSource(source); |
| 52 |
+ connectSource(source); |
| 53 |
++ sdSource.connectedSources = sources |
| 54 |
+ } |
| 55 |
+ onSourceRemoved: { |
| 56 |
+ disconnectSource(source); |
| 57 |
+@@ -98,7 +99,6 @@ Item { |
| 58 |
+ PlasmaCore.DataSource { |
| 59 |
+ id: sdSource |
| 60 |
+ engine: "soliddevice" |
| 61 |
+- connectedSources: hpSource.sources |
| 62 |
+ interval: 0 |
| 63 |
+ property string last |
| 64 |
+ onSourceAdded: { |
| 65 |
+-- |
| 66 |
+GitLab |
| 67 |
+ |
| 68 |
|
| 69 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch |
| 70 |
new file mode 100644 |
| 71 |
index 00000000000..27db136c294 |
| 72 |
--- /dev/null |
| 73 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch |
| 74 |
@@ -0,0 +1,30 @@ |
| 75 |
+Commit 7ca34e0baa7fa65efc929eee5b6b0c3d2104db8e already reverted one |
| 76 |
+change that caused the cwd of all apps spawned by krunner to |
| 77 |
+erroneously be set to the root dir. |
| 78 |
+ |
| 79 |
+That regressions is back so it's more robust to fix in within krunner. |
| 80 |
+ |
| 81 |
+Signed-off-by: Andrea Arcangeli <aarcange@××××××.com> |
| 82 |
+--- |
| 83 |
+ krunner/main.cpp | 2 ++ |
| 84 |
+ 1 file changed, 2 insertions(+) |
| 85 |
+ |
| 86 |
+diff --git a/krunner/main.cpp b/krunner/main.cpp |
| 87 |
+index 4593687ca..fa4a62ac4 100644 |
| 88 |
+--- a/krunner/main.cpp |
| 89 |
++++ b/krunner/main.cpp |
| 90 |
+@@ -12,6 +12,7 @@ |
| 91 |
+ #include <QDBusConnection> |
| 92 |
+ #include <QDBusMessage> |
| 93 |
+ #include <QDebug> |
| 94 |
++#include <QDir> |
| 95 |
+ #include <QQuickWindow> |
| 96 |
+ #include <QSessionManager> |
| 97 |
+ #include <QUrl> |
| 98 |
+@@ -112,5 +113,6 @@ int main(int argc, char **argv) |
| 99 |
+ } |
| 100 |
+ }); |
| 101 |
+ |
| 102 |
++ QDir::setCurrent(QDir::homePath()); |
| 103 |
+ return app.exec(); |
| 104 |
+ } |
| 105 |
|
| 106 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild |
| 107 |
new file mode 100644 |
| 108 |
index 00000000000..2a5454791b8 |
| 109 |
--- /dev/null |
| 110 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.22.5-r2.ebuild |
| 111 |
@@ -0,0 +1,210 @@ |
| 112 |
+# Copyright 1999-2021 Gentoo Authors |
| 113 |
+# Distributed under the terms of the GNU General Public License v2 |
| 114 |
+ |
| 115 |
+EAPI=8 |
| 116 |
+ |
| 117 |
+ECM_HANDBOOK="forceoptional" |
| 118 |
+ECM_TEST="forceoptional" |
| 119 |
+KFMIN=5.82.0 |
| 120 |
+PVCUT=$(ver_cut 1-3) |
| 121 |
+QTMIN=5.15.2 |
| 122 |
+VIRTUALX_REQUIRED="test" |
| 123 |
+inherit ecm kde.org |
| 124 |
+ |
| 125 |
+DESCRIPTION="KDE Plasma workspace" |
| 126 |
+ |
| 127 |
+LICENSE="GPL-2" # TODO: CHECK |
| 128 |
+SLOT="5" |
| 129 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
| 130 |
+IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast |
| 131 |
++semantic-desktop systemd telemetry" |
| 132 |
+ |
| 133 |
+REQUIRED_USE="gps? ( geolocation )" |
| 134 |
+RESTRICT="test" |
| 135 |
+ |
| 136 |
+COMMON_DEPEND=" |
| 137 |
+ >=dev-libs/wayland-1.15 |
| 138 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
| 139 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] |
| 140 |
+ >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput] |
| 141 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
| 142 |
+ >=dev-qt/qtsql-${QTMIN}:5 |
| 143 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
| 144 |
+ >=dev-qt/qtwayland-${QTMIN}:5 |
| 145 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
| 146 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
| 147 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
| 148 |
+ >=kde-frameworks/kactivities-${KFMIN}:5 |
| 149 |
+ >=kde-frameworks/kactivities-stats-${KFMIN}:5 |
| 150 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
| 151 |
+ >=kde-frameworks/kauth-${KFMIN}:5 |
| 152 |
+ >=kde-frameworks/kbookmarks-${KFMIN}:5 |
| 153 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
| 154 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
| 155 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
| 156 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
| 157 |
+ >=kde-frameworks/kcrash-${KFMIN}:5 |
| 158 |
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
| 159 |
+ >=kde-frameworks/kdeclarative-${KFMIN}:5 |
| 160 |
+ >=kde-frameworks/kded-${KFMIN}:5 |
| 161 |
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
| 162 |
+ >=kde-frameworks/kguiaddons-${KFMIN}:5 |
| 163 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
| 164 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
| 165 |
+ >=kde-frameworks/kidletime-${KFMIN}:5 |
| 166 |
+ >=kde-frameworks/kinit-${KFMIN}:5 |
| 167 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
| 168 |
+ >=kde-frameworks/kitemmodels-${KFMIN}:5 |
| 169 |
+ >=kde-frameworks/kitemviews-${KFMIN}:5 |
| 170 |
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
| 171 |
+ >=kde-frameworks/knewstuff-${KFMIN}:5 |
| 172 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
| 173 |
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5 |
| 174 |
+ >=kde-frameworks/kpackage-${KFMIN}:5 |
| 175 |
+ >=kde-frameworks/kpeople-${KFMIN}:5 |
| 176 |
+ >=kde-frameworks/krunner-${KFMIN}:5 |
| 177 |
+ >=kde-frameworks/kservice-${KFMIN}:5 |
| 178 |
+ >=kde-frameworks/ktexteditor-${KFMIN}:5 |
| 179 |
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5 |
| 180 |
+ >=kde-frameworks/kunitconversion-${KFMIN}:5 |
| 181 |
+ >=kde-frameworks/kwallet-${KFMIN}:5 |
| 182 |
+ >=kde-frameworks/kwayland-${KFMIN}:5 |
| 183 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
| 184 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
| 185 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
| 186 |
+ >=kde-frameworks/plasma-${KFMIN}:5 |
| 187 |
+ >=kde-frameworks/prison-${KFMIN}:5[qml] |
| 188 |
+ >=kde-frameworks/solid-${KFMIN}:5 |
| 189 |
+ >=kde-plasma/breeze-${PVCUT}:5 |
| 190 |
+ >=kde-plasma/kscreenlocker-${PVCUT}:5 |
| 191 |
+ >=kde-plasma/kwin-${PVCUT}:5 |
| 192 |
+ >=kde-plasma/layer-shell-qt-${PVCUT}:5 |
| 193 |
+ >=kde-plasma/libkscreen-${PVCUT}:5 |
| 194 |
+ >=kde-plasma/libksysguard-${PVCUT}:5 |
| 195 |
+ >=kde-plasma/libkworkspace-${PVCUT}:5 |
| 196 |
+ >=media-libs/phonon-4.11.0 |
| 197 |
+ sys-libs/zlib |
| 198 |
+ x11-libs/libICE |
| 199 |
+ x11-libs/libSM |
| 200 |
+ x11-libs/libX11 |
| 201 |
+ x11-libs/libXau |
| 202 |
+ x11-libs/libxcb |
| 203 |
+ x11-libs/libXcursor |
| 204 |
+ x11-libs/libXfixes |
| 205 |
+ x11-libs/libXrender |
| 206 |
+ x11-libs/libXtst |
| 207 |
+ x11-libs/xcb-util |
| 208 |
+ x11-libs/xcb-util-image |
| 209 |
+ appstream? ( dev-libs/appstream[qt5] ) |
| 210 |
+ calculator? ( sci-libs/libqalculate:= ) |
| 211 |
+ calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) |
| 212 |
+ fontconfig? ( |
| 213 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
| 214 |
+ media-libs/fontconfig |
| 215 |
+ x11-libs/libXft |
| 216 |
+ x11-libs/xcb-util-image |
| 217 |
+ ) |
| 218 |
+ geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) |
| 219 |
+ gps? ( sci-geosciences/gpsd ) |
| 220 |
+ screencast? ( |
| 221 |
+ >=dev-qt/qtgui-${QTMIN}:5=[egl] |
| 222 |
+ media-libs/libglvnd |
| 223 |
+ >=media-video/pipewire-0.3:= |
| 224 |
+ x11-libs/libdrm |
| 225 |
+ ) |
| 226 |
+ semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) |
| 227 |
+ telemetry? ( dev-libs/kuserfeedback:5 ) |
| 228 |
+" |
| 229 |
+DEPEND="${COMMON_DEPEND} |
| 230 |
+ >=dev-libs/plasma-wayland-protocols-1.1.1 |
| 231 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
| 232 |
+ >=dev-util/wayland-scanner-1.19.0 |
| 233 |
+ x11-base/xorg-proto |
| 234 |
+ fontconfig? ( x11-libs/libXrender ) |
| 235 |
+" |
| 236 |
+RDEPEND="${COMMON_DEPEND} |
| 237 |
+ app-text/iso-codes |
| 238 |
+ >=dev-qt/qdbus-${QTMIN}:5 |
| 239 |
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5 |
| 240 |
+ >=dev-qt/qtpaths-${QTMIN}:5 |
| 241 |
+ >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] |
| 242 |
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
| 243 |
+ kde-apps/kio-extras:5 |
| 244 |
+ >=kde-frameworks/kdesu-${KFMIN}:5 |
| 245 |
+ >=kde-frameworks/kirigami-${KFMIN}:5 |
| 246 |
+ >=kde-frameworks/kquickcharts-${KFMIN}:5 |
| 247 |
+ >=kde-plasma/milou-${PVCUT}:5 |
| 248 |
+ >=kde-plasma/plasma-integration-${PVCUT}:5 |
| 249 |
+ x11-apps/xmessage |
| 250 |
+ x11-apps/xprop |
| 251 |
+ x11-apps/xrdb |
| 252 |
+ x11-apps/xsetroot |
| 253 |
+ systemd? ( sys-apps/dbus[user-session] ) |
| 254 |
+ !systemd? ( sys-apps/dbus ) |
| 255 |
+ !<kde-plasma/plasma-desktop-5.21.90:5 |
| 256 |
+" |
| 257 |
+BDEPEND="virtual/pkgconfig" |
| 258 |
+PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" |
| 259 |
+ |
| 260 |
+PATCHES=( |
| 261 |
+ "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream |
| 262 |
+ "${FILESDIR}/${P}-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 |
| 263 |
+ "${FILESDIR}/${P}-fix-powermanagement-inhibition.patch" # KDE-bug 433675 |
| 264 |
+ "${FILESDIR}/${P}-fix-hotplug-notifications.patch" # KDE-bug 438874, bug 814284 |
| 265 |
+) |
| 266 |
+ |
| 267 |
+src_prepare() { |
| 268 |
+ ecm_src_prepare |
| 269 |
+ |
| 270 |
+ cmake_comment_add_subdirectory libkworkspace |
| 271 |
+ # delete colliding libkworkspace translations |
| 272 |
+ if [[ ${KDE_BUILD_TYPE} = release ]]; then |
| 273 |
+ find po -type f -name "*po" -and -name "libkworkspace*" -delete || die |
| 274 |
+ fi |
| 275 |
+ |
| 276 |
+ # TODO: try to get a build switch upstreamed |
| 277 |
+ if ! use screencast; then |
| 278 |
+ sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die |
| 279 |
+ fi |
| 280 |
+ |
| 281 |
+ # KDE-bug: 433730 |
| 282 |
+ use calculator || |
| 283 |
+ cmake_run_in runners cmake_comment_add_subdirectory calculator |
| 284 |
+} |
| 285 |
+ |
| 286 |
+src_configure() { |
| 287 |
+ local mycmakeargs=( |
| 288 |
+ -DBUILD_xembed-sni-proxy=OFF |
| 289 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON |
| 290 |
+ $(cmake_use_find_package appstream AppStreamQt) |
| 291 |
+ $(cmake_use_find_package calendar KF5Holidays) |
| 292 |
+ $(cmake_use_find_package fontconfig Fontconfig) |
| 293 |
+ $(cmake_use_find_package geolocation KF5NetworkManagerQt) |
| 294 |
+ $(cmake_use_find_package semantic-desktop KF5Baloo) |
| 295 |
+ $(cmake_use_find_package telemetry KUserFeedback) |
| 296 |
+ ) |
| 297 |
+ |
| 298 |
+ use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) ) |
| 299 |
+ |
| 300 |
+ ecm_src_configure |
| 301 |
+} |
| 302 |
+ |
| 303 |
+src_install() { |
| 304 |
+ ecm_src_install |
| 305 |
+ |
| 306 |
+ # default startup and shutdown scripts |
| 307 |
+ insinto /etc/xdg/plasma-workspace/env |
| 308 |
+ doins "${FILESDIR}"/10-agent-startup.sh |
| 309 |
+ |
| 310 |
+ insinto /etc/xdg/plasma-workspace/shutdown |
| 311 |
+ doins "${FILESDIR}"/10-agent-shutdown.sh |
| 312 |
+ fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh |
| 313 |
+} |
| 314 |
+ |
| 315 |
+pkg_postinst () { |
| 316 |
+ ecm_pkg_postinst |
| 317 |
+ |
| 318 |
+ elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," |
| 319 |
+ elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh" |
| 320 |
+ elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh" |
| 321 |
+} |
Archives