From nobody Tue Aug 20 00:20:57 2024 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 4Wnqr94287z5TpmW; Tue, 20 Aug 2024 00:20:57 +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 4Wnqr92j5mz55Qy; Tue, 20 Aug 2024 00:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724113257; 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=NnkKhcBcl66WUgDNqQ4+quXPL6b0jR9lNYE79airz4I=; b=iY3l+stefuEYt7S6JvJ7rnJKC0kOiE19TSYqSTooZxSWxEXhHaOLywf7rwhXpeGLH9OZ4F GuSd1nbtq5pGnk2W6GftNudnQFj2HfeWChjToInKz+TnEF4c7OmVUg1+bW1ZZt7VOjlvLG HNI7rhOhh9C5pDbDBFrRGf/rfQA0gan1+SdENkDQdP6sP0XGZKA7U4MkxUdtV6KvPtud+C Gr5HrEm+sb/ohDiNENmEt9B2jVbiuO4v+ZDJOmvRPW+Lm+LrL7AVuEC2OvF190M2W+53zC JnqOepiU2rINlUNSI4R2VTs/RkuoAcp0lso85pxQNOhov+w9E/HtBsiSDVQpmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724113257; a=rsa-sha256; cv=none; b=o5KshuhzaLniX1ic7rj4EYpqK6a7MUMjGabOCpT9pq3w0/3QViYVIQKMIoooMRZOfd1Yws G6cXWfF6+UmFzRenjr2P//EK0PX/4DItnUQM8dW5256OWXOI+MAeoQtmdxDa1FFOWVS1uR 3WohA1LILEqaQiYbOnh93zZldLp0NKLDT2835+Kcdt+SYk/QXNrYC4vwF6mPv+sQnaNyzi 3m25tGfIP//vRz7JaSFWFP9jwEkEiujssagvoXGqkMljwJobAsUAo4T7UHdniwmdp54Laz gzjpkBJNyAnZC/BWEMfl/QF1a0/5XkXtB2SF+jhhP2TL79XJeFJID96GeGrp2g== 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=1724113257; 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=NnkKhcBcl66WUgDNqQ4+quXPL6b0jR9lNYE79airz4I=; b=nnDim6uj5y9HxUrt6BKGvKVqUzTGJfs1LVTmgoBebfy9E2wiMlP97OlmeuXEfI+1mWp/3B 4WoTlITIxbLDPhVq8e3YNY8cgVcqwOE/cNl9Z7yypvOOrXjUGStDaihBD1wGbM+RvbTtPf y9RlK9+1giwoKCkVMiVzCuZhq0ciNBe9cJIh2X25M6hufZ04YjPawEIHDTj2FnuU5CsBJB OHUk1x9fS6ox0yp01ItnfKSlupIPSgpZS+HYEKlezjJ6u2NOGYT8oX2IgsfFifruFCYqX2 h+VnKFU115IaqeopXfEEby8j3v4FTaMN1KmG+G0UXWm7SNtSq/WH03VMHsVIyg== 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 4Wnqr92JbfzdlZ; Tue, 20 Aug 2024 00:20:57 +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 47K0KvmU089551; Tue, 20 Aug 2024 00:20:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47K0KvHU089548; Tue, 20 Aug 2024 00:20:57 GMT (envelope-from git) Date: Tue, 20 Aug 2024 00:20:57 GMT Message-Id: <202408200020.47K0KvHU089548@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: 319f22ef48ad - main - x11-wm/cosmic-comp: chase config after 60a36bc91e5d 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: 319f22ef48ade3729f0c0c4228e2982cb004735e Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=319f22ef48ade3729f0c0c4228e2982cb004735e commit 319f22ef48ade3729f0c0c4228e2982cb004735e Author: Jan Beich AuthorDate: 2024-08-19 01:59:31 +0000 Commit: Jan Beich CommitDate: 2024-08-20 00:20:18 +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 --- 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}}