From nobody Sun Jul 09 21:37:38 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 4QzgTb1wSpz4mj37; Sun, 9 Jul 2023 21:37:39 +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 4QzgTb1H7Nz3kgT; Sun, 9 Jul 2023 21:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688938659; 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=zhuX4v3z7DSC1GXC1J+X9bQdclmmyZ74thsYDz5c3mo=; b=TQl9jSym8+RYXrBf8iUzk4hs0CVL+D2KOI6tkpm73RO5NhXg6VUwMPqpVGLBXDQ+ytGAaP jXqtLhU4/QqNWz56J8UfStArBHlD91dszV+7YHvDnn8PJPf/Aci3qY4v1Z62waVpwf0u7I eUBnbbrL5K2Zam6ZQ+YDcqZV2JrQYCTSoSutGoAoVWVN3eusRCQqTlzXLeBVsL6WkqtnrN O1mfCfJ5UQrpkPu2sIEo7KoZexMAmwNQwDeqLrOpANZA7BzODdgdx732jogw5srXndct11 jqGBQArzrlHio+G05gf6xfExYfyczJ7ZO4C+W8fU5CCqnjC+I529cO1GMh3Skw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688938659; 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=zhuX4v3z7DSC1GXC1J+X9bQdclmmyZ74thsYDz5c3mo=; b=RgNX9LgE9AI+VSHKSnRGELKesSkguAdlGc2LO1o8CXCJh28qS9aRLzaPhA8vUCjJEuAxQl wqHrHMog7sAJazEv5uUL3LE0KRVwQyP5wp1pXdyjYos/1fWwwb4qoOxpsFY7tR+eqN+2NY R0W0vROWhI+THcvJOu+5LwloCtsjIB08vFFZwkfkRk5Amjluc1L5jbyq8eamexF+g0u0W6 UqVTrUGEiym16938WtSVwrYjJuSsy8nhfFikPS0EdMtq8BrzMJR/avNftdrMXJ5X3wo5/O X8nvIyqUN2wknJuQyDoz7KgyULHlXYKsgtKpsdqJIVhpGg07Rzv7gQeVqssR7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688938659; a=rsa-sha256; cv=none; b=PXTUSRGatCQ83/RrRs/ygmCdWu2CX+NtbzYZg3UZzETC0aNJsJ6UhCRaaVHro2wJJ9z71k RlXTvmdDU5/4lYTvYWXHoJX3Jb5SKjYxyRcKiGcV8bqIrzcGr7pEQhqIg/odpJi/X7R0kU RjizT+0+eQgJgYaOAuN3gXPDWFaiU8m0Q8T/AXjMjTX0+IB0WPXrQ8vTtwRO899NPLyrY7 RGQCse0F32keZRvUHgKQxQx31TSUGpD0qjwgzisMLp8T3Jpt6vVeSnP7vbhuznqmHzaSw1 eKOU3SNjxNrNe3DNNM1SmzIybkYr729dDvVs8K9WEy9AeFUA2zH5yDVZfTZZ2A== 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 4QzgTb0N26zK1L; Sun, 9 Jul 2023 21:37: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 369LbcAP070933; Sun, 9 Jul 2023 21:37:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369LbcWH070932; Sun, 9 Jul 2023 21:37:38 GMT (envelope-from git) Date: Sun, 9 Jul 2023 21:37:38 GMT Message-Id: <202307092137.369LbcWH070932@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 7e59982ac623 - main - x11-fonts/afdko: Fix build with Clang 16 and remove the workaround 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e59982ac623f96767eabe6e4ddc8b2e578f940a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e59982ac623f96767eabe6e4ddc8b2e578f940a commit 7e59982ac623f96767eabe6e4ddc8b2e578f940a Author: Po-Chuan Hsieh AuthorDate: 2023-07-09 21:23:39 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-07-09 21:34:20 +0000 x11-fonts/afdko: Fix build with Clang 16 and remove the workaround /wrkdirs/usr/ports/x11-fonts/afdko/work/afdko-3.9.6/c/shared/source/tx_shared/tx_shared.c:526:20: error: incompatible function pointer types assigning to 'size_t (*)(ctlStreamCallbacks *, void *, char **)' (aka 'unsigned long (*)(struct ctlStreamCallbacks_ *, void *, char **)') from 'size_t (ctlStreamCallbacks *, Stream *, char **)' (aka 'unsigned long (struct ctlStreamCallbacks_ *, Stream *, char **)') [-Wincompatible-function-pointer-types] h->cb.stm.read = stm_read; ^ ~~~~~~~~ /wrkdirs/usr/ports/x11-fonts/afdko/work/afdko-3.9.6/c/shared/source/tx_shared/tx_shared.c:527:24: error: incompatible function pointer types assigning to 'size_t (*)(ctlStreamCallbacks *, void *, xmlDocPtr *)' (aka 'unsigned long (*)(struct ctlStreamCallbacks_ *, void *, struct _xmlDoc **)') from 'size_t (ctlStreamCallbacks *, Stream *, xmlDocPtr *)' (aka 'unsigned long (struct ctlStreamCallbacks_ *, Stream *, struct _xmlDoc **)') [-Wincompatible-function-pointer-types] h->cb.stm.xml_read = stm_xml_read; ^ ~~~~~~~~~~~~ 2 errors generated. --- x11-fonts/afdko/Makefile | 6 ------ x11-fonts/afdko/files/patch-clang16 | 13 +++++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/x11-fonts/afdko/Makefile b/x11-fonts/afdko/Makefile index 6d3064c76d80..2ace93500dbb 100644 --- a/x11-fonts/afdko/Makefile +++ b/x11-fonts/afdko/Makefile @@ -14,10 +14,4 @@ USE_GNOME= libxml2 CMAKE_OFF= SKBUILD -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 -CFLAGS+= -Wno-error=incompatible-function-pointer-types -.endif - .include diff --git a/x11-fonts/afdko/files/patch-clang16 b/x11-fonts/afdko/files/patch-clang16 new file mode 100644 index 000000000000..63fb8afe7412 --- /dev/null +++ b/x11-fonts/afdko/files/patch-clang16 @@ -0,0 +1,13 @@ +--- c/shared/source/tx_shared/tx_shared.c.orig 2023-06-13 21:30:33 UTC ++++ c/shared/source/tx_shared/tx_shared.c +@@ -523,8 +523,8 @@ void stmInit(txCtx h) { + h->cb.stm.open = stm_open; + h->cb.stm.seek = stm_seek; + h->cb.stm.tell = stm_tell; +- h->cb.stm.read = stm_read; +- h->cb.stm.xml_read = stm_xml_read; ++ h->cb.stm.read = (size_t (*)(ctlStreamCallbacks *, void *, char **)) stm_read; ++ h->cb.stm.xml_read = (size_t (*)(ctlStreamCallbacks *, void *, xmlDocPtr *)) stm_xml_read; + h->cb.stm.write = stm_write; + h->cb.stm.status = stm_status; + h->cb.stm.close = stm_close;