From nobody Thu May 18 11:41:05 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 4QMSjG4bPbz4BT5J; Thu, 18 May 2023 11:41:06 +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 4QMSjG1Stdz3wpl; Thu, 18 May 2023 11:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684410066; 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=ZL2Hhdc1bEmiQhXjcGMIVXBerCnHv+8F1lg1IRAcZu0=; b=mupRR9vchKfVj8One0VYY1GgBbZxCkTi8idmZ5he7sxbTQavBsTVE5SY1ndZHAjgg/K6q1 rUxcx7gzmXq0Z6VvFaXnijG7kMFDqq0C5OkPDPG/LsOpwqRl8k2xfQuj7SWO3K/5CdL+ys e6tyetgCzCdaPJxAQO55FZUhnLNg7MpGCNXmQEETB4xE8l3xkmpxAv9rgBfv+pEFZVviiY 11xpFqWrjJVmOQW2SFPRKA0zrk007ww5alXwLIAKRmOZ332X94gNxWrmFK4CrYQXhWEEDQ zVafwH1nAw+xtYBu38/58Q3B3u6CSv8r5FrDybxzlPMa7Bi3cXnDGuxUvOzwHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684410066; 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=ZL2Hhdc1bEmiQhXjcGMIVXBerCnHv+8F1lg1IRAcZu0=; b=xT8kN5jnlODnwbvmdKXfV3jXLk+lJ1GMjRsSM1QeX2PTKDozIRUG0Sjui/UjdHNoHooHvz TgFCN2s635Xs1Iw1DH+GMurIIY99ksKTwx1DhaX3oP/gf9nj4a3tIeazWmfWdZJ2aVakEc k1l7ZYcG04Fve1CuUp/FWE6zpVBUziD3oYz8A0ErOKoXqoApIQrZs9HWVFrLfYfj1YnCn/ ob5GvwiHxB0pvJlzcSQcpplnKIt+IjFxe24UnYk6nooBsgSxYFUPnri/O0kEHbkza25Xcj +MB0sGVzzQA/NBtCAb8ZGtBTloYZWm5fjpxI7Y5Oav6XLm216YxVkQE4zxJmJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684410066; a=rsa-sha256; cv=none; b=J+Qdp1CFYrECkAWbS3Ros4FCP9QJgmwghCI4NEv4NXG2P1qvfcxMKKnAKs96h5O4DjXyfB 3HmIDR0FWT8UzVvPEofMLA/kQ0Npk1ATjFdEgHDITDYW/Joa+5nTKD4RUDhK+EVtM+adZ3 0HQv2UepW0PhS4GyhvGz6V760507YM2zvVptOsuzdU3XvcFzCUpHNXhHlh17hzhLchN1m4 jVXtT/yV9zkl/dll3ChGEE/kehOdmC8TA7LYSBJMOgaDRsRm9f5e0CMWZiF9HJeydcEl9n uhubUUTnfSvg8mj1sIilTjbpXQjmuYNXpMK2v0mal8X2UGJKrm4EneulJ/BYow== 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 4QMSjG0WXGzkhQ; Thu, 18 May 2023 11:41:06 +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 34IBf5bN086781; Thu, 18 May 2023 11:41:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34IBf5Ud086780; Thu, 18 May 2023 11:41:05 GMT (envelope-from git) Date: Thu, 18 May 2023 11:41:05 GMT Message-Id: <202305181141.34IBf5Ud086780@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: ea9006c8e8ff - main - textproc/p5-XML-LibXML: fix build with clang 16 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea9006c8e8ff30532f8ebd66d850cc6b2b8701b7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=ea9006c8e8ff30532f8ebd66d850cc6b2b8701b7 commit ea9006c8e8ff30532f8ebd66d850cc6b2b8701b7 Author: Dimitry Andric AuthorDate: 2023-05-10 19:19:33 +0000 Commit: Dimitry Andric CommitDate: 2023-05-18 11:36:36 +0000 textproc/p5-XML-LibXML: fix build with clang 16 Clang 16 has a new error about incompatible function types, which shows up when building textproc/p5-XML-LibXML: perl-libxml-mm.c:142:18: error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] xmlHashScan(r, PmmRegistryDumpHashScanner, NULL); ^~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/local/include/libxml2/libxml/hash.h:213:22: note: passing argument to parameter 'f' here xmlHashScanner f, ^ perl-libxml-mm.c:234:44: error: incompatible function pointer types passing 'void (void *, xmlChar *)' (aka 'void (void *, unsigned char *)') to parameter of type 'xmlHashDeallocator' (aka 'void (*)(void *, const unsigned char *)') [-Wincompatible-function-pointer-types] if( xmlHashRemoveEntry(PmmREGISTRY, name, PmmRegistryHashDeallocator) ) ^~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/local/include/libxml2/libxml/hash.h:160:47: note: passing argument to parameter 'f' here xmlHashDeallocator f); ^ perl-libxml-mm.c:301:38: error: incompatible function pointer types passing 'void *(void *, xmlChar *)' (aka 'void *(void *, unsigned char *)') to parameter of type 'xmlHashCopier' (aka 'void *(*)(void *, const unsigned char *)') [-Wincompatible-function-pointer-types] reg_copy = xmlHashCopy(PmmREGISTRY, PmmRegistryHashCopier); ^~~~~~~~~~~~~~~~~~~~~ /usr/local/include/libxml2/libxml/hash.h:208:21: note: passing argument to parameter 'f' here xmlHashCopier f); ^ In all three cases, the libxml2 callback functions require const xmlChar pointers, so fix the parameters in their definitions. PR: 271355 Approved by: portmgr (build fix blanket) MFH: 2023Q2 --- textproc/p5-XML-LibXML/Makefile | 1 + .../p5-XML-LibXML/files/patch-perl-libxml-mm.c | 29 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile index 6fac2543f6b2..1b07bd0927bd 100644 --- a/textproc/p5-XML-LibXML/Makefile +++ b/textproc/p5-XML-LibXML/Makefile @@ -1,5 +1,6 @@ PORTNAME= XML-LibXML PORTVERSION= 2.0208 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= textproc perl5 MASTER_SITES= CPAN diff --git a/textproc/p5-XML-LibXML/files/patch-perl-libxml-mm.c b/textproc/p5-XML-LibXML/files/patch-perl-libxml-mm.c new file mode 100644 index 000000000000..ad6f7f1d6489 --- /dev/null +++ b/textproc/p5-XML-LibXML/files/patch-perl-libxml-mm.c @@ -0,0 +1,29 @@ +--- perl-libxml-mm.c.orig 2022-09-21 16:57:45 UTC ++++ perl-libxml-mm.c +@@ -121,7 +121,7 @@ extern SV* PROXY_NODE_REGISTRY_MUTEX; + extern SV* PROXY_NODE_REGISTRY_MUTEX; + + /* Utility method used by PmmDumpRegistry */ +-void PmmRegistryDumpHashScanner(void * payload, void * data, xmlChar * name) ++void PmmRegistryDumpHashScanner(void * payload, void * data, const xmlChar * name) + { + LocalProxyNodePtr lp = (LocalProxyNodePtr) payload; + ProxyNodePtr node = (ProxyNodePtr) lp->proxy; +@@ -215,7 +215,7 @@ static void + /* PP: originally this was static inline void, but on AIX the compiler + did not chew it, so I'm removing the inline */ + static void +-PmmRegistryHashDeallocator(void *payload, xmlChar *name) ++PmmRegistryHashDeallocator(void *payload, const xmlChar *name) + { + Safefree((LocalProxyNodePtr) payload); + } +@@ -279,7 +279,7 @@ void * + * internal, used by PmmCloneProxyNodes + */ + void * +-PmmRegistryHashCopier(void *payload, xmlChar *name) ++PmmRegistryHashCopier(void *payload, const xmlChar *name) + { + ProxyNodePtr proxy = ((LocalProxyNodePtr) payload)->proxy; + LocalProxyNodePtr lp;