From nobody Mon Jul 31 06:59:39 2023 X-Original-To: dev-commits-ports-all@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 4RDpyX58kHz4psZ7; Mon, 31 Jul 2023 06:59:40 +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 4RDpyM5kcZz3JjG; Mon, 31 Jul 2023 06:59:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690786779; 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=Qrq1d/J1BhO5dFObhtgDLUdeeONVTwvZplQ4/gN9ed0=; b=BeL8m1m0llV/hGDwE7BJ+SJDpLEcBFCARJ8gc25TGUEBNkV9gKzLXnJbXaCQhfxBSM212d mzKMtz/VzvGIUP1sJFiy+Lb9xvRZSP59zBLaJMgq8/3KWnyMjJaXO0y9SQ8ayrUB5XGn4y TtPtD46vWyqE6hezk4JJXTcDJeXsYhlss77AQ7IVgNqUicK9VS+2Ce1KerqJ73DHpkjt3S X0C5kOJ1PXkMkU/eKjsk3M8vVK5e3cY+T79xdC+u/H/8mQTWYmJvnUXg8TXjAb3llyBwM7 g8MdDIQ74WdyqGH7DvjFUGhojuj9cWeWESsL6j9gvPYXDksgHCd0QFWJR9DN0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690786779; 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=Qrq1d/J1BhO5dFObhtgDLUdeeONVTwvZplQ4/gN9ed0=; b=JP8k2ayRI1sZ3WMzbkTxWpDmbErnHAHvp2RO2SxzuEpM6gyXomqB0M4op5ju3pQNLOp6nF 0oxFviCDXf6C/pE4ZlGTsU4ghA90/Xz4//dd7CZm5a3pfHpszxAplZsHTOIAoPI2j+vLT+ PGRYxKESt3ymSyzQMIERHH39KOYAIAnfth6+/FLa7NgTJPBcGN5hWmKoN5W1tCrQTkl1w4 F/o1h9pBNXD6BkYXA7WNi1bNoklG3vcEQNf6ABtUSa/eaOhTS9M2B7mpzehMfZgHExW6LG 4tqE3O9ndyUse9znvITIx4Jny8XuD5Cqxg5O5/wtyJb5nrRiRQfuTDkHS+jbtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690786779; a=rsa-sha256; cv=none; b=QL1Y0M6ILfLjCVuLO/BwShdkrclJB+GsiISgsmQ5+l7LbAsiqLf29pNedRs3i07eNNmGaG DAIqbbzQoxkaL+XopGMHGNvTUallVLvKzxx8Lg7brBb0qRZtTSfe7Z4Z3ws6oL3OnYGILg jeHinnatTrlaBv2S1DrBSLCpv/aafKKLBrFCCv+fyE3k80/KP1NF5fGzjl4zZidRy4gV3I CBxL0JkL7VDEirpdllh1fr4KZ7SX0lJohxkrxxPgcG1hP4aySSnUB3Wfc1Clyy5Ml0EnXq xw8bup1RuGOFPIZR7bz6gyNvWdIr/1uMQAGp3wjiimJl6cmKrXHqZ3MvToHzXg== 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 4RDpyM3YRYzm2Y; Mon, 31 Jul 2023 06:59:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36V6xd1O097596; Mon, 31 Jul 2023 06:59:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36V6xdK9097595; Mon, 31 Jul 2023 06:59:39 GMT (envelope-from git) Date: Mon, 31 Jul 2023 06:59:39 GMT Message-Id: <202307310659.36V6xdK9097595@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 62dc27e0ab67 - main - sysutils/fsearch: try to unbreak the port's build on -CURRENT/i386: List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62dc27e0ab67cf20aacccccc61a57ea8edd86555 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=62dc27e0ab67cf20aacccccc61a57ea8edd86555 commit 62dc27e0ab67cf20aacccccc61a57ea8edd86555 Author: Alexey Dokuchaev AuthorDate: 2023-07-31 06:58:58 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-07-31 06:58:58 +0000 sysutils/fsearch: try to unbreak the port's build on -CURRENT/i386: error: incompatible function pointer types passing 'bool (const char *, time_t *, time_t *)' (aka 'bool (const char *, int *, int *)') to parameter of type 'FsearchQueryIntegerParserFunc *' (aka 'bool (*)(const char *, long long *, long long *)') i386 is the only architecture with 32-bit `time_t' and I don't think adding another `FsearchQueryTimeParserFunc' type just to circumvent this [-Wincompatible-function-pointer-types] issue is warranted, or even upstreamable, so simply pass those numbers as `int64_t' as this does not affect internal time-related calculations. Reported by: pkg-fallout --- sysutils/fsearch/Makefile | 3 ++ .../fsearch/files/patch-src_fsearch__time__utils.c | 34 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/sysutils/fsearch/Makefile b/sysutils/fsearch/Makefile index 80ea1f12937d..8353baa30a5c 100644 --- a/sysutils/fsearch/Makefile +++ b/sysutils/fsearch/Makefile @@ -23,5 +23,8 @@ post-patch: @${PRINTF} '\n%s\n%s;\n' int \ 'strverscmp(const char *, const char *)' \ >> ${WRKSRC}/src/fsearch_string_utils.h + @${REINPLACE_CMD} -e 's,time_t,int64_t,g' \ + ${WRKSRC}/src/fsearch_time_utils.h \ + ${WRKSRC}/src/tests/test_time_utils.c .include diff --git a/sysutils/fsearch/files/patch-src_fsearch__time__utils.c b/sysutils/fsearch/files/patch-src_fsearch__time__utils.c new file mode 100644 index 000000000000..c6def574e2fa --- /dev/null +++ b/sysutils/fsearch/files/patch-src_fsearch__time__utils.c @@ -0,0 +1,34 @@ +--- src/fsearch_time_utils.c.orig 2022-08-22 10:06:20 UTC ++++ src/fsearch_time_utils.c +@@ -1,11 +1,11 @@ + #define _GNU_SOURCE + +-#include "fsearch_time_utils.h" +- + #include + #include + #include + ++#include "fsearch_time_utils.h" ++ + typedef enum FsearchDateTimeType { + FSEARCH_DATE_TIME_TYPE_SECOND, + FSEARCH_DATE_TIME_TYPE_MINUTE, +@@ -377,7 +377,7 @@ parse_implicit_date_time_constants(const char *str, st + } + + static bool +-parse_date_time_constants(const char *str, time_t *time_start_out, time_t *time_end_out) { ++parse_date_time_constants(const char *str, int64_t *time_start_out, int64_t *time_end_out) { + struct tm tm_start = {}; + struct tm tm_end = {}; + +@@ -469,7 +469,7 @@ round_down_tm_to_reference_with_date_time_accuracy(str + } + + bool +-fsearch_date_time_parse_interval(const char *str, time_t *time_start_out, time_t *time_end_out) { ++fsearch_date_time_parse_interval(const char *str, int64_t *time_start_out, int64_t *time_end_out) { + if (parse_date_time_constants(str, time_start_out, time_end_out)) { + return true; + }