Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 Oct 2019 17:12:25 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r514822 - in head/x11/plasma5-plasma-workspace: . files
Message-ID:  <201910191712.x9JHCPSk017812@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Sat Oct 19 17:12:25 2019
New Revision: 514822
URL: https://svnweb.freebsd.org/changeset/ports/514822

Log:
  x11/plasma5-plasma-workspace: setup XDG_CONFIG_DIRS on startup if not set
  
  In prior versions of KDE's Plasma Desktop we set XDG_CONFIG_DIRS in the startkde
  shellscript. Plasma 5.17 changed to a binary for this process and that variable
  therefore was no longer set for most people (unless manually done so in their
  environment / .xinitrc file, like me...).
  
  With this patch the variable is now again setup, startplasma should be able to
  bring up the whole shell again.
  
  PR:		241341
  Reported by:	Martin Birgmeier

Added:
  head/x11/plasma5-plasma-workspace/files/patch-setup_xdg_environment   (contents, props changed)
Modified:
  head/x11/plasma5-plasma-workspace/Makefile

Modified: head/x11/plasma5-plasma-workspace/Makefile
==============================================================================
--- head/x11/plasma5-plasma-workspace/Makefile	Sat Oct 19 15:59:07 2019	(r514821)
+++ head/x11/plasma5-plasma-workspace/Makefile	Sat Oct 19 17:12:25 2019	(r514822)
@@ -2,6 +2,7 @@
 
 PORTNAME=	plasma-workspace
 DISTVERSION=	${KDE_PLASMA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde kde-plasma
 
 MAINTAINER=	kde@FreeBSD.org

Added: head/x11/plasma5-plasma-workspace/files/patch-setup_xdg_environment
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/plasma5-plasma-workspace/files/patch-setup_xdg_environment	Sat Oct 19 17:12:25 2019	(r514822)
@@ -0,0 +1,23 @@
+--- startkde/startplasma.cpp.orig	2019-10-19 18:43:24.172713000 +0200
++++ startkde/startplasma.cpp	2019-10-19 18:45:50.953945000 +0200
+@@ -192,6 +192,10 @@
+     if (!qEnvironmentVariableIsSet("XDG_DATA_DIRS")) {
+         qputenv("XDG_DATA_DIRS", KDE_INSTALL_FULL_DATAROOTDIR ":/usr/share:/usr/local/share");
+     }
++   // Additionally also set default value for XDG_CONFIG_DIRS which is not set by default on FreeBSD.
++   if (!qEnvironmentVariableIsSet("XDG_CONFIG_DIRS")) {
++        qputenv("XDG_CONFIG_DIRS", KDE_INSTALL_FULL_CONFDIR ":/etc/xdg:/usr/local/etc/xdg");
++   }
+ }
+ 
+ 
+--- startkde/config-startplasma.h.cmake.orig	2019-10-19 18:56:51.844465000 +0200
++++ startkde/config-startplasma.h.cmake	2019-10-19 18:57:22.843807000 +0200
+@@ -3,6 +3,7 @@
+ 
+ #define CMAKE_INSTALL_FULL_BINDIR "@CMAKE_INSTALL_FULL_BINDIR@"
+ #define KDE_INSTALL_FULL_DATAROOTDIR "@KDE_INSTALL_FULL_DATAROOTDIR@"
++#define KDE_INSTALL_FULL_CONFDIR "@KDE_INSTALL_FULL_CONFDIR@"
+ #define CMAKE_INSTALL_FULL_LIBEXECDIR "@CMAKE_INSTALL_FULL_LIBEXECDIR@"
+ #define CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "@CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@"
+ #define KWIN_WAYLAND_BIN_PATH "@KWIN_WAYLAND_BIN_PATH@"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910191712.x9JHCPSk017812>