Date: Fri, 10 Feb 2023 23:41:05 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d90f75fbc961 - main - x11/shotman: switch to upstreamed patch after 9b1e2aa43af2 Message-ID: <202302102341.31ANf5k6011650@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d90f75fbc961a1b6e9c2abd47a36fc6c8db0a52d commit d90f75fbc961a1b6e9c2abd47a36fc6c8db0a52d Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-02-10 19:58:53 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> 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}"); -+ } - }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302102341.31ANf5k6011650>