From nobody Fri Aug 16 15:44:50 2024 X-Original-To: dev-commits-ports-branches@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 4WlmX304qYz5T7mR; Fri, 16 Aug 2024 15:44:51 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlmX246JGz4f5T; Fri, 16 Aug 2024 15:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723823090; 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=skucO3hWizjXY490AWHic+l4FOJxIKVdDPw2SNPSSKg=; b=dwvAixxfGbNUPnjSslYgl3aRcOjVjsCnYvT4UEF1NmECQWfHsxyBeOHqweXRinyDmTpzEi Vbq8RtAcnXBHCRfTGAMss54kKmy2VAgznGXw12NsWJ/PNq7gY/IrfV9pICS+msj4BjTNyR zp+FG5aliZefIpgdeB3RAqXbpdR3Vb8DrSbI1oZLPg8tHa/Cr4K5e+SdyAnu5iEk38lbwP gLUWUR4JLQqjJJW1EHC8MfEtCPi4OPUg4bykY45R3Pq5Wod22dIrH5rrAHa+zGUci4S4VW v7q9xFAFWlYZMuDWd8iYL4EWtMjJIFLzqdu9tuB7leakNYW+4KUWCF5d9CZn1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723823090; a=rsa-sha256; cv=none; b=aHRSyeloMxxUcmbxS8nyfuxTBbZFYWJdCj2LSUG+7ryGYV35wJyOi/nSCySAuLzT9Q0MCA uhPjxxFmELZgWCLxVb5zEhL18kdGD2vEZ12CiONjTQpmcx2zs0EFus4QMeiBz6OapXzvlp OvKNVclBSjX+OGhquX+9rA+GIMVQaqWY4dgjIiSmISfzPVTbfLOKwmD0VZfmFPPfgZIJUM wwfMSdNKmDo7KjPRwlsd87uw+51bscHfIG3siNgmJRiYnoXAYw62950E59uEas2rpdvawb fQ3x7pUpi+YEKSWIdr3mpIE5pXmU/DObCsf87qJm+iEAoDppKmeOOqFUXZGhEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723823090; 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=skucO3hWizjXY490AWHic+l4FOJxIKVdDPw2SNPSSKg=; b=YRRueWJmXZG+BFm0ItWb7ffU+2s2yoliPl0FiPKCvoSWWZ04fOmfP7usPps4lwVtZeovfs ekhVonDUhGUOkWgm6o+J9SFej8msmiURKIVrM2Acmj4cT+YqBF9ZBDwqsWz21job0ZAcHQ 0TXQiodoUSRNusivvmTy62Z5wvFEDuBXroKQoGae51GZ5R3J48N4RrTBFddEQbc6gA9P0O Sa76zq0+FbujGPaANo9f8tDw496z0M2lOzv+1MZeQpzTY7Q92m38Lv8lE1uadN34z4/53k O4WinWh3W6wfnxsH8UmdThmQXo7qt2VWuVv9tXczthyroCavHOxV/dzF2TrRiQ== 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 4WlmX238mDz1BRS; Fri, 16 Aug 2024 15:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47GFioGO096060; Fri, 16 Aug 2024 15:44:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47GFioci096057; Fri, 16 Aug 2024 15:44:50 GMT (envelope-from git) Date: Fri, 16 Aug 2024 15:44:50 GMT Message-Id: <202408161544.47GFioci096057@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 119f5ebf6044 - 2024Q3 - chinese/opencc: fix build with clang 19 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q3 X-Git-Reftype: branch X-Git-Commit: 119f5ebf6044f8c5333e1e8e1671532dd057eb17 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=119f5ebf6044f8c5333e1e8e1671532dd057eb17 commit 119f5ebf6044f8c5333e1e8e1671532dd057eb17 Author: Dimitry Andric AuthorDate: 2024-08-13 12:12:32 +0000 Commit: Dimitry Andric CommitDate: 2024-08-16 15:44:23 +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 (cherry picked from commit 438b693be17d522b4a9a6620b5848ae965937511) --- .../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; } +