commit: 7fa1535890705d086ff7a6934a51fdba681dcb39
Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Thu Mar 5 00:33:35 2026 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 5 22:01:05 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fa15358
kde-plasma/plasma-workspace: fix setting SSH_AUTH_SOCK
The previous script didn't account for non-standard socket locations
when the GNUPGHOME environment variable is set. Guarantee that the
right socket path is used by querying gpgconf. This option was first
introduced with version 2.1.14 in upstream commit 7732b3328 ("gpgconf:
Enhance --list-dirs.").
See-also: https://www.gnupg.org/documentation/manuals/gnupg/Agent-Examples.html
Closes: https://bugs.gentoo.org/970911
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/217
Merges: https://codeberg.org/gentoo/gentoo/pulls/217
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../plasma-workspace/files/10-agent-startup.sh | 7 ++-----
...2-r1.ebuild => plasma-workspace-6.5.5-r2.ebuild} | 21 +++++++++------------
...2-r1.ebuild => plasma-workspace-6.6.2-r2.ebuild} | 0
3 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/kde-plasma/plasma-workspace/files/10-agent-startup.sh
b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
index 104822c2407d..0cbe0e187e47 100644
--- a/kde-plasma/plasma-workspace/files/10-agent-startup.sh
+++ b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
@@ -40,11 +40,8 @@ if [ "${SSH_AGENT}" = true ]; then
eval "$(/usr/bin/ssh-agent -s)"
fi
elif [ "${SSH_AGENT}" = gpg ] && [ "${GPG_AGENT}" = true ]; then
- if [ -e /run/user/$(id -ru)/gnupg/S.gpg-agent.ssh ]; then
- export SSH_AUTH_SOCK=/run/user/$(id -ru)/gnupg/S.gpg-agent.ssh
- elif [ -e "${HOME}/.gnupg/S.gpg-agent.ssh" ]; then
- export SSH_AUTH_SOCK=${HOME}/.gnupg/S.gpg-agent.ssh
- fi
+ unset SSH_AGENT_PID
+ export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
fi
# Uncomment the following lines to start rxvt-unicode which has the ability to
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.6.2-r1.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-6.5.5-r2.ebuild
similarity index 93%
copy from kde-plasma/plasma-workspace/plasma-workspace-6.6.2-r1.ebuild
copy to kde-plasma/plasma-workspace/plasma-workspace-6.5.5-r2.ebuild
index 12d0a6aca5e9..15e274db015d 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-6.6.2-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-6.5.5-r2.ebuild
@@ -10,6 +10,7 @@ QTMIN=6.10.1
inherit ecm plasma.kde.org xdg
DESCRIPTION="KDE Plasma workspace"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/kde/${P}-patchset.tar.xz";
LICENSE="GPL-2" # TODO: CHECK
SLOT="6"
@@ -52,7 +53,7 @@ COMMON_DEPEND="
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kiconthemes-${KFMIN}:6
>=kde-frameworks/kidletime-${KFMIN}:6
- >=kde-frameworks/kio-6.22.1:6
+ >=kde-frameworks/kio-${KFMIN}:6
>=kde-frameworks/kitemmodels-${KFMIN}:6
>=kde-frameworks/kitemviews-${KFMIN}:6
>=kde-frameworks/kjobwidgets-${KFMIN}:6
@@ -79,9 +80,10 @@ COMMON_DEPEND="
>=kde-plasma/kwin-${KDE_CATV}:6
>=kde-plasma/layer-shell-qt-${KDE_CATV}:6
>=kde-plasma/libkscreen-${KDE_CATV}:6
- >=kde-plasma/libplasma-${KDE_CATV}:6=
+ >=kde-plasma/libplasma-${KDE_CATV}:6
>=kde-plasma/plasma-activities-${KDE_CATV}:6=
>=kde-plasma/plasma-activities-stats-${KDE_CATV}:6
+ >=kde-plasma/plasma5support-${KDE_CATV}:6
media-libs/libcanberra
sci-libs/libqalculate:=
sys-apps/dbus
@@ -109,7 +111,6 @@ COMMON_DEPEND="
x11-libs/xcb-util
fontconfig? (
media-libs/fontconfig
- media-libs/freetype
x11-libs/libXft
x11-libs/xcb-util-image
)
@@ -140,6 +141,7 @@ RDEPEND="${COMMON_DEPEND}
>=kde-plasma/kdesu-gui-${KDE_CATV}:*
>=kde-plasma/milou-${KDE_CATV}:6
>=kde-plasma/plasma-integration-${KDE_CATV}:6
+ >=kde-plasma/plasma-login-sessions-${KDE_CATV}:6
sys-apps/dbus
x11-apps/xmessage
x11-apps/xprop
@@ -157,16 +159,10 @@ BDEPEND="
X? ( x11-misc/xdotool )
)
"
-PDEPEND="
- >=kde-plasma/plasma-login-sessions-${KDE_CATV}:6
-"
PATCHES=(
"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream:
KDE-bug 432975, bug 767478
-
"${FILESDIR}/0001-applets-notifications-Fix-display-of-total-or-proces.patch"
-
"${FILESDIR}/0002-shell-restore-early-destroyed-guard-for-panel-contai.patch"
-
"${FILESDIR}/0003-shellcorona-use-QPointer-for-m_waitingPanels-to-futu.patch"
-
"${FILESDIR}/0004-shell-Generate-plasma-shell-Wayland-interface-for-th.patch"
+ "${WORKDIR}/${P}-patchset"
)
src_prepare() {
@@ -174,6 +170,9 @@ src_prepare() {
cmake_comment_add_subdirectory login-sessions
+ sed -e "s/^find_package.*Phonon4Qt6/#&/" -i CMakeLists.txt || die
+ cmake_comment_add_subdirectory phonon # gone in >=6.6
+
if ! use policykit; then
cmake_comment_add_subdirectory -f kcms users
fi
@@ -192,13 +191,11 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DWITH_X11=$(usex X) # remember to submit patches with bugs
- -DWITH_X11_SESSION=$(usex X)
-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged
-DGLIBC_LOCALE_GEN=OFF
-DGLIBC_LOCALE_PREGENERATED=$(usex elibc_glibc)
$(cmake_use_find_package appstream AppStreamQt)
$(cmake_use_find_package fontconfig Fontconfig)
- $(cmake_use_find_package fontconfig Freetype)
$(cmake_use_find_package ksysguard KSysGuard)
$(cmake_use_find_package networkmanager KF6NetworkManagerQt)
-DBUILD_CAMERAINDICATOR=$(usex screencast)
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.6.2-r1.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-6.6.2-r2.ebuild
similarity index 100%
rename from kde-plasma/plasma-workspace/plasma-workspace-6.6.2-r1.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-6.6.2-r2.ebuild
