From nobody Fri Feb 09 01:46:50 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 4TWGtL4CQ3z58cDF; Fri, 9 Feb 2024 01:46:50 +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 4TWGtL32rVz49Zc; Fri, 9 Feb 2024 01:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707443210; 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=9sFqPw9tQFpShFSdy+rw7cGxpEIDTqJgdzC/TNi9YVI=; b=kVJJR9Z0fSjXHhVDNe9ZkMQIvrm/7eJPf/2HTKgMO206bABPVOnslXWcuCvJoB60vhbe/L HTf+PGdpF0jBGTi+FkpuoG3jXjOtWFiaZ4b++eum7h2S0dydOCmQNjS+zC0XGG0w3BlDLY 4tcr18aJO002j+SNa27BzmTxesdY4BR/49KhQP8erEyhNLXRonkCblOAzBy3ghBEUi+IF5 FsVTnxJQsBoL9h1/zk+GHk7zEcUoqSt3sp6LDa1DSbWZyMG2V974bBVNosaejIjrNl0K3B fL8GlzUJRHg2J8Cq4WjoF1KHu2e3ktGIuhJPAIpCb2IaPCkdLSaDGfQyYS/W6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707443210; 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=9sFqPw9tQFpShFSdy+rw7cGxpEIDTqJgdzC/TNi9YVI=; b=oquxgHGbIUksYpIMd4L0CKZfs3K55aTjhN1gwxpgmJ9lA0uuVhuSVYvqS6kh7Mq9eFv8z1 WBrKqaQL4eV6kocjz5FlAf5RrV+Bx0wWn1tb62lv/eL+90gjelPC9cxVF0NBuvNRxOGKR6 Mqji4iyW2YkyblBmH3DwfW1sBdiNhaDsHLqh1bioDzjv8si3FBlkF29vVAr5b/p77nqEAu iTv7cZJg6AmZFjENG2iII5eulEjXJ8D3PbA6aEMIFdSn8GF2Pz5z1xELh3yVtBjLr1wMFu 0HEorkRO2j4jzxeWYe/2wW3PlOkm6qsMZrl3+R1WPdaAE3qDkWbjDOmzhiXDlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707443210; a=rsa-sha256; cv=none; b=OLVU56PmIiPu8KPd6ktdCqmLOVvdWmTqwCRR78VK0gf+0BcC7bmSE4zeCQ0IAVUBDO1AcO LULnpbqQaovs6T0vv3//xXioCCzNESknEiH762kRrTOK8v7kF5PSjips2PIZbmecOB+fkY EEQ4Ad2sIMke3E3GP6gVCzsFIFL3/uSzCuCfKD1ysSmgNUYAg5kTW7bMCEl24e58K71hXB gwdbLr2nkycB32a0b1fvVwpPJy+AY/ebTGwOOR7aMxfbuziPaMJ1f7iAJjVAthe24A7MS/ 74FQjraKFN/E9XU4fiN3iUgSe+VjPBPvFKPou9M2/LzPSEeQqjCK/XLZq9hz6A== 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 4TWGtL1q4YzDqJ; Fri, 9 Feb 2024 01:46:50 +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 4191koFa044684; Fri, 9 Feb 2024 01:46:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4191koIr044681; Fri, 9 Feb 2024 01:46:50 GMT (envelope-from git) Date: Fri, 9 Feb 2024 01:46:50 GMT Message-Id: <202402090146.4191koIr044681@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: c2c97cf49343 - main - x11-wm/cosmic-comp: simplify patching 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: c2c97cf493439320e5424da29a00466e0795979e Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2c97cf493439320e5424da29a00466e0795979e commit c2c97cf493439320e5424da29a00466e0795979e Author: Jan Beich AuthorDate: 2024-02-09 01:34:11 +0000 Commit: Jan Beich CommitDate: 2024-02-09 01:46:16 +0000 x11-wm/cosmic-comp: simplify patching --- x11-wm/cosmic-comp/Makefile | 3 +++ x11-wm/cosmic-comp/files/patch-Cargo.toml | 19 ------------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile index 6787f259fd6b..bd34c90252ca 100644 --- a/x11-wm/cosmic-comp/Makefile +++ b/x11-wm/cosmic-comp/Makefile @@ -31,6 +31,9 @@ post-patch: # XXX Strip double / to help "make cargo-crates" @${REINPLACE_CMD} -e 's,\(smithay\)//,\1/,' \ ${WRKSRC}/Cargo.lock +# 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 diff --git a/x11-wm/cosmic-comp/files/patch-Cargo.toml b/x11-wm/cosmic-comp/files/patch-Cargo.toml deleted file mode 100644 index 51758a3b65a7..000000000000 --- a/x11-wm/cosmic-comp/files/patch-Cargo.toml +++ /dev/null @@ -1,19 +0,0 @@ -===> Updating Cargo.lock -error: failed to resolve patches for `https://github.com/Smithay/smithay.git` - -Caused by: - patch for `smithay` in `https://github.com/Smithay/smithay.git` failed to resolve - -Caused by: - The patch location `https://github.com/smithay/smithay?rev=f1e7fc18a` does not appear to contain any packages matching the name `smithay`. -*** Error code 101 - ---- Cargo.toml.orig 2024-02-07 20:40:23 UTC -+++ Cargo.toml -@@ -89,6 +89,3 @@ lto = "fat" - - [profile.release] - lto = "fat" -- --[patch."https://github.com/Smithay/smithay.git"] --smithay = { git = "https://github.com/smithay//smithay", rev = "3b3e07952e" }