Date: Tue, 7 Feb 2023 04:19:17 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 1c0ca0d235ee - 2023Q1 - astro/mepo: revert 3ee2eb616ce6 to unbreak build Message-ID: <202302070419.3174JHRH065312@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c0ca0d235ee11276c49258b526c0a09f38c5267 commit 1c0ca0d235ee11276c49258b526c0a09f38c5267 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-02-07 04:16:50 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-02-07 04:19:05 +0000 astro/mepo: revert 3ee2eb616ce6 to unbreak build ./src/api/bind_signal.zig:48:21: error: expected error union type, found 'void' std.os.sigaction(signal_name, &signal_action, null) ^ Reported by: pkg-fallout This reverts commit 3ee2eb616ce616ebfa5d542d80993274c19d60e9. --- astro/mepo/Makefile | 2 +- astro/mepo/files/patch-src_api_bind__signal.zig | 25 ------------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/astro/mepo/Makefile b/astro/mepo/Makefile index f30d1753c510..220ebb807866 100644 --- a/astro/mepo/Makefile +++ b/astro/mepo/Makefile @@ -1,6 +1,6 @@ PORTNAME= mepo DISTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 1 CATEGORIES= astro geography wayland MASTER_SITES= https://git.sr.ht/~mil/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ diff --git a/astro/mepo/files/patch-src_api_bind__signal.zig b/astro/mepo/files/patch-src_api_bind__signal.zig deleted file mode 100644 index 378d281adc74..000000000000 --- a/astro/mepo/files/patch-src_api_bind__signal.zig +++ /dev/null @@ -1,25 +0,0 @@ -https://lists.sr.ht/~mil/mepo-devel/patches/38775 - ---- src/api/bind_signal.zig.orig 2023-02-01 03:43:08 UTC -+++ src/api/bind_signal.zig -@@ -39,13 +39,14 @@ fn bind_signal(mepo: *Mepo, signo_str: [:0]const u8, expression: []const u8) !vo - } - - // Register generic signal handler -- if (0 != std.os.linux.sigaction(signal_name, &.{ -+ const signal_action = std.os.Sigaction{ - .handler = .{ .handler = utilsdl.sdl_push_event_signal }, -- .mask = [_]u32{0} ** 32, -- .flags = @as(c_uint, 0), -- }, null)) { -- return error.FailedToSetupSighandler; -- } -+ .mask = std.os.empty_sigset, -+ .flags = 0, -+ }; -+ -+ std.os.sigaction(signal_name, &signal_action, null) -+ catch return error.FailedToSetupSighandler; - - if (mepo.table_signals.get(signal_name)) |heap_str| { - mepo.allocator.free(heap_str);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302070419.3174JHRH065312>