From nobody Thu May 18 11:41:07 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 4QMSjH3XgWz4BSXJ; Thu, 18 May 2023 11:41:07 +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 4QMSjH2SWrz3wk4; Thu, 18 May 2023 11:41:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684410067; 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=fbrnEEImQjlm9zSvx/l5o/lP10FL/mo6XRNCSEuhENI=; b=epsLC8hfv+MliQqKN2UICZ76EMQWtihZ/4tpRUWPpHFjWXYOfHzTm69rUuGqg9hWzYMeXC iOpgiTkHLIG7FZQpB3+ktqi9cqUgSZRkaiL81pid7S+gS96fUqOMkFZbLzXkOK6ZzEtmW2 KSHGLEK0aW7u/fXQN0QN7trD8K5gGejmMYOPe6n/m5i+1meZVDhugPPVt1oTtGpy/Hj2IY lz40DM+NjgkBWi3EWCna+QzEy3CASFisy3vUPs0jaNnbNoBL5irgClTaWoiACJB/FfMWZF TrNIPKFeYuHNVkYMGMJXvqj8MnFSk6FDqxBzBxgasvqmTcBWei4HkVmjpef7Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684410067; 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=fbrnEEImQjlm9zSvx/l5o/lP10FL/mo6XRNCSEuhENI=; b=rISARxn9kz/HSpGvr7RSxmO2I5vrlQG3daigcZEdO4ffRmzQI4sdh31teCf/9Z47Ol4zDd tYjC55OKWEAtzDz4CSDTQrDFC2oWG11LR85fxay5ani0GrNTXMl7Zci7i5zHdkllnzuOqS Qy+PLhNSkcbl3gCfFMEYpc1gJ+yg1/R5FGzulukxLNXh/65BYHCTTI2P3xMMgrMkd5C3Yh PefJj0uCDaF5Sd0piTQ/H45EoEVmxMgBz1VVJA8yDqiNhYT7IhcIeltkwc7cUqPuAFezsV Q/zZKTohZ93lGngW6kWpYvjFrlYW/4P4awDiiw6YrkAVaaSrFMk+kdcEW/8nwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684410067; a=rsa-sha256; cv=none; b=xizTDx1OqiuUfs3DnFjMOD4xD1j7VvEOixNZec4bCQFpwL2BXTQf59Gfk8ellp6OmUdC9r VHCbo1dB5cfpt5uAMNTDR0PspOdNyjUc4KTnRJJxw53n3QxRpUXZ7snbuRZv8FaPjcunto w7xr6BLtMs3g0793kGjfre3LSg/gtUuxRszRr0b7lRuEaDM3TD50ejwa7PgXGD8+MnTKF8 MawTDaMzHSkVCcbanMUJKdNKh6aX3VBtf+9Q0f32SbSbDfM5JLcZ/r7OrCPYn58yMjh9Ix kAH+6gzEc7mPwhsLeMTiGf/b6TvDnUzYwFhJmn54trN6RFXqa1cH60ifX8K7Ig== 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 4QMSjH1Tx1zkvX; Thu, 18 May 2023 11:41:07 +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 34IBf78K086801; Thu, 18 May 2023 11:41:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34IBf7Yw086800; Thu, 18 May 2023 11:41:07 GMT (envelope-from git) Date: Thu, 18 May 2023 11:41:07 GMT Message-Id: <202305181141.34IBf7Yw086800@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: ba3df3c788d0 - main - textproc/xmlstarlet: 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: ba3df3c788d068ca6cbad5e6c6735a2111194de3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba3df3c788d068ca6cbad5e6c6735a2111194de3 commit ba3df3c788d068ca6cbad5e6c6735a2111194de3 Author: Dimitry Andric AuthorDate: 2023-05-14 13:48:31 +0000 Commit: Dimitry Andric CommitDate: 2023-05-18 11:37:47 +0000 textproc/xmlstarlet: fix build with clang 16 Clang 16 has a new error about incompatible function types, which shows up when building textproc/xmlstarlet: src/xml_elem.c:271:27: 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(uniq, hash_key_put, &lines); ^~~~~~~~~~~~ /usr/local/include/libxml2/libxml/hash.h:213:22: note: passing argument to parameter 'f' here xmlHashScanner f, ^ In this case, the libxml2 callback function requires a const xmlChar pointer, so fix the parameter in the definition. PR: 271413 Approved by: portmgr (build fix blanket) MFH: 2023Q2 --- textproc/xmlstarlet/Makefile | 2 +- textproc/xmlstarlet/files/patch-src_xml__elem.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/textproc/xmlstarlet/Makefile b/textproc/xmlstarlet/Makefile index 4c5610500277..320d60ebade2 100644 --- a/textproc/xmlstarlet/Makefile +++ b/textproc/xmlstarlet/Makefile @@ -1,6 +1,6 @@ PORTNAME= xmlstarlet PORTVERSION= 1.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= SF/xmlstar/${PORTNAME}/${PORTVERSION} diff --git a/textproc/xmlstarlet/files/patch-src_xml__elem.c b/textproc/xmlstarlet/files/patch-src_xml__elem.c new file mode 100644 index 000000000000..cad7b77b790d --- /dev/null +++ b/textproc/xmlstarlet/files/patch-src_xml__elem.c @@ -0,0 +1,11 @@ +--- src/xml_elem.c.orig 2012-08-12 15:18:59 UTC ++++ src/xml_elem.c +@@ -186,7 +186,7 @@ static void + * put @name into @data->array[@data->offset] + */ + static void +-hash_key_put(void *payload, void *data, xmlChar *name) ++hash_key_put(void *payload, void *data, const xmlChar *name) + { + ArrayDest *dest = data; + dest->array[dest->offset++] = name;