From nobody Tue Dec 13 16:25:28 2022 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 4NWkPN43sFz4kBt7; Tue, 13 Dec 2022 16:25:28 +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 4NWkPN3PDNz419J; Tue, 13 Dec 2022 16:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670948728; 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=dOc3dQNdgy9JXqSsuv1Uk5cHUTgzNrEkkYg8QGgZ7RA=; b=pCjzv7WcKmUalBLggzCfIGwqsZV5NG88hOaAdL1ojq7erfCnQdPPJ77rk2oFGL/gJFV0Zr QOuLRO0G7l5aEiYplocteJw+I60+ruVfMuzrL5gZ5bqwiOLiQyABfVg8gCptCrSLtGvE9v ULReuDRzMUALX5lrm9Zsj4GMGzuUNgKYcLve1jqdRYSafRr8+B8dLzTFejVyMgltYpcuQw p6fu0TjunHmgiHgUaG+CabMVlojrrsPjJr9jWwJuLJkoS2alNbF8TQNvIxUFMxm999TvZu HlCUFo1O2iSsJazVJBVfMKKil28CC9FPZmmJTvdUKlB+BBhXEtCqlblEqm96XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670948728; 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=dOc3dQNdgy9JXqSsuv1Uk5cHUTgzNrEkkYg8QGgZ7RA=; b=kBMZLcBIWlF24O8p/FfvTk8bw2OtcvAbb2s+HocBc8BWIzNSlTx9fYyXFQ0iDMgRpiogyb /xXYUn6bRzAUlaMBG7n03vFy+NuEsMWpiOfOMmZrkuIgKKi5rZhm83/+PO20Wkx/jMqZdg QFIQp4JpInJsC0RZXBs/1M/LZN7UrIFvrrB929GXtIjU1lBt8h18iAvM5fKeu29LhOa2MN CdWJaQZU3JuHLtTgvrFaTruvUntrrpFuNpv53vgEWxk1JwxrpdyIm8rQ8aPqYHFG6hw9Et IMM7sB8rEnxoOIudoG2yw/K4/6izMNpYar9MaO8Reu+guJmb5lXGjDjVky23ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670948728; a=rsa-sha256; cv=none; b=OL/UIRcf4xhOEIbG1arrO5ccMWaL1IX9+YO+fWA9KPU4CgPP2OMR9evPvahLVE3Ul1/MeI t/B1w4my6zH+S7N8cw/TYwrhOyruRm2JiCdOT8eLY8nFnRSIoug7F5z6HpKWdLS7x3XWFJ velxwBg3yCcP/990o7Fhiv+KJsaQQzE60aQFhdKKEBxQMF1abeJBufSwckDR4C/nEW5YLN 5PEAEqDfmhVH7GMWCWZijWH74vzH5GwOzdC4B22jQrF5KW5CflFF5/Fw6neHJkaxH7Dfnf kpeZzfDCZX6YyanfTbLV6o1FMWgwclUSKsTfiUKAWNybN09jj7guFsyrhV8ykQ== 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 4NWkPN2PNszKvL; Tue, 13 Dec 2022 16:25:28 +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 2BDGPSTE091267; Tue, 13 Dec 2022 16:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BDGPSET091266; Tue, 13 Dec 2022 16:25:28 GMT (envelope-from git) Date: Tue, 13 Dec 2022 16:25:28 GMT Message-Id: <202212131625.2BDGPSET091266@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 2624cb3dcfc2 - main - textproc/raptor2: fix build with clang 15 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2624cb3dcfc2581bf64eae4675e96940adfb64da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=2624cb3dcfc2581bf64eae4675e96940adfb64da commit 2624cb3dcfc2581bf64eae4675e96940adfb64da Author: Dimitry Andric AuthorDate: 2022-12-12 16:12:52 +0000 Commit: Dimitry Andric CommitDate: 2022-12-13 16:24:25 +0000 textproc/raptor2: fix build with clang 15 During an exp-run for llvm 15 (see bug 265425), it turned out that textproc/raptor2 failed to build with clang 15: raptor_parse.c:260:66: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'int' [-Wint-conversion] RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL); ^~~~ /usr/include/sys/_null.h:34:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~ ./raptor_internal.h:168:12: note: expanded from macro 'RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE' return ret; \ ^~~ This was fixed in https://github.com/dajobe/raptor/commit/567d4d1a by upstream. PR: 268336 Approved by: tcberner (maintainer) MFH: 2022Q4 --- textproc/raptor2/files/patch-commit-567d4d1a | 47 ++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/textproc/raptor2/files/patch-commit-567d4d1a b/textproc/raptor2/files/patch-commit-567d4d1a new file mode 100644 index 000000000000..576f85dd91d4 --- /dev/null +++ b/textproc/raptor2/files/patch-commit-567d4d1a @@ -0,0 +1,47 @@ +commit 567d4d1ab639d924e8d5af459476f331b9af0ce5 +Author: Dave Beckett +Date: Tue Nov 4 15:25:20 2014 -0800 + + Fix error returns in new world methods + + (raptor_world_get_parser_factory, + raptor_world_get_serializers_count): Fix return value in assertions + +diff --git src/raptor_parse.c src/raptor_parse.c +index 26911f47..6caa7f1c 100644 +--- src/raptor_parse.c ++++ src/raptor_parse.c +@@ -252,12 +252,12 @@ raptor_world_get_parser_factory(raptor_world *world, const char *name) + * + * Get number of parsers + * +- * Return value: number of parsers ++ * Return value: number of parsers or <0 on failure + **/ + int + raptor_world_get_parsers_count(raptor_world* world) + { +- RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL); ++ RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, -1); + + raptor_world_open(world); + +diff --git src/raptor_serialize.c src/raptor_serialize.c +index a1f29d78..a0344418 100644 +--- src/raptor_serialize.c ++++ src/raptor_serialize.c +@@ -235,12 +235,12 @@ raptor_get_serializer_factory(raptor_world* world, const char *name) + * + * Get number of serializers + * +- * Return value: number of serializers ++ * Return value: number of serializers or <0 on failure + **/ + int + raptor_world_get_serializers_count(raptor_world* world) + { +- RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL); ++ RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, -1); + + raptor_world_open(world); +