Date: Sun, 3 Dec 2023 21:22:06 +0100 From: "Tobias C. Berner" <tcberner@gmail.com> To: Jan Beich <jbeich@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 70aa9c66be33 - main - x11/plasma6-plasma-workspace: unbreak Wayland similar to f06a1b44e85b Message-ID: <CAOshKtdfEop-0Dh0vX3AT1_%2BcwaADBS4nh892wXv8Edt1U=8OQ@mail.gmail.com> In-Reply-To: <202312032020.3B3KKp6H084168@gitrepo.freebsd.org> References: <202312032020.3B3KKp6H084168@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Thanks! mfg Tobias On Sun, 3 Dec 2023 at 21:20, Jan Beich <jbeich@freebsd.org> wrote: > > The branch main has been updated by jbeich: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=70aa9c66be33b415b141d1a67e37543fd36471ba > > commit 70aa9c66be33b415b141d1a67e37543fd36471ba > Author: Jan Beich <jbeich@FreeBSD.org> > AuthorDate: 2023-12-03 20:00:33 +0000 > Commit: Jan Beich <jbeich@FreeBSD.org> > 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 <bsd.port.mk> > 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOshKtdfEop-0Dh0vX3AT1_%2BcwaADBS4nh892wXv8Edt1U=8OQ>