From nobody Sat Aug 19 00:51:21 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSKtf0wwzz4g0DK; Sat, 19 Aug 2023 00:51:22 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSKtd4sc2z3HC5; Sat, 19 Aug 2023 00:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692406281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A5GjiyGT6mkAU5i49QWDEmqB9gQXpMMCQpxB6e1mYwA=; b=vePqLU1ntWBHVh5IuFnzuGbGwfaW051t50LpKAXL46EjH1D07uSiJLFULY5Lxn3bLBUAQj EiWvB+iE8v/l62poz7ex3KHzH3XIBgW89xrClu4/pjubBkhIIGUv+IWl2btSusNSOM8DkY xG+yjORyZ240m+NELcO3sn28i1Pwb1o7xZs03PKelZXLme6GX8BoNvA8Ux4Fc/JDX8Tpy8 5Zu031rbweQA7S2hORdvE0OHn34frQBsZ8DRtRXJX7ezgRkqoyRXuMmuOSI7oC/5L8KF4l ZK2RPNWEWEr4HFuk0FSlECJ2Ht3uVx1gZ+aRozhKDdLOPd03s2RNxXOQ8jSPdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692406281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A5GjiyGT6mkAU5i49QWDEmqB9gQXpMMCQpxB6e1mYwA=; b=xDCHcGeE501YXHg2jk7L/y/dNBU2zGuE6sew4rM+x7Cmedg0/M7y/Axgwog5tC5n6njZNx UFtPxAWao2z/Akp5qrmljfLaBZBAK0k7fNjugFhNYCsDtpSiem0F/sT00VXMT1O66rGXYO r4FyDk53EBjwl9Alhn5YyGq41073tugd3UHL6rWnJshKBkIPkQPFrNWcL0BuUmNKsHGRhr JeTKY2CycyQAC0x4eyi5K6Eifdq5T1v50ccUbJ31TX2UbmuSk0kmpPpZZCaXy9HK3rSeRt c7r2NVJWGGxgRbZyf1WG3QdwhFfO80jZgxqOlj80WRQzllc6T8sKsLnEf8N+QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692406281; a=rsa-sha256; cv=none; b=vUXRhkgi1+l3qKZn/QMOo6taGU9TPRE+uqrI0xi8JCET5TacooxGXhQYNHaXrRFWNQtwjH 3t+c4HgLVzT9cy5+hIAETdVbkTErA/RNhg6343fn5zU3LSQAEi7IcbrhW85pxFCm0pyFIf Bhj1kc6pzVU9FCzMxStNvbSDEo7OhGevVA4m0y5Xr5MF9wJZFYE9QOG6yX2lOtdIEWui+6 RQorYLvW/bGB0NROnPEvyJo6905PD8QnE1HZj5HoEU25xQl2taVC/R0/3q3Q19Ky5aKtQN mCSFzqxj1bHjjqcWk/bEAR7DNyKGCVlU9BdTS9t4Hspszt4DSkDa/pU5j6W+TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSKtd3xwkzcr5; Sat, 19 Aug 2023 00:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37J0pLc3077064; Sat, 19 Aug 2023 00:51:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J0pLNK077061; Sat, 19 Aug 2023 00:51:21 GMT (envelope-from git) Date: Sat, 19 Aug 2023 00:51:21 GMT Message-Id: <202308190051.37J0pLNK077061@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: f06a1b44e85b - main - x11/plasma5-plasma-workspace: Fix XDG_CONFIG_DIRS for Wayland List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f06a1b44e85b9788c0e1ed718eca4146f102057f Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f06a1b44e85b9788c0e1ed718eca4146f102057f commit f06a1b44e85b9788c0e1ed718eca4146f102057f Author: Jessica Clarke AuthorDate: 2022-11-19 02:36:07 +0000 Commit: Jan Beich CommitDate: 2023-08-19 00:49:20 +0000 x11/plasma5-plasma-workspace: Fix XDG_CONFIG_DIRS for Wayland Since Plasma 5.22, setupPlasmaEnvironment adds to XDG_CONFIG_DIRS, with a fallback for the XDG-mandated /etc/xdg default. When using X11, this is ok, as runStartupConfig gets called before setupPlasmaEnvironment, and so the latter uses our modified value. However, when using Wayland, they are called in the opposite order, and so runStartupConfig sees the variable is already set and doesn't inject our modified default. Fix this by changing setupPlasmaEnvironment's default value instead so it's only set in one place. This approach also matches how other ports get patched for our non-conforming environment. Without this, the splash screen shows but plasmashell is never started (nor any other autostart programs), eventually timing out and fading to a black screen. PR: 265505 Obtained from: CheriBSD Approved by: maintainer timeout (3 months) --- x11/plasma5-plasma-workspace/Makefile | 6 ++++- .../files/patch-setup_xdg_environment | 28 +++++++--------------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/x11/plasma5-plasma-workspace/Makefile b/x11/plasma5-plasma-workspace/Makefile index f0d6fb6851ec..ec8d942be7a4 100644 --- a/x11/plasma5-plasma-workspace/Makefile +++ b/x11/plasma5-plasma-workspace/Makefile @@ -1,6 +1,6 @@ PORTNAME= plasma-workspace DISTVERSION= ${KDE_PLASMA_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde kde-plasma MAINTAINER= kde@FreeBSD.org @@ -60,6 +60,10 @@ CMAKE_OFF= BUILD_TESTING # In 5.15 a file was moved from x11/plasma5-plasma-desktop to x11/plasma5-plasma-workspace: CONFLICTS_INSTALL= plasma5-plasma-desktop-5.14.* +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/startkde/startplasma.cpp + post-stage: ${INSTALL_SCRIPT} ${FILESDIR}/startplasma-wayland.sh ${STAGEDIR}/${LOCALBASE}/bin/ diff --git a/x11/plasma5-plasma-workspace/files/patch-setup_xdg_environment b/x11/plasma5-plasma-workspace/files/patch-setup_xdg_environment index 29f094a1ef93..9b580910b77a 100644 --- a/x11/plasma5-plasma-workspace/files/patch-setup_xdg_environment +++ b/x11/plasma5-plasma-workspace/files/patch-setup_xdg_environment @@ -1,23 +1,11 @@ --- 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"); +@@ -362,6 +362,6 @@ + // 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"; } -+ // 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@" + const auto extraConfigDir = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation).toUtf8() + "/kdedefaults"; + QDir().mkpath(QString::fromUtf8(extraConfigDir));