From e0f1a8c1efb9e31a04cff226f118637db5a9b9c7 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sat, 1 Apr 2023 11:14:37 +0200 Subject: [PATCH] New package: ncdu2-2.2.2 --- srcpkgs/ncdu2/patches/build-pie.patch | 12 ++++++++++++ srcpkgs/ncdu2/patches/explicit-cast.patch | 23 +++++++++++++++++++++++ srcpkgs/ncdu2/template | 19 +++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 srcpkgs/ncdu2/patches/build-pie.patch create mode 100644 srcpkgs/ncdu2/patches/explicit-cast.patch create mode 100644 srcpkgs/ncdu2/template diff --git a/srcpkgs/ncdu2/patches/build-pie.patch b/srcpkgs/ncdu2/patches/build-pie.patch new file mode 100644 index 000000000000..b60fa57b912c --- /dev/null +++ b/srcpkgs/ncdu2/patches/build-pie.patch @@ -0,0 +1,12 @@ +diff --git a/build.zig b/build.zig +index 45bd314..02926f0 100644 +--- a/build.zig ++++ b/build.zig +@@ -13,6 +13,7 @@ pub fn build(b: *std.build.Builder) void { + exe.addCSourceFile("src/ncurses_refs.c", &[_][]const u8{}); + exe.linkLibC(); + exe.linkSystemLibrary("ncursesw"); ++ exe.pie = true; + exe.install(); + + const run_cmd = exe.run(); diff --git a/srcpkgs/ncdu2/patches/explicit-cast.patch b/srcpkgs/ncdu2/patches/explicit-cast.patch new file mode 100644 index 000000000000..bafcccfea94a --- /dev/null +++ b/srcpkgs/ncdu2/patches/explicit-cast.patch @@ -0,0 +1,23 @@ +From e6cfacfa068bbe05873583e68eb82e668875d48c Mon Sep 17 00:00:00 2001 +From: Yorhel +Date: Sun, 2 Apr 2023 11:57:34 +0200 +Subject: [PATCH] scan.zig: Add explicit cast for struct statfs.f_type + +Hopefully fixes #221. +--- + src/scan.zig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/scan.zig b/src/scan.zig +index 328bd86..76b8fea 100644 +--- a/src/scan.zig ++++ b/src/scan.zig +@@ -60,7 +60,7 @@ fn isKernfs(dir: std.fs.Dir, dev: u64) bool { + if (kernfs_cache.get(dev)) |e| return e; + var buf: c_statfs.struct_statfs = undefined; + if (c_statfs.fstatfs(dir.fd, &buf) != 0) return false; // silently ignoring errors isn't too nice. +- const iskern = switch (buf.f_type) { ++ const iskern = switch (util.castTruncate(u32, buf.f_type)) { + // These numbers are documented in the Linux 'statfs(2)' man page, so I assume they're stable. + 0x42494e4d, // BINFMTFS_MAGIC + 0xcafe4a11, // BPF_FS_MAGIC diff --git a/srcpkgs/ncdu2/template b/srcpkgs/ncdu2/template new file mode 100644 index 000000000000..dc6af0e5ccbb --- /dev/null +++ b/srcpkgs/ncdu2/template @@ -0,0 +1,19 @@ +# Template file for 'ncdu2' +pkgname=ncdu2 +version=2.2.2 +revision=1 +build_style=zig-build +makedepends="ncurses-devel" +short_desc="NCurses Disk Usage utility version 2" +maintainer="Marcin Puc " +license="MIT" +homepage="https://dev.yorhel.nl/ncdu" +changelog="https://dev.yorhel.nl/ncdu/changes2" +distfiles="https://dev.yorhel.nl/download/ncdu-${version}.tar.gz" +checksum=90d920024e752318b469776ce57e03b3c702d49329ad9825aeeab36c3babf993 +conflicts="ncdu" + +post_install() { + vlicense LICENSES/MIT.txt + vman ncdu.1 +}