From nobody Tue May 23 14:16:18 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 4QQbw24CBzz4CXQK; Tue, 23 May 2023 14:16:18 +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 4QQbw23hQmz42MB; Tue, 23 May 2023 14:16:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684851378; 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=RzlCL234YhQzOLvk1zR4XDnzvFC5LHLiKSPGMYtuhr8=; b=fvniZeWgVYrRKZM7o7ir+mDK06DlKSP6BiPEmoX6ZZV4Zlo4YzsCfGXR5qtcEOzlcRKr8v l1l6P40j1+NtDStsbLccqxntDBRia2sNP8ftFEb1pAGKokgJ2yf54AiFJiKwxqUzqkGrLy AQORmRa3nijgdbGrwVLj1NxHdopbtCmP5NWmIh+vsJ34ErSFhSdIQwY8qWKLc0IpsR7mSY qa5Z14XgxPSJQb5bWc0Yaw67ioRPAPiuP1qWOytO26MxdmNCw4uWt4bp1ZulpDuWamGgvl janAxDzTbk7JdgGry/8m9XiltAahR+IEsDQ5Wi8sk7bzKpMDViRRsIWrt77KBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684851378; 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=RzlCL234YhQzOLvk1zR4XDnzvFC5LHLiKSPGMYtuhr8=; b=u2dt4QD8vJFZzTeRYc3af3co0/S/6Cc4gbRR2iEPpMsxRe30BAgsS2ZijZ+VUn8DUZi+wa esG3UZXRFM0Fqsf1dWxJ9KM/tC5L+tmMjL6SO/Olx5OHY8e/vf+OS/uk11goah56+OFMYL ePgySKRf4hUee3epZZfJSJG5Xi6R20UckCfTPMZrzM6zNRk7LhZxg9YibYqrNhKT9WOUY5 got9Agf4LdH4tBCHGxN8DcqjuvqYROY06sMOOFgMOTB1fkqoRqQSXBGiFHiTjNBg+TYJjS t3qUkpaY2nCId/N6EK07nOiPJufgGFOhqoO/4vRDT4BkEQ6Yyy3xm9qw9C2k5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684851378; a=rsa-sha256; cv=none; b=N8zWHKF7nh2/N4q2ou8/KGlzHFZGORKZoYplZ0U6CDel8rSJis9240wYH1UMZQxG8CI/NR k7jqJx8bgZKQrPDMDqkKh/CKnrTYyEnMQhXt0ARKyYCwn+Ti1rhQanG3SBB0oru+PlkyX+ T3Ad611nw0VV7GZdkTzKjc3JXY3TImuyPgOE2Ie31nMSSFL4mjm+WQAsf01blC2E3s+T3f Osio6OtwckWrgbnK3pOYqOLG1aI+s7HkICLum8PcPDZ4Bab1v8dkTLAXukesBTRo+YTRY5 NAC2R/kxe+BTSmPUn/ZrNbRvFCkWu4CwsJWaoqmLPf0IjmsIyx8ejYR6rOxqYg== 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 4QQbw22mHPz13PH; Tue, 23 May 2023 14:16:18 +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 34NEGI5u099280; Tue, 23 May 2023 14:16:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34NEGIdc099279; Tue, 23 May 2023 14:16:18 GMT (envelope-from git) Date: Tue, 23 May 2023 14:16:18 GMT Message-Id: <202305231416.34NEGIdc099279@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: 98fd17ab866a - main - devel/py-ruamel.yaml.clib: 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: 98fd17ab866a916691388b5f6e801586329b9ba6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=98fd17ab866a916691388b5f6e801586329b9ba6 commit 98fd17ab866a916691388b5f6e801586329b9ba6 Author: Dimitry Andric AuthorDate: 2023-05-20 14:30:54 +0000 Commit: Dimitry Andric CommitDate: 2023-05-23 14:15:16 +0000 devel/py-ruamel.yaml.clib: fix build with clang 16 Clang 16 has a new error about incompatible function types, which shows up when building devel/py-ruamel.yaml.clib: _ruamel_yaml.c:3590:52: error: incompatible function pointer types passing 'int (void *, char *, int, int *)' to parameter of type 'yaml_read_handler_t *' (aka 'int (*)(void *, unsigned char *, unsigned long, unsigned long *)') [-Wincompatible-function-pointer-types] yaml_parser_set_input((&__pyx_v_self->parser), __pyx_f_12_ruamel_yaml_input_handler, ((void *)__pyx_v_self)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ _ruamel_yaml.c:15301:53: error: incompatible function pointer types passing 'int (void *, char *, int)' to parameter of type 'yaml_write_handler_t *' (aka 'int (*)(void *, unsigned char *, unsigned long)') [-Wincompatible-function-pointer-types] yaml_emitter_set_output((&__pyx_v_self->emitter), __pyx_f_12_ruamel_yaml_output_handler, ((void *)__pyx_v_self)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ It seems that _ruamel_yaml.c was originally generated from a rather old yaml.h interface header. I have looked upstream but it has not been updated there either, so for now patch the function signatures to match what is in our textproc/libyaml port. PR: 271531 Approved by: sunpoet (maintainer) MFH: 2023Q2 --- devel/py-ruamel.yaml.clib/Makefile | 1 + devel/py-ruamel.yaml.clib/files/patch-clang16 | 31 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/devel/py-ruamel.yaml.clib/Makefile b/devel/py-ruamel.yaml.clib/Makefile index cc913627101e..1963baa995d2 100644 --- a/devel/py-ruamel.yaml.clib/Makefile +++ b/devel/py-ruamel.yaml.clib/Makefile @@ -1,5 +1,6 @@ PORTNAME= ruamel.yaml.clib PORTVERSION= 0.2.7 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-ruamel.yaml.clib/files/patch-clang16 b/devel/py-ruamel.yaml.clib/files/patch-clang16 new file mode 100644 index 000000000000..c004325bd508 --- /dev/null +++ b/devel/py-ruamel.yaml.clib/files/patch-clang16 @@ -0,0 +1,31 @@ +--- _ruamel_yaml.c.orig 2022-10-20 06:59:47 UTC ++++ _ruamel_yaml.c +@@ -1553,8 +1553,8 @@ static PyTypeObject *__pyx_ptype_12_ruamel_yaml_CEmitt + static PyTypeObject *__pyx_ptype_12_ruamel_yaml_Mark = 0; + static PyTypeObject *__pyx_ptype_12_ruamel_yaml_CParser = 0; + static PyTypeObject *__pyx_ptype_12_ruamel_yaml_CEmitter = 0; +-static int __pyx_f_12_ruamel_yaml_input_handler(void *, char *, int, int *); /*proto*/ +-static int __pyx_f_12_ruamel_yaml_output_handler(void *, char *, int); /*proto*/ ++static int __pyx_f_12_ruamel_yaml_input_handler(void *, unsigned char *, size_t, size_t *); /*proto*/ ++static int __pyx_f_12_ruamel_yaml_output_handler(void *, unsigned char *, size_t); /*proto*/ + static PyObject *__pyx_f_12_ruamel_yaml___pyx_unpickle_Mark__set_state(struct __pyx_obj_12_ruamel_yaml_Mark *, PyObject *); /*proto*/ + #define __Pyx_MODULE_NAME "_ruamel_yaml" + extern int __pyx_module_is_main__ruamel_yaml; +@@ -14551,7 +14551,7 @@ static PyObject *__pyx_pf_12_ruamel_yaml_7CParser_30__ + * parser = data + */ + +-static int __pyx_f_12_ruamel_yaml_input_handler(void *__pyx_v_data, char *__pyx_v_buffer, int __pyx_v_size, int *__pyx_v_read) { ++static int __pyx_f_12_ruamel_yaml_input_handler(void *__pyx_v_data, unsigned char *__pyx_v_buffer, size_t __pyx_v_size, size_t *__pyx_v_read) { + struct __pyx_obj_12_ruamel_yaml_CParser *__pyx_v_parser = 0; + PyObject *__pyx_v_value = NULL; + int __pyx_r; +@@ -23430,7 +23430,7 @@ static PyObject *__pyx_pf_12_ruamel_yaml_8CEmitter_16_ + * emitter = data + */ + +-static int __pyx_f_12_ruamel_yaml_output_handler(void *__pyx_v_data, char *__pyx_v_buffer, int __pyx_v_size) { ++static int __pyx_f_12_ruamel_yaml_output_handler(void *__pyx_v_data, unsigned char *__pyx_v_buffer, size_t __pyx_v_size) { + struct __pyx_obj_12_ruamel_yaml_CEmitter *__pyx_v_emitter = 0; + PyObject *__pyx_v_value = NULL; + int __pyx_r;