git: 438b693be17d - main - chinese/opencc: fix build with clang 19
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 16 Aug 2024 15:39:16 UTC
The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=438b693be17d522b4a9a6620b5848ae965937511 commit 438b693be17d522b4a9a6620b5848ae965937511 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2024-08-13 12:12:32 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2024-08-16 15:36:07 +0000 chinese/opencc: fix build with clang 19 Clang 19 now diagnoses incorrect member accesses, which causes chinese/opencc to fail with an error similar to: /wrkdirs/usr/ports/chinese/opencc/work/OpenCC-ver.1.1.6/src/../deps/rapidjson-1.1.0/rapidjson/document.h:319:82: error: cannot assign to non-static data member 'length' with const-qualified type 'const SizeType' (aka 'const unsigned int') 319 | GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } | ~~~~~~ ^ /wrkdirs/usr/ports/chinese/opencc/work/OpenCC-ver.1.1.6/src/../deps/rapidjson-1.1.0/rapidjson/document.h:325:20: note: non-static data member 'length' declared const here 325 | const SizeType length; //!< length of the string (excluding the trailing NULL terminator) | ~~~~~~~~~~~~~~~^~~~~~ Upstream rapidjson fixed this by removing the operator= function in https://github.com/Tencent/rapidjson/commit/3b2441b8, so pull this in as a patch and apply it. PR: 280796 Approved by: lichray@gmail.com (maintainer) MFH: 2024Q3 --- .../files/patch-deps_rapidjson-1.1.0_rapidjson_document.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/chinese/opencc/files/patch-deps_rapidjson-1.1.0_rapidjson_document.h b/chinese/opencc/files/patch-deps_rapidjson-1.1.0_rapidjson_document.h new file mode 100644 index 000000000000..00524a9d8445 --- /dev/null +++ b/chinese/opencc/files/patch-deps_rapidjson-1.1.0_rapidjson_document.h @@ -0,0 +1,11 @@ +--- deps/rapidjson-1.1.0/rapidjson/document.h.orig 2022-12-08 07:44:48 UTC ++++ deps/rapidjson-1.1.0/rapidjson/document.h +@@ -316,8 +316,6 @@ struct GenericStringRef { + + GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {} + +- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } +- + //! implicit conversion to plain CharType pointer + operator const Ch *() const { return s; } +