From nobody Sat Aug 19 00:51:47 2023 X-Original-To: dev-commits-ports-all@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 4RSKv760mhz4fylg; Sat, 19 Aug 2023 00:51:47 +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 4RSKv759PPz3HZ2; Sat, 19 Aug 2023 00:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692406307; 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=435BPo2WTHoXKNuHInhU//6T79+7NI9NE439Kzk3bxE=; b=nSLHvyTbgWh8UGyCqdIsa6RVTCnjsQQYc21SYO3iDMbOvo+jSTAIljd/fcs3LIQpliKB3L 71tJw1zLe9zihH4tZWD1DRENlb+gcxpTC6nCyg3+AmmElO7Hni48ZSAatxOCLlhdWV2UxO G78rB8utLFzBF7H44XlBkIEJOZsgXiKh5KE4IZYQMhBt1fe437ehGkNHSsstRWOzehS9Qb IUa5Mu5hRVZajAfrYu4HCAeLpBuX1ugMq48AoU4ixSfgiIRqxMyP10ALzODjvckfGfdiLE Ad/4+4Zt3WhBD/6aDu91qV+ne3GAi7vvqYF4OSvUdct/4VfnS7XyrxXCYZxpWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692406307; 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=435BPo2WTHoXKNuHInhU//6T79+7NI9NE439Kzk3bxE=; b=SXewCjZQEdUFU5TrM5fXQRwc+TX+WOxiZyWWtD8YDSZd1EHSaE9VeLQjYoB2HVNsFRl3XD gRRdxtKxw4UmrXIPQiqHOcMXT2/7uGosU8ZPOvveS3nlw23ss/N3QW0kRnj58XvVsPY7rF yUog3x/sbeBRtY8oBL0Dk+DwgT5du+GIjQDQsWVTSxgHfSkesdtA6tEXnY/aI0ZT+foGF7 e/WKUjV3nq9CB5tEyH/b3D5ChaD18nVH65Dm81CD4+jZhtD/Zc0T6X0452WiijVO1aapAp NiwI3dEmmdZ0/OsxZZG0+vIG4V8H9/wOZRFEp3IYpqvLm8tFrN9hN5uIJzih/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692406307; a=rsa-sha256; cv=none; b=XsDzYrojTwW0SMYpp13sU126zoeighMySZb8HGIAqsR2VWHvTuda+i4c5lvuFKRERe7AIX SgrzY2PFghLxJlR+Yagj6suJtMktKJICfwJyjQuONWPLX+POK3clftGYA8MO6nh3V5SIhO iButOhbIuPCVh8fAUfdtsEi3T74G5ZWAz1HAAC5hzzNov8kEV0DITNgU0s/PePV6eMsV25 1+UitVjWzsPcztRgBXDkqZez4chi/6BWIrascclh2dv0nLPCB52smtD7+XoXeJWlYUmMDK sqQSUqw3pwmGjmoP5TDl4NEb3Hjx1FaD00HC//t5Y9Ua+hkxtHXEV9qzuB/Cqw== 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 4RSKv7434RzdhF; Sat, 19 Aug 2023 00:51:47 +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 37J0plQT077423; Sat, 19 Aug 2023 00:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J0pl5G077420; Sat, 19 Aug 2023 00:51:47 GMT (envelope-from git) Date: Sat, 19 Aug 2023 00:51:47 GMT Message-Id: <202308190051.37J0pl5G077420@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 40fe2d53bacf - 2023Q3 - x11/plasma5-plasma-workspace: Fix XDG_CONFIG_DIRS for Wayland List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q3 X-Git-Reftype: branch X-Git-Commit: 40fe2d53bacf88e2c48282e62445f15e4a3d16b7 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=40fe2d53bacf88e2c48282e62445f15e4a3d16b7 commit 40fe2d53bacf88e2c48282e62445f15e4a3d16b7 Author: Jessica Clarke AuthorDate: 2022-11-19 02:36:07 +0000 Commit: Jan Beich CommitDate: 2023-08-19 00:51:37 +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) (cherry picked from commit f06a1b44e85b9788c0e1ed718eca4146f102057f) --- 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));