From nobody Fri Feb 10 23:41:05 2023 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 4PD9Gp0WQ9z3nSsS; Fri, 10 Feb 2023 23:41:06 +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 4PD9Gp00Bwz4FYR; Fri, 10 Feb 2023 23:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676072466; 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=MA4Ybnsxb3sWsNnhqDEsVqjShyDdcqS7UqNNlFoT1/s=; b=Kc5C+f1TtR96w1/tLUw0mvxv1MxS+hAM6nlcT2XCWMPf3oJJYHQ0wGtn4LjcWcjLhpp0Qt puYg4t9wVirRrBxPviM01ilyP/ephLjsgSS+x+fGwFEZddrcTWeuE11r67qtq4hcrAf/Og XzSrJ5w1cESia49pPbvfSnb3vZDvg/HVLwt1ZwyVWWuTzC4ZspOWFyll2fS7kfyIapcMC5 KyeL0Bh0SgkBbhRDPAPHsIrXjjEicDk8mXInxbhDWM6PPCLpQXDIEdtbGgzBRTI3oqD9jb +QjZZ54bDksC1Y72L4JfQmaYN5HXjXtTHCOq3EMJlpMY2NJURr/yRTAxoM2F1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676072466; 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=MA4Ybnsxb3sWsNnhqDEsVqjShyDdcqS7UqNNlFoT1/s=; b=fPhl85tFZGU7s2EPxUneCuW7VYEq7kMpgztzvEWTjUY11Cafuw+T7yVNu1W9cKu6yYkcNJ qEYnVP+lc6oQJg4uuQ1AYEBRYtNTo2MAplhmTXpOiiMLVZ2obMmPoO4mPmRnPjPv4r6yCi 46iHO5/+xv7HX7McY47qte5l8HGZA+yRj/ngNKOLgmp6rNAb24mHV7swjZjtbEv7tHoU06 jXct5JN6IqI3gO15hAmjcpfhHULjzKGUduhtlWaaEBPByXX74aaM47uibnLdd/pit8MFd8 esn/vul0xxzTNILzQbVRcLJ8sNfixSdp1NcQ2Msg47u2Wwc8rsV55QMh7wYm4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676072466; a=rsa-sha256; cv=none; b=aWWzA2y61bH2/flBndwobC5sBSRR8pxfpeTrjOvS8dxlScfthb0sEOSLbumVft7ifiKxvM hcDmy+elf02sWupV+QMtoz/Firj5Ovs7S4Q+Z6SvvH2MtSP1of4hzMptCK5wJUgIN4QjO1 BXFYl7ZM/9xrHNZUJ25BsX5MKQUZ4RN5f0i6hq3bnBQjaTs+0DUePQc1o3ZhX86NSxP2Mi L08RqC/eBIM3C50vBbsgHmOgbvKJ88gq8azAq60Or/cGt8gxulCBFTuTCyeyrxx4LXnC+O fnFzUPRqX4qxwFnzmU2B7eYY6DsffnymZB0ZZNA1qzqC5b01o8MUFbLwWc2DPg== 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 4PD9Gn692xzcbX; Fri, 10 Feb 2023 23:41:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31ANf5mq011651; Fri, 10 Feb 2023 23:41:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31ANf5k6011650; Fri, 10 Feb 2023 23:41:05 GMT (envelope-from git) Date: Fri, 10 Feb 2023 23:41:05 GMT Message-Id: <202302102341.31ANf5k6011650@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: d90f75fbc961 - main - x11/shotman: switch to upstreamed patch after 9b1e2aa43af2 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: d90f75fbc961a1b6e9c2abd47a36fc6c8db0a52d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d90f75fbc961a1b6e9c2abd47a36fc6c8db0a52d commit d90f75fbc961a1b6e9c2abd47a36fc6c8db0a52d Author: Jan Beich AuthorDate: 2023-02-10 19:58:53 +0000 Commit: Jan Beich CommitDate: 2023-02-10 23:39:39 +0000 x11/shotman: switch to upstreamed patch after 9b1e2aa43af2 --- x11/shotman/Makefile | 3 +++ x11/shotman/distinfo | 2 ++ x11/shotman/files/patch-build.rs | 17 ----------------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/x11/shotman/Makefile b/x11/shotman/Makefile index 85e6b9f0b87c..13f5507d40fe 100644 --- a/x11/shotman/Makefile +++ b/x11/shotman/Makefile @@ -6,6 +6,9 @@ MASTER_SITES= https://git.sr.ht/~whynothugo/${PORTNAME}/archive/${DISTVERSIONFUL # XXX Teach USES=cargo to not override default DISTFILES DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +PATCH_SITES= https://git.sr.ht/~whynothugo/${PORTNAME}/commit/ +PATCHFILES+= d2f7ef2107b9.patch:-p1 # respect SHOTMAN_VERSION + MAINTAINER= jbeich@FreeBSD.org COMMENT= Uncompromising screenshot GUI for Wayland WWW= https://sr.ht/~whynothugo/shotman diff --git a/x11/shotman/distinfo b/x11/shotman/distinfo index 4cf9bba6cd28..d6217ae10f39 100644 --- a/x11/shotman/distinfo +++ b/x11/shotman/distinfo @@ -245,3 +245,5 @@ SHA256 (rust/crates/xkbcommon-0.5.0.crate) = acbee136714379ab22da0280207fdb7f47e SIZE (rust/crates/xkbcommon-0.5.0.crate) = 58155 SHA256 (Smithay-client-toolkit-327f9cd791d8810fe7324ee1ddd48adaf3592ca4_GH0.tar.gz) = 3346fa9a5646c229d20148f8a49178a5707109b70a908f8f9f5f90cba9320c93 SIZE (Smithay-client-toolkit-327f9cd791d8810fe7324ee1ddd48adaf3592ca4_GH0.tar.gz) = 116969 +SHA256 (d2f7ef2107b9.patch) = 9300712c80fb535bf66f74e6b056d2387d4aaeeff34a77c86b3430c70bc400d0 +SIZE (d2f7ef2107b9.patch) = 1660 diff --git a/x11/shotman/files/patch-build.rs b/x11/shotman/files/patch-build.rs deleted file mode 100644 index f5fb2bfdcf22..000000000000 --- a/x11/shotman/files/patch-build.rs +++ /dev/null @@ -1,17 +0,0 @@ -https://lists.sr.ht/~whynothugo/shotman/%3Clel5-5qpi-wny%40FreeBSD.org%3E - ---- build.rs.orig 2023-02-09 09:01:51 UTC -+++ build.rs -@@ -1,5 +1,6 @@ fn main() { - use std::process::Command; - fn main() { -+ if std::env::var("SHOTMAN_VERSION").is_err() { - let version = Command::new("git") - .args(["describe", "--tags"]) - .output() -@@ -13,4 +14,5 @@ fn main() { - .unwrap_or(String::from("unknown")); // failed to run git - - println!("cargo:rustc-env=SHOTMAN_VERSION={version}"); -+ } - }