From nobody Sun Dec 3 20:22:06 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 4Sjyrq0Hmgz53Jsq; Sun, 3 Dec 2023 20:22:19 +0000 (UTC) (envelope-from tcberner@gmail.com) Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sjyrp5XXtz3ZJy; Sun, 3 Dec 2023 20:22:18 +0000 (UTC) (envelope-from tcberner@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qt1-x82f.google.com with SMTP id d75a77b69052e-42548f6c565so13431701cf.2; Sun, 03 Dec 2023 12:22:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701634938; x=1702239738; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=wmICj1IBfgScMryu2dsysbcYygsr7uhOUTC9MGtzi1o=; b=asAy1ZzrLstuKCGgTIy2mLW80BPtPd12WeYHPFSyOZtRC166N4U5vevd+W02v6JWUf UX5wWYCB1AUyn8cL/0tscMUine+kwE3Um7mwxU2hbNPxDL6CtGmkDLiG2555R6CjsF6y RqoR34t5ySlWp2dQxPH1h4GSsImMfLAqvYjCdDgsH9BX/0bkJzFVzyB1bEuTllmc1xKA mcMLCLMOu8O6124qpMPKPLBzJ2HCbVAp4FbT4WFkfcEKVOyOH6G/SDNF/cEMCOnvHc/H l1cv6KDqGAdrtX/IAwvFbKJGjoLaIksa/lVKgTdmeESoG0+XQ7GkWBxYeoaoyNqa972F sNOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701634938; x=1702239738; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wmICj1IBfgScMryu2dsysbcYygsr7uhOUTC9MGtzi1o=; b=ThWAv+sZz2iTAZQBuVQ3P+NmE7SJXZgkhs4202BIb1Y6JprbKlSHYRO1d2P9NVlttb 6mEKHCKbt+vG/o0V1cCH8MImYMyP8H4XvWhvRqvsUka8VxihgpWnO/Q6Cek2I05F4vat JGjiGCvL21QC4VG5/+OtlNNZgP5y1P5zbx3RQmu5l56Jg5R3r+oE4c2cE5bN+RndmTUd f/EVYtFa+QaNz2QGIqEOAJIA+RdqthkTsOxzf3f7iqe58EhS5iWRomr8z44W4lLD/mQZ oUKyDImGldmQrbWSBNZY9sIuBRoujrLQtilAaS1ceGF6+1OAKxsPtykNVuZ8ehZosrPn 6B5A== X-Gm-Message-State: AOJu0YycJpnQZV+DtmfYwHf08A1rCBpSu0/PjWrOG9CeFd9+dbBjVF6x aIC8s64GzJa4gwTUK+Zg4lMcvHSrf5k34yfKgNo2G1uzmMM= X-Google-Smtp-Source: AGHT+IGHyYWwooynW2pDvHPLb2+fejLcyc8sXvG59UMxNILS/msLvj2uBKsQWoyzbmwwLlSL4La2x4mPOLWDVhpz9YI= X-Received: by 2002:ac8:5988:0:b0:425:4043:96d1 with SMTP id e8-20020ac85988000000b00425404396d1mr5383231qte.94.1701634937776; Sun, 03 Dec 2023 12:22:17 -0800 (PST) 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 References: <202312032020.3B3KKp6H084168@gitrepo.freebsd.org> In-Reply-To: <202312032020.3B3KKp6H084168@gitrepo.freebsd.org> From: "Tobias C. Berner" Date: Sun, 3 Dec 2023 21:22:06 +0100 Message-ID: Subject: Re: git: 70aa9c66be33 - main - x11/plasma6-plasma-workspace: unbreak Wayland similar to f06a1b44e85b To: Jan Beich Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4Sjyrp5XXtz3ZJy Thanks! mfg Tobias On Sun, 3 Dec 2023 at 21:20, Jan Beich wrote: > > 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);