Date: Thu, 9 Oct 2025 14:50:49 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: 55a32a919dd6 - main - graphics/satty: unbreak build after b51ad1da25a6 Message-ID: <202510091450.599EonNJ027877@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=55a32a919dd6e7b8f0f7ebaa88f21992055f1f95 commit 55a32a919dd6e7b8f0f7ebaa88f21992055f1f95 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2025-10-09 14:34:30 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2025-10-09 14:50:11 +0000 graphics/satty: unbreak build after b51ad1da25a6 No file to patch. Skipping... 1 out of 1 hunks ignored--saving rejects to cargo-crates/relm4-icons-0.9.0/build.rs.rej Can't create cargo-crates/relm4-icons-0.9.0/build.rs.rej, output is in /tmp/patchrELu1sg7s5e: No such file or directory ===> FAILED Applying FreeBSD patch-icons ===> FAILED to apply cleanly FreeBSD patch(es) patch-icons *** Error code 1 Reported by: pkg-fallout Regressed by: https://github.com/Relm4/icons/commit/07c9fb1b62b6 --- graphics/satty/Makefile | 1 - graphics/satty/files/patch-icons | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/graphics/satty/Makefile b/graphics/satty/Makefile index 1037d9881014..56db6536f1ec 100644 --- a/graphics/satty/Makefile +++ b/graphics/satty/Makefile @@ -17,7 +17,6 @@ USE_GITHUB= yes USE_GNOME= gdkpixbuf gtk40 libadwaita GH_ACCOUNT= gabm GH_PROJECT= Satty -CARGO_ENV= SOURCE_DIR="${WRKSRC}" PLIST_FILES= bin/${PORTNAME} \ share/applications/${PORTNAME}.desktop \ share/icons/hicolor/scalable/apps/${PORTNAME}.svg diff --git a/graphics/satty/files/patch-icons b/graphics/satty/files/patch-icons deleted file mode 100644 index 86ac04b20c27..000000000000 --- a/graphics/satty/files/patch-icons +++ /dev/null @@ -1,11 +0,0 @@ ---- cargo-crates/relm4-icons-0.9.0/build.rs.orig 2006-07-24 01:21:28 UTC -+++ cargo-crates/relm4-icons-0.9.0/build.rs -@@ -52,7 +52,7 @@ fn main() { - let mut manifest_dir = Path::new(&out_dir).canonicalize().unwrap(); - eprintln!("Canonical manifest dir: {manifest_dir:?}"); - -- let (config, config_dir) = if cfg!(docsrs) { -+ let (config, config_dir) = if cfg!(docsrs) || env::var("SOURCE_DIR").is_ok() { - if let Ok(source_dir) = env::var("SOURCE_DIR") { - (Config::load(&source_dir).unwrap_or_default(), source_dir) - } else {home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510091450.599EonNJ027877>