From nobody Wed Jul 5 00:28:53 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 4QwgWV1tVhz4m6Wy; Wed, 5 Jul 2023 00:28:54 +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 4QwgWV1RjPz3qZV; Wed, 5 Jul 2023 00:28:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688516934; 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=QghWyQgLhDS9zJS0257mVYIG+RZrPjC/xEVtiAkQFhk=; b=JMcUrMrPVmF0GsAbuZCu81CXinMHrrKlVFT335dfIpkuO7zYNDzZ87CPisjYxfpvSqzkWw HzbHmmQSmI8XzgsXUE34ZP6G9pu2h77AXqjed0FKbn46kGVr7wJ08YQbBe8XTAuJ9yOVP5 IMF8NXYqxnkZwSdyu8jloQzsh2fNpJu6CUvdUIbIzXK5oO7ZgCSqduyl1NFmzuaGy2rUkr NMtZqo7NPzrSKKEyJ/XgWNlnVkVT21uDYz5Q31bjqF2KhVeWieoAsWMaATBdwBrINHb8FG 8RQOykCvEamN96SR6Nj/0P+mGA3XWu2k2TWQy0NvW/bwI0K7lgbaOjCAAKJtkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688516934; 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=QghWyQgLhDS9zJS0257mVYIG+RZrPjC/xEVtiAkQFhk=; b=yaaIYx71i/wfiYhQZuGGm3lLBFD2JV49x4ut1DjMEPV8RRywJqJdfHp92RqLgFNBcZ7bBG K5bpka7+M66xmkowPG5eEvTpH2u98d7F+5i6tSzt8RJvTBRoNbFnE9fsieZ4mhDBPQ/hTs O/yaHrS5q1DeqJoSTjLN1H3mAT610YZlSY6bpQoi/R7OCeX6nZIwoUv5adjI7i2Si+QhGn UjQhpxaB1w8jgHWSBu9R47Jhmab17rNuDOou8K37sYZmndkWEfYqyk+GjlM5DX1e6cDWla o2uJ+tpKzb2Wxu35vGcI9PdMv5BBPKYhnowQjilo/zZl6D9LTQJx/UXxX2BbSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688516934; a=rsa-sha256; cv=none; b=UAgg90GpAmYCWlqDNVLVBoI6s/BVoy9hAW2gkgROeqJ7CM24SucRow4ksNLNVJIgMvDORb frYtxjFMP/Llug1sqolqHOA6rHpINmcAPnKqkvkTWFc02K+jmLWC5lDXVEd+bdrqb2f3LZ 1Nwc4cPvpGeHSF2bR9U5XkCScmRH7C4ipWcSmLRsamhrsB8mTyQIak5HELMew4E6iTmoqt PvhgS69i2AIuQEd6tc5s+mFVB5CXup4+OS1Qym4272bita11wGKCmgUmNaSLM0x58n/rSR 4/k9HsZ/LmxRKz9R9pwEdX/naT1xgcOviHXjxwdhKAOygT6fZdBAktBAaGSACw== 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 4QwgWV0W2mztWt; Wed, 5 Jul 2023 00:28:54 +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 3650Sr1j009745; Wed, 5 Jul 2023 00:28:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3650SrhC009744; Wed, 5 Jul 2023 00:28:53 GMT (envelope-from git) Date: Wed, 5 Jul 2023 00:28:53 GMT Message-Id: <202307050028.3650SrhC009744@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: c279190b7d49 - main - textproc/p5-SGML-Parser-OpenSP: Fix build with Perl 5.38 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: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c279190b7d49bd4d74a2a637eb6d277424f791ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=c279190b7d49bd4d74a2a637eb6d277424f791ce commit c279190b7d49bd4d74a2a637eb6d277424f791ce Author: Yasuhiro Kimura AuthorDate: 2023-07-04 14:29:45 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-07-05 00:28:04 +0000 textproc/p5-SGML-Parser-OpenSP: Fix build with Perl 5.38 When 5.38 is default perl5 version, build of this port fails as following. --- OpenSP.c --- Warning: Found a 'CODE' section which seems to be using 'RETVAL' but no 'OUTPUT' section. in OpenSP.xs, line 1178 mv OpenSP.xsc OpenSP.c --- OpenSP.o --- c++ -c -I/usr/local/include -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -DVERSION=\"0.994\" -DXS_VERSION=\"0.994\" -DPIC -fPIC "-I/usr/local/lib/perl5/5.38/mach/CORE" -DSP_MULTI_BYTE=1 OpenSP.c c++: warning: treating 'c' input as 'c++' when in C++ mode, this behavior is deprecated [-Wdeprecated] OpenSP.xs:165:17: error: use of undeclared identifier 'uvuni_to_utf8_flags' d = uvuni_to_utf8_flags(d, s.ptr[i], 0); ^ OpenSP.xs:174:17: error: use of undeclared identifier 'uvuni_to_utf8_flags' d = uvuni_to_utf8_flags(d + SvCUR(result), s.ptr[i], 0); ^ 2 errors generated. *** [OpenSP.o] Error code 1 make[1]: stopped in /usr0/freebsd/ports/work/usr/ports/textproc/p5-SGML-Parser-OpenSP/work/SGML-Parser-OpenSP-0.994 1 error make[1]: stopped in /usr0/freebsd/ports/work/usr/ports/textproc/p5-SGML-Parser-OpenSP/work/SGML-Parser-OpenSP-0.994 ===> Compilation failed unexpectedly. Try to set MAKE_JOBS_UNSAFE=yes and rebuild before reporting the failure to the maintainer. *** Error code 1 Stop. make: stopped in /usr/ports/textproc/p5-SGML-Parser-OpenSP In the perlintern(1) man pages of perl 5.36.1, there are sentences as following. "uvuni_to_utf8_flags" "DEPRECATED!" It is planned to remove "uvuni_to_utf8_flags" from a future release of Perl. Do not use it for new code; remove it from existing code. Instead you almost certainly want to use "uvchr_to_utf8" in perlapi or "uvchr_to_utf8_flags" in perlapi. This function is a deprecated synonym for "uvoffuni_to_utf8_flags", which itself, while not deprecated, should be used only in isolated circumstances. These functions were useful for code that wanted to handle both EBCDIC and ASCII platforms with Unicode properties, but starting in Perl v5.20, the distinctions between the platforms have mostly been made invisible to most code, so this function is quite unlikely to be what you want. U8* uvuni_to_utf8_flags(U8 *d, UV uv, UV flags) So it seems planned removal finally happend with 5.38. There are two occurrences of uvuni_to_utf8_flags in OpenSP.xs. So fix build by replacing them with uvchr_to_utf8_flags. PR: 272364 Approved by: maintainer MFH: 2023Q3 --- textproc/p5-SGML-Parser-OpenSP/Makefile | 2 +- textproc/p5-SGML-Parser-OpenSP/files/patch-OpenSP.xs | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/textproc/p5-SGML-Parser-OpenSP/Makefile b/textproc/p5-SGML-Parser-OpenSP/Makefile index a99f525b25a2..e4c513bbe2ca 100644 --- a/textproc/p5-SGML-Parser-OpenSP/Makefile +++ b/textproc/p5-SGML-Parser-OpenSP/Makefile @@ -1,6 +1,6 @@ PORTNAME= SGML-Parser-OpenSP PORTVERSION= 0.994 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-SGML-Parser-OpenSP/files/patch-OpenSP.xs b/textproc/p5-SGML-Parser-OpenSP/files/patch-OpenSP.xs new file mode 100644 index 000000000000..e9bcc872bb1d --- /dev/null +++ b/textproc/p5-SGML-Parser-OpenSP/files/patch-OpenSP.xs @@ -0,0 +1,20 @@ +--- OpenSP.xs.orig 2023-07-04 14:18:21 UTC ++++ OpenSP.xs +@@ -162,7 +162,7 @@ SV* SgmlParserOpenSP::cs2sv(const SGMLApplication::Cha + { + d = m_temp; + for (i = 0; i < s.len; ++i) +- d = uvuni_to_utf8_flags(d, s.ptr[i], 0); ++ d = uvchr_to_utf8_flags(d, s.ptr[i], 0); + result = newSVpvn((const char*)m_temp, d - m_temp); + } + else +@@ -171,7 +171,7 @@ SV* SgmlParserOpenSP::cs2sv(const SGMLApplication::Cha + for (i = 0; i < s.len; ++i) + { + d = (U8 *)SvGROW(result, SvCUR(result) + UTF8_MAXLEN + 1); +- d = uvuni_to_utf8_flags(d + SvCUR(result), s.ptr[i], 0); ++ d = uvchr_to_utf8_flags(d + SvCUR(result), s.ptr[i], 0); + SvCUR_set(result, d - (U8 *)SvPVX(result)); + } + }