From owner-svn-ports-head@freebsd.org Sat Oct 19 17:12:26 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 53ADD151FB3; Sat, 19 Oct 2019 17:12:26 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46wTwp1bYKz4RMx; Sat, 19 Oct 2019 17:12:26 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0132C259D8; Sat, 19 Oct 2019 17:12:26 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9JHCPgF017815; Sat, 19 Oct 2019 17:12:25 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9JHCPSk017812; Sat, 19 Oct 2019 17:12:25 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201910191712.x9JHCPSk017812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 19 Oct 2019 17:12:25 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/x11/plasma5-plasma-workspace: . files X-SVN-Commit-Revision: 514822 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Oct 2019 17:12:26 -0000 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@"