x11/plasma6-plasma-workspace: unbreak Wayland similar to f06a1b4

freebsd · Dec 3, 2023 · 70aa9c6 · 70aa9c6
1 parent 534baaf
commit 70aa9c6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/x11/plasma6-plasma-workspace/Makefile b/x11/plasma6-plasma-workspace/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	plasma-workspace
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-plasma
 
 COMMENT=	KDE Plasma Workspace
@@ -39,4 +40,8 @@ USE_KDE=	activities activities-stats archive attica5 auth baloo5 \
 USE_QT=		5compat base declarative phonon4 svg wayland
 USE_XORG=	ice sm x11 xau xcb xcursor xext xfixes xft xi xrender xtst
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${PATCH_WRKSRC}/startkde/startplasma.cpp
+
 .include <bsd.port.mk>
diff --git a/x11/plasma6-plasma-workspace/files/patch-setup_xdg_environment b/x11/plasma6-plasma-workspace/files/patch-setup_xdg_environment
@@ -0,0 +1,11 @@
+--- startkde/startplasma.cpp.orig	2023-11-29 10:44:01 UTC
++++ startkde/startplasma.cpp
+@@ -341,7 +341,7 @@ void setupPlasmaEnvironment()
+     // Add kdedefaults dir to allow config defaults overriding from a writable location
+     QByteArray currentConfigDirs = qgetenv("XDG_CONFIG_DIRS");
+     if (currentConfigDirs.isEmpty()) {
+-        currentConfigDirs = "/etc/xdg";
++        currentConfigDirs = "%%LOCALBASE%%/etc/xdg:/etc/xdg";
+     }
+     const QString extraConfigDir = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1String("/kdedefaults");
+     QDir().mkpath(extraConfigDir);