From nobody Thu Apr 20 22:01:44 2023 X-Original-To: dev-commits-ports-main@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 4Q2WpJ3NRXz46fLB; Thu, 20 Apr 2023 22:01:44 +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 4Q2WpJ2y75z3LRd; Thu, 20 Apr 2023 22:01:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682028104; 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=3zDwmWc1UXBEyLXml50rrbywcjUOHiiPI7Yp0qYphvc=; b=Hp6MB5MZkxgORxQ0PhaMEYoBGBmqT2zn3NwmnsQTdy3la4TNrgHH+LjXx1nRLM3WmeBmBB tqNX+NRCuW39zrZ4XljcOWe5GmQoz06k6n4Z3TMkwVQoK2z0xtmhaFrq42+0KnpHyTrxLj 7abjnwNsRhelxPGsk3EOrVrwFcLemEQjxbpF5aXo7IJKScErg5Jha48XUqE7V9Co9iex9z TLgXTdtLHbPVgKnZcWwG9ywU+RQIC/l79Bs8xRV2BrgKYRq/vUZ85CQH10NRtEEIadcVZO VmqF9k9wD5IVurHXPMwvXzy2g4+k8JEcBmahCUvjpCaw/QThVyEt6WB3hx+2cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682028104; 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=3zDwmWc1UXBEyLXml50rrbywcjUOHiiPI7Yp0qYphvc=; b=pxdEq95HdL34HbCRU3ZHY0UsPiBIsgm0snCl3R0oJh90788OqsDPTXLc64zdwprvZadYx5 p4MtIISZNFEpDT/McAwb5+7n8VI5J1S8IbrRQff51asD37YJJQNLESAbVhsIOSMqYtE3t4 NuByzjqSbCZyLttEDv0vX3zbmidbJzMbp1S3VQIu2I6mSMq8owUvKaStomiZd2L6NGvcvw ubDt/VRal8nDjK6xIwFkvauhL5KexvpwS5n+gYGIa4rtCvY5htY7UiaU8XglZIyM4o3TJV g/BpOxjz2f4G0F3UqTLfteJesdqmkgzCRZhiE9GahAXYGyh3rcKBeAfdA7ia+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682028104; a=rsa-sha256; cv=none; b=szxsE5DTfXlM2DZCtBQQuknw+pfK9kNm6q30Jxv3/n4Yn1oYryqwW+SRMiooQz+dWhZN3n iFsKlC/+gHIM/7kUrW3tpnGuWZm8LcIBzSiHsL+/6BePS2+GAJxjYgAWs9fnP5kAKzrvMf KoRAjGvDkAp0xwHTD4p/r6Lto7GyuvAo7hNL/QG2BkKsMngRClg0dVfSSG2XvRtVHuj3s3 2u3w97b+13Pr3/O+OHHDDGQcO2LYTgevyuk1ho8RS+5/98G72NPx2Bt2qoLlkETYxcAH9D 5Cuyuwfdv7rqKZQNcreM0ij1Dp1X68UigLfnQ1UaNuUPOVQV1GcsPmAzneL0eQ== 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 4Q2WpJ22lkzvYQ; Thu, 20 Apr 2023 22:01:44 +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 33KM1iTJ022565; Thu, 20 Apr 2023 22:01:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KM1i3g022564; Thu, 20 Apr 2023 22:01:44 GMT (envelope-from git) Date: Thu, 20 Apr 2023 22:01:44 GMT Message-Id: <202304202201.33KM1i3g022564@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: a4f61b09f6f1 - main - math/readstat: another attempt at getting clang16 on FreeBSD14 to compile this List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a4f61b09f6f15e3570652acb9c24200072878845 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=a4f61b09f6f15e3570652acb9c24200072878845 commit a4f61b09f6f15e3570652acb9c24200072878845 Author: Adriaan de Groot AuthorDate: 2023-04-20 20:56:22 +0000 Commit: Adriaan de Groot CommitDate: 2023-04-20 22:01:41 +0000 math/readstat: another attempt at getting clang16 on FreeBSD14 to compile this --- math/readstat/Makefile | 2 +- math/readstat/files/patch-src_bin_readstat.c | 11 +++++++++++ math/readstat/files/patch-src_readstat__parser.c | 11 +++++++++++ math/readstat/files/patch-src_readstat__variable.c | 10 +++++++--- math/readstat/files/patch-src_sas_ieee.c | 11 ++++++++++- math/readstat/files/patch-src_spss_readstat__por.c | 11 +++++++++++ math/readstat/files/patch-src_spss_readstat__por__write.c | 11 +++++++++++ 7 files changed, 62 insertions(+), 5 deletions(-) diff --git a/math/readstat/Makefile b/math/readstat/Makefile index bfdce5912113..ed5a13ebbe3d 100644 --- a/math/readstat/Makefile +++ b/math/readstat/Makefile @@ -1,6 +1,6 @@ PORTNAME= readstat DISTVERSION= 1.1.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math kde MASTER_SITES= https://github.com/WizardMac/ReadStat/releases/download/v${DISTVERSION}/ diff --git a/math/readstat/files/patch-src_bin_readstat.c b/math/readstat/files/patch-src_bin_readstat.c new file mode 100644 index 000000000000..d589da2957f9 --- /dev/null +++ b/math/readstat/files/patch-src_bin_readstat.c @@ -0,0 +1,11 @@ +--- src/bin/readstat.c.orig 2023-04-20 20:55:14 UTC ++++ src/bin/readstat.c +@@ -154,7 +154,7 @@ readstat_error_t parse_file(readstat_parser_t *parser, + return error; + } + +-static void print_version() { ++static void print_version(void) { + fprintf(stdout, "ReadStat version " READSTAT_VERSION "\n"); + } + diff --git a/math/readstat/files/patch-src_readstat__parser.c b/math/readstat/files/patch-src_readstat__parser.c new file mode 100644 index 000000000000..861d0a24adf2 --- /dev/null +++ b/math/readstat/files/patch-src_readstat__parser.c @@ -0,0 +1,11 @@ +--- src/readstat_parser.c.orig 2023-04-20 20:54:06 UTC ++++ src/readstat_parser.c +@@ -3,7 +3,7 @@ + #include "readstat.h" + #include "readstat_io_unistd.h" + +-readstat_parser_t *readstat_parser_init() { ++readstat_parser_t *readstat_parser_init(void) { + readstat_parser_t *parser = calloc(1, sizeof(readstat_parser_t)); + parser->io = calloc(1, sizeof(readstat_io_t)); + if (unistd_io_init(parser) != READSTAT_OK) { diff --git a/math/readstat/files/patch-src_readstat__variable.c b/math/readstat/files/patch-src_readstat__variable.c index 699c88937a9e..4bc2fe0c7ad8 100644 --- a/math/readstat/files/patch-src_readstat__variable.c +++ b/math/readstat/files/patch-src_readstat__variable.c @@ -1,6 +1,6 @@ ---- src/readstat_variable.c.orig 2023-02-19 12:39:09 UTC +--- src/readstat_variable.c.orig 2020-08-25 16:29:50 UTC +++ src/readstat_variable.c -@@ -2,7 +2,7 @@ +@@ -2,10 +2,10 @@ #include #include "readstat.h" @@ -8,4 +8,8 @@ +static readstat_value_t make_blank_value(void); static readstat_value_t make_double_value(double dval); - static readstat_value_t make_blank_value() { +-static readstat_value_t make_blank_value() { ++static readstat_value_t make_blank_value(void) { + readstat_value_t value = { .is_system_missing = 1, .v = { .double_value = NAN }, .type = READSTAT_TYPE_DOUBLE }; + return value; + } diff --git a/math/readstat/files/patch-src_sas_ieee.c b/math/readstat/files/patch-src_sas_ieee.c index beab46c1713d..40efd45c642b 100644 --- a/math/readstat/files/patch-src_sas_ieee.c +++ b/math/readstat/files/patch-src_sas_ieee.c @@ -1,4 +1,4 @@ ---- src/sas/ieee.c.orig 2023-02-19 12:37:34 UTC +--- src/sas/ieee.c.orig 2018-12-15 15:27:55 UTC +++ src/sas/ieee.c @@ -16,7 +16,7 @@ static void ieee2xpt(unsigned char *ieee, unsigned cha @@ -9,3 +9,12 @@ #endif void memreverse(void *intp_void, int l) { +@@ -96,7 +96,7 @@ int cnxptiee(const void *from_bytes, int fromtype, voi + return(0); + } + +-int get_native() { ++int get_native(void) { + static unsigned char float_reps[][8] = { + {0x41,0x10,0x00,0x00,0x00,0x00,0x00,0x00}, + {0x3f,0xf0,0x00,0x00,0x00,0x00,0x00,0x00}, diff --git a/math/readstat/files/patch-src_spss_readstat__por.c b/math/readstat/files/patch-src_spss_readstat__por.c new file mode 100644 index 000000000000..7037c78f2188 --- /dev/null +++ b/math/readstat/files/patch-src_spss_readstat__por.c @@ -0,0 +1,11 @@ +--- src/spss/readstat_por.c.orig 2023-04-20 20:55:14 UTC ++++ src/spss/readstat_por.c +@@ -64,7 +64,7 @@ uint16_t por_unicode_lookup[256] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 }; + +-por_ctx_t *por_ctx_init() { ++por_ctx_t *por_ctx_init(void) { + por_ctx_t *ctx = calloc(1, sizeof(por_ctx_t)); + + ctx->space = ' '; diff --git a/math/readstat/files/patch-src_spss_readstat__por__write.c b/math/readstat/files/patch-src_spss_readstat__por__write.c new file mode 100644 index 000000000000..048433212898 --- /dev/null +++ b/math/readstat/files/patch-src_spss_readstat__por__write.c @@ -0,0 +1,11 @@ +--- src/spss/readstat_por_write.c.orig 2023-04-20 20:55:14 UTC ++++ src/spss/readstat_por_write.c +@@ -167,7 +167,7 @@ static readstat_error_t por_write_string_field(readsta + return por_write_string_field_n(writer, ctx, string, strlen(string)); + } + +-static por_write_ctx_t *por_write_ctx_init() { ++static por_write_ctx_t *por_write_ctx_init(void) { + por_write_ctx_t *ctx = calloc(1, sizeof(por_write_ctx_t)); + uint16_t max_unicode = 0; + int i;