From nobody Tue Aug 20 00:21:11 2024 X-Original-To: dev-commits-ports-branches@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 4WnqrS2zWfz5Tpmf; Tue, 20 Aug 2024 00:21:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WnqrS0vjcz55Xm; Tue, 20 Aug 2024 00:21:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724113272; 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=YpxCfcNZKp0e3LFx4IRRm8V54EfbXHR9B8zvpX+67Y0=; b=eWWPCLPTWFtcRjM8Io7V+nTNbeAZ+1fHz1FnFnIVYmEMBjBw//M0muz96tFMc0nIJJCHIS ALrFv3zgHN1dBvCLn7EqmQ9LIP2qMU2Yw1wcJzsC1N+kxLZ1LH1pIZgmggc+L/+gc5kUY3 sMzb3HtwfaRSvl1P3oZhNAe55kmo2ATSy7GwdE+hUpVOBYQuECO6v9PcENQBxXJJefLF4p 7RnZZVUO67mF9i7aZFtSvMSmE25+zvt7mf5MNwYsmjv4iq4xnG7jN0FHSANiqery8uEwWD 8U785kxOM+G0zFlkYfCD9OWakNvfSGbeGUxQmF2pI75clgt18aYFM5ly7uJXyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724113272; a=rsa-sha256; cv=none; b=Cb8k/PZGp3TMoOFdN1xSQqBykyzSAhsJ772sBY7VBmib/w7J+8r5GdFqvUGz0n1sO8YN4e N+lxkB9YAygA0CEZXkvxgUvNYeKd3MepwLv24CZBHWJEMm7iH7IcSwP9/mWHGiXDHaVYuy TO+p1FK5jAqqz13u665vnAw0RRDRsqZoiWSzG4EE72R5PUCy7dwgxVnhLr9u/aE5OUUHeG ESfGU6tNYIv/BI+InDSIg6TyzK4YPUdfv2xjBtJbNSoHlKdN9/kQHwbr1RZwxJgD+UsATU qSIcJjUgdGgRjOlaYN7KVLoWz1QxvCPJz1XAT3/gs6xzo0G0O+7TYcXpLSC9sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724113272; 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=YpxCfcNZKp0e3LFx4IRRm8V54EfbXHR9B8zvpX+67Y0=; b=TR1pRHsHhvbz/mfVSfYYg3frXkYBHCySol9a7cxW9xpe8S1y2g1Opx0gnC9ptq4R56/nDV XXSdSHWBn1Alfcwr+3bG1JQeQ8fB1kTsqdaO1o10aQPXSR+5KHeiKL4YjVyPytYAZZqgci frEkT29SUH3jt7c1kZ6Z0PfEYfIBGjh92Lw+DREJJw5d0idOuR+i500oSym3CKtEGPCqH7 cjH6ulrcnF2klENooctwZqMzN0tyTTqCt+IDqvNhppTJ3JW12Yy7kLtY7Pqwa+AiXbqKZl 9U61+yQz5iaMlYqBDsdZLJ2sxpgsmkAanc+AaADy/czzJE91lE/KU84gc5AqeA== 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 4WnqrR73QBzdZ4; Tue, 20 Aug 2024 00:21:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47K0LBVP089870; Tue, 20 Aug 2024 00:21:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47K0LBdc089867; Tue, 20 Aug 2024 00:21:11 GMT (envelope-from git) Date: Tue, 20 Aug 2024 00:21:11 GMT Message-Id: <202408200021.47K0LBdc089867@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: 4a08f381e990 - 2024Q3 - x11-wm/cosmic-comp: chase config after 60a36bc91e5d List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q3 X-Git-Reftype: branch X-Git-Commit: 4a08f381e990d64d27d0f03f45906f4f73ae7567 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a08f381e990d64d27d0f03f45906f4f73ae7567 commit 4a08f381e990d64d27d0f03f45906f4f73ae7567 Author: Jan Beich AuthorDate: 2024-08-19 01:59:31 +0000 Commit: Jan Beich CommitDate: 2024-08-20 00:21:04 +0000 x11-wm/cosmic-comp: chase config after 60a36bc91e5d ====> Running Q/A tests (stage-qa) Warning: Possible REINPLACE_CMD issues: - - REINPLACE_CMD ran, but did not modify file contents: src/config/mod.rs https://github.com/pop-os/cosmic-comp/commit/553c49b42b59 (cherry picked from commit 319f22ef48ade3729f0c0c4228e2982cb004735e) --- x11-wm/cosmic-comp/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile index 17119db5c0b9..85efe15bc4ac 100644 --- a/x11-wm/cosmic-comp/Makefile +++ b/x11-wm/cosmic-comp/Makefile @@ -1,5 +1,6 @@ PORTNAME= cosmic-comp PORTVERSION= s20240726 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -26,6 +27,7 @@ GH_TAGNAME= fdde46f GH_TUPLE= pop-os:iced:0.4.2-2010-gfa817c70:iced/../${WRKSRC_crate_iced:T}/iced CARGO_FEATURES= --no-default-features # disable systemd PLIST_FILES= bin/${PORTNAME} \ + share/cosmic/com.system76.CosmicSettings.Shortcuts/v1/defaults/keybindings.ron \ share/wayland-sessions/${PORTNAME:S/-comp//}.desktop \ .if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH:Marmv?} @@ -41,9 +43,6 @@ post-patch: # XXX Drop [patch.] section to help "make cargo-configure" @${REINPLACE_CMD} -e '/\[patch/,$$d' \ ${WRKSRC}/Cargo.toml -# Respect PREFIX for system-wide config - @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \ - ${WRKSRC}/src/config/mod.rs # /sys by default is a symlink to /usr/src/sys @${REINPLACE_CMD} -e 's,/sys,${LINUXBASE}&,' \ ${WRKSRC}/src/debug.rs @@ -51,7 +50,7 @@ post-patch: post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} # Install extras similar to ${WRKSRC}/Makefile -.for f in data/*.desktop +.for f in data/*.desktop data/*.ron ${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.${f:E}:H} ${INSTALL_DATA} ${WRKSRC}/${f} \ ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.${f:E}}