From nobody Sun Dec 03 20:20:51 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 4Sjyq73tRNz53Jh3; Sun, 3 Dec 2023 20:20:51 +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 4Sjyq73PVrz3Z1p; Sun, 3 Dec 2023 20:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701634851; 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=iqNov0eywudqXPNUQoGeIHMp6sX/7guJbcXbAgSnsCo=; b=N2GeXxsKWDa84k4PFkTiFaX/0t6JCSVKnz+q+jW4SRM/s7qNTQj0XrSPLynctEgCEbXQk6 wLldX5FjrfsbSyxMauR0EEnP6OafuzG5P8ejOB+k3OKQktY558HhFNaKQHzwXRk4WZbEv8 hsfyoZ0fXsWmOjn4iVLLQf007Cdki0EeBus1jsGmAs5K+WiO+c4/VUNzeKXdqC/emhjqrq 4gY6NTWSkoY3llhCRz+qzDBLX31KkZpIXNKBJpeb0tiw0pQ9HgjdaLbiSZ4ZUz/Zg64VQw 0KFKO1PEQGoN30nNNxMORyg4lOPTPvwdefTH7/oPFBXuUuDzAyik4Ml1JJtQCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701634851; 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=iqNov0eywudqXPNUQoGeIHMp6sX/7guJbcXbAgSnsCo=; b=MgKUBn6AtX8moa9l9TMEQOppR5R06R+km75NDc2x+vL4Fw10Ium/MqOLxgdKg3ZEEH/0js iHuoLXU1hou6rhosaCCVgs9EInuRzDCTLNW51MNYYjp/cNbuhUc3lAdj7pOo1Z51fcJd0M AAHrWwINVYJJ9UXZhdlk3mDDxmb0uQ17sIO1eShELtFhlfeGYcw1e5dQ+xaW9SQ9Gji+uY c38cal1l3otBXECYT4kGout499874iudpmb8SXsca0FUiHHjJSNCsG/15XjT+qKaUMJ7wz LoqxZdjjDqXXmlcauYH38dhynFMmnMnLdU+OulIWb15lFg2nxj3xA5bytAWYLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701634851; a=rsa-sha256; cv=none; b=lqd2cTPyTgU2AcTwYQ1Yekbg0D0CWdqxSQbpcHGhS8USfndsamVqcFhSc66KR2hGsI3ej4 Wb/57kXV2Ptj9LdLnX61Q13AkiFh4V2+vFY4/WZ0G053JC4GGEPIx2+d1z3NcLb4yQ8lvU pY+7yGKCITbDRF1KkJmnNtdq9G98UGa0IdhKDG55KnKwCS1/DTz19IHCz1ma6Z+rZp+h93 r95syrTiRiH8l/JZT4ahC7XIvrtFi0n2KJHxz8tM5wNZrtQR/g9h6i0DOvLKx1sk4n2LQc up/2/QPU8oIZI5QNVWA2q2Uz5KJqYsQ6O/1vDlo1GooZe2EDiFRxk49hIjD0vg== 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 4Sjyq72STTz1CPB; Sun, 3 Dec 2023 20:20:51 +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 3B3KKp7X084171; Sun, 3 Dec 2023 20:20:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B3KKp6H084168; Sun, 3 Dec 2023 20:20:51 GMT (envelope-from git) Date: Sun, 3 Dec 2023 20:20:51 GMT Message-Id: <202312032020.3B3KKp6H084168@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: 70aa9c66be33 - main - x11/plasma6-plasma-workspace: unbreak Wayland similar to f06a1b44e85b 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/main X-Git-Reftype: branch X-Git-Commit: 70aa9c66be33b415b141d1a67e37543fd36471ba Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=70aa9c66be33b415b141d1a67e37543fd36471ba commit 70aa9c66be33b415b141d1a67e37543fd36471ba Author: Jan Beich AuthorDate: 2023-12-03 20:00:33 +0000 Commit: Jan Beich CommitDate: 2023-12-03 20:20:21 +0000 x11/plasma6-plasma-workspace: unbreak Wayland similar to f06a1b44e85b --- x11/plasma6-plasma-workspace/Makefile | 5 +++++ .../files/patch-setup_xdg_environment | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/x11/plasma6-plasma-workspace/Makefile b/x11/plasma6-plasma-workspace/Makefile index b92d3f17947c..1872ec3569cd 100644 --- 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 diff --git a/x11/plasma6-plasma-workspace/files/patch-setup_xdg_environment b/x11/plasma6-plasma-workspace/files/patch-setup_xdg_environment new file mode 100644 index 000000000000..b6aba665507f --- /dev/null +++ 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);