Date: Tue, 20 Aug 2024 06:30:50 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1ed912920141 - main - deskutils/i3status: update to 2.15 Message-ID: <202408200630.47K6Uomi017424@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ed912920141ea8c54b6dc77f14debe22fa6478a commit 1ed912920141ea8c54b6dc77f14debe22fa6478a Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2024-08-20 06:27:12 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2024-08-20 06:27:35 +0000 deskutils/i3status: update to 2.15 --- deskutils/i3status/Makefile | 3 +- deskutils/i3status/distinfo | 6 ++-- deskutils/i3status/files/patch-meson.build | 21 -------------- .../files/patch-src_print__battery__info.c | 11 -------- .../i3status/files/patch-src_print__disk__info.c | 32 ---------------------- deskutils/i3status/files/patch-src_print__volume.c | 31 --------------------- 6 files changed, 4 insertions(+), 100 deletions(-) diff --git a/deskutils/i3status/Makefile b/deskutils/i3status/Makefile index 8593041988b8..ac092d08f292 100644 --- a/deskutils/i3status/Makefile +++ b/deskutils/i3status/Makefile @@ -1,6 +1,5 @@ PORTNAME= i3status -PORTVERSION= 2.14 -PORTREVISION= 3 +PORTVERSION= 2.15 CATEGORIES= deskutils MASTER_SITES= http://i3wm.org/i3status/ diff --git a/deskutils/i3status/distinfo b/deskutils/i3status/distinfo index dbf824523e13..1baa6e1d5bc1 100644 --- a/deskutils/i3status/distinfo +++ b/deskutils/i3status/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636561077 -SHA256 (i3status-2.14.tar.xz) = 5c4d0273410f9fa3301fd32065deda32e9617fcae8b3cb34793061bf21644924 -SIZE (i3status-2.14.tar.xz) = 68900 +TIMESTAMP = 1724134861 +SHA256 (i3status-2.15.tar.xz) = 6c67f52cae4f139df764ad1cc736562be0f97750791bc212b53f34c06eaf2205 +SIZE (i3status-2.15.tar.xz) = 70220 diff --git a/deskutils/i3status/files/patch-meson.build b/deskutils/i3status/files/patch-meson.build deleted file mode 100644 index c6bb9218ca60..000000000000 --- a/deskutils/i3status/files/patch-meson.build +++ /dev/null @@ -1,21 +0,0 @@ ---- meson.build.orig 2021-11-12 10:03:11 UTC -+++ meson.build -@@ -222,15 +222,15 @@ install_subdir( - # because configure_file strips the backslash in e.g. \@display, - # resulting in @display, breaking our Perl code: - # https://github.com/mesonbuild/meson/issues/7165 --bash = find_program('bash') -+sh = find_program('sh') - replace_dirs = [ -- bash, '-c', # Use bash to capture output and mark as executable -+ sh, '-c', # Use bash to capture output and mark as executable - 'sed -e \'s,@abs_top_builddir@,' - + meson.current_build_dir() - + ',g;s,@abs_top_srcdir@,' - + meson.current_source_dir()+',g\'' - # Only mark files ending in .pl as executables -- + ' "$0" > "$1" && { [[ "${1##*.}" == pl ]] && chmod +x "$1" || true; }', -+ + ' "$0" > "$1" && { [ "${1##*.}" = pl ] && chmod +x "$1" || true; }', - '@INPUT0@', # $0 - '@OUTPUT0@', # $1 - ] diff --git a/deskutils/i3status/files/patch-src_print__battery__info.c b/deskutils/i3status/files/patch-src_print__battery__info.c deleted file mode 100644 index e038c2b2c491..000000000000 --- a/deskutils/i3status/files/patch-src_print__battery__info.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/print_battery_info.c.orig 2021-11-09 07:27:11 UTC -+++ src/print_battery_info.c -@@ -595,7 +595,7 @@ void print_battery_info(battery_info_ctx_t *ctx) { - #endif - #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__OpenBSD__) - /* These OSes report battery time in minutes. */ -- hide_seconds = true; -+ ctx->hide_seconds = true; - #endif - - if (ctx->number < 0) { diff --git a/deskutils/i3status/files/patch-src_print__disk__info.c b/deskutils/i3status/files/patch-src_print__disk__info.c deleted file mode 100644 index cf8308f5e2e0..000000000000 --- a/deskutils/i3status/files/patch-src_print__disk__info.c +++ /dev/null @@ -1,32 +0,0 @@ ---- src/print_disk_info.c.orig 2021-11-10 16:46:42 UTC -+++ src/print_disk_info.c -@@ -63,7 +63,7 @@ static int print_bytes_human(char *outwalk, uint64_t b - * Determines whether remaining bytes are below given threshold. - * - */ --#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) -+#if defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) - static bool below_threshold(struct statfs buf, const char *prefix_type, const char *threshold_type, const double low_threshold) { - #else - static bool below_threshold(struct statvfs buf, const char *prefix_type, const char *threshold_type, const double low_threshold) { -@@ -124,17 +124,17 @@ void print_disk_info(disk_info_ctx_t *ctx) { - - INSTANCE(ctx->path); - --#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) -+#if defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) - struct statfs buf; - - if (statfs(path, &buf) == -1) - return; - - mounted = true; --#elif defined(__NetBSD__) -+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - struct statvfs buf; - -- if (statvfs(path, &buf) == -1) -+ if (statvfs(ctx->path, &buf) == -1) - return; - - mounted = true; diff --git a/deskutils/i3status/files/patch-src_print__volume.c b/deskutils/i3status/files/patch-src_print__volume.c deleted file mode 100644 index a553383ad098..000000000000 --- a/deskutils/i3status/files/patch-src_print__volume.c +++ /dev/null @@ -1,31 +0,0 @@ ---- src/print_volume.c.orig 2021-11-09 07:27:11 UTC -+++ src/print_volume.c -@@ -250,8 +250,8 @@ void print_volume(volume_ctx_t *ctx) { - const char *devicename = "UNSUPPORTED"; /* TODO: implement support for this */ - pbval = 1; - -- if (mixer_idx > 0) -- asprintf(&mixerpath, "/dev/mixer%d", mixer_idx); -+ if (ctx->mixer_idx > 0) -+ asprintf(&mixerpath, "/dev/mixer%d", ctx->mixer_idx); - else - mixerpath = defaultmixer; - -@@ -264,7 +264,7 @@ void print_volume(volume_ctx_t *ctx) { - goto out; - } - -- if (mixer_idx > 0) -+ if (ctx->mixer_idx > 0) - free(mixerpath); - - #if defined(__NetBSD__) || defined(__OpenBSD__) -@@ -351,7 +351,7 @@ void print_volume(volume_ctx_t *ctx) { - } - - #endif -- buffer = apply_volume_format(fmt, buffer, vol & 0x7f, devicename); -+ ctx->buf = apply_volume_format(ctx->fmt, vol & 0x7f, devicename); - close(mixfd); - goto out_with_format; - #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408200630.47K6Uomi017424>