From nobody Tue Feb 07 04:19:17 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P9qdd3M7xz3ns2G; Tue, 7 Feb 2023 04:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9qdd2p37z3rbb; Tue, 7 Feb 2023 04:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675743557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zd15hMszCny1XtVtskRSh1XBQ9PcIPA4XsH3Iw3WRrw=; b=OQv/BPpXui281b+qM12Rz1k1GhpSPVn21AcUFs6GnkTYwMg3h8xeBGFFriQIVMd/1611B5 G5eqSBzO7VfO3Yb5ruHcELzUieGBqcmF0UlNpy47cCi6EGzojlk44dmVPCzJE3purHWV81 vFIPc7vgJuRIUxqyoPDtwddz+77zVOP78cVv7bBd78/mWO66Ad1eF2zTR3jMRkCXsDxEcu u9u1Kkp5RwahwgeKAUTjfVWJjjGeq5eziRck4EL9rNOWFZeN8hQm59/xNfCYd6EuAKYbMM pSCeapFWd8ynVj7Q73pARftFdYBNvaUc5WwPCk/bYTryp2LaGVzIsUSScVEWyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675743557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zd15hMszCny1XtVtskRSh1XBQ9PcIPA4XsH3Iw3WRrw=; b=KvVvKFx+MLMzYHthqGeW6OdOd7hzZ/rSRBp4Sm6qJWGuI8MMVLQSI/GewzRADVkPi57EZD nOco7jKdEf+RnUFJdztEBhmlRQDvpza/LcmCM+aTDtDDhzJLwRQovNamT2iSyfNRLTtUAG GvKZuK9EeumOh5jDGZsDBMCSTFqXQjGIQjfxM4oYTMoCCfAqbf2vOioM+UgcP06aTGNxew 82Edbxr5pcjPIrXn//1iNdEI5Pc4BQ7U3c+pSCnDMD0vYpWj5hEjzfkqusRJ8w7vedVuqW utrs/s1J+i5v7FvTzKqmfbG4Nkgd/oV9PAJoKa+jbdcrRhp5QoHckXmbnfQs1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675743557; a=rsa-sha256; cv=none; b=KojeX0a6DyWHq5Mk2Acvp5WtQPdja0GYSM3tkgcETrgkZoIEGa86sPLwQbqmJwLsJLEKn7 e2e4xysTI6WEPVE+8I0MqZVenb9dIe43W+HuIDG3QjhO5Uy+qPv436VwaRW48KF+3j214D CzK3XZlvJ6Rhsf1MLr2JWpkgLdsYdhMSeie6CRJrDU+uV1qPm2B9lhMeOqX8cEKUX9vja/ x7S8/yndgk8N7SFHA/bbtTtwNsFKTImaFaP91pqUII1cZ9bWBJ+Fe/wyWc/Krtry+CBWlL CNvlWDifnaLlqMP/t1fpveAcqOdMmBjqJLC4/A1gkgDbs2o3bzGVSWHJ61VtqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P9qdd1s3xz11qR; Tue, 7 Feb 2023 04:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3174JH1i065313; Tue, 7 Feb 2023 04:19:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3174JHRH065312; Tue, 7 Feb 2023 04:19:17 GMT (envelope-from git) Date: Tue, 7 Feb 2023 04:19:17 GMT Message-Id: <202302070419.3174JHRH065312@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 1c0ca0d235ee - 2023Q1 - astro/mepo: revert 3ee2eb616ce6 to unbreak build List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 1c0ca0d235ee11276c49258b526c0a09f38c5267 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c0ca0d235ee11276c49258b526c0a09f38c5267 commit 1c0ca0d235ee11276c49258b526c0a09f38c5267 Author: Jan Beich AuthorDate: 2023-02-07 04:16:50 +0000 Commit: Jan Beich 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);