From nobody Sun Nov 03 21:03:33 2024 X-Original-To: dev-commits-ports-all@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 4XhRsK5YYMz5cq00; Sun, 03 Nov 2024 21:03:33 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhRsK4q4lz40WK; Sun, 3 Nov 2024 21:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730667813; 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=o3OPLn9nmJzEWtntcF7SJq4Z53O+46u0fRwyO9Czs5s=; b=iQ2WacwZrxe3U75nxGx8Q3Lsi3xZT0E7JI/sG6+OeZqS+jFusOCkz6nlmuN98wEtqrF29V qvf9uydF4TDXh4mKg9V1O97u39233+o6U8ZttO07yP2rMBCrFi9r4BV6y5zlWjb2j6Dlsx wlUJqGxbVzcJlrB6IPrVfgjTMDmWKmAGmRtp5+JIx2SpZ0rRT3E7YoivsxWk1E8FLjSWvl n1vquk7hd0ioHYUyxGF5F/g5k35wnQDGGkXlenIvJfi2HUg/J2fCElCz4SsoZBzQcr9KYI pxZkDRzN4k+yPoyI61CgRdiBnPdLLFAV2rRLPncKTlXFCiQvDGyRs2XLEfGDqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730667813; 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=o3OPLn9nmJzEWtntcF7SJq4Z53O+46u0fRwyO9Czs5s=; b=NfYO/Ez2QFidP0iqmebzogaAVGzW0cC6iGRMah4vKxY1wH/lpslDGOKnk/0sEA5qxcTm0d In9aoo3y+FA+EnXsQ6+s9p/QRFluxYpChRwH1FPPqW9n0Bmk1D+mEs50cFthit9qXAYvRZ L6I+5mrIzJm50KWwFMQdPJVJjJWlDIaBl4lzjmGFcUcIwgOf7veVLvA0XKgXl7XnZDexJX CfyMxs5WInT8qY4k063cta0PT/KQvrNZd2TwSl+HOQ/+6WlzUCsnWKa18qV4jm/9Vo5BP2 vXbElporb7x0Sy3SmsMHwjr43sWzy3Gz84yw/goXeFw8C/Vnf3BFoF3yBBQZ8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730667813; a=rsa-sha256; cv=none; b=OsTisYsRispzxHKKrNJ3MfhUxuiJHy48HoY1xiUf1naBRbrEuQ9BKs4x/52I8s7y0+aL/c oxRVam9S6b7AoLf8e+27wTKYuvMzAfT2BmhpnGZBekgukEKol0UwhFy96Esm1gwivKpwbP 2XE1Zvdpb8uaPmPXNT04Oj8pA8yB7DRMZeaikw1lDVgBmacIMuFJdZ0YAABx2WIP/ZY9NZ LpqaDt3kfWb9vDIPq/o0kpfkmiIq9fvbdRU9NGBrhf5ScIIFUDu5AewInEqjMNGrIHLivg WzXmBr++a8VTDncHrc7SeLUy/rf/coFhg3T37gzttZbSLyIv6DVvdYoM+pHU4w== 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 4XhRsK46Pjz157k; Sun, 3 Nov 2024 21:03:33 +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 4A3L3X7c077516; Sun, 3 Nov 2024 21:03:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A3L3XAq077513; Sun, 3 Nov 2024 21:03:33 GMT (envelope-from git) Date: Sun, 3 Nov 2024 21:03:33 GMT Message-Id: <202411032103.4A3L3XAq077513@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: f83f544c90c4 - 2024Q4 - math/openfst-vosk: fix build with clang and libc++ 19 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2024Q4 X-Git-Reftype: branch X-Git-Commit: f83f544c90c423e8c2fdcebc6242be18ca51a4c9 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=f83f544c90c423e8c2fdcebc6242be18ca51a4c9 commit f83f544c90c423e8c2fdcebc6242be18ca51a4c9 Author: Dimitry Andric AuthorDate: 2024-11-03 11:47:38 +0000 Commit: Dimitry Andric CommitDate: 2024-11-03 21:03:21 +0000 math/openfst-vosk: fix build with clang and libc++ 19 With clang and libc++ 19 math/openfst-vosk fails to compile, with errors similar to: ./../include/fst/fst.h:704:15: error: no viable overloaded '=' 704 | isymbols_ = impl.isymbols_ ? impl.isymbols_->Copy() : nullptr; | ~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/c++/v1/__memory/unique_ptr.h:231:67: note: candidate function not viable: no known conversion from 'SymbolTable *' to 'unique_ptr' for 1st argument 231 | _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(unique_ptr&& __u) _NOEXCEPT { | ^ ~~~~~~~~~~~~~~~~ /usr/include/c++/v1/__memory/unique_ptr.h:241:67: note: candidate template ignored: could not match 'unique_ptr<_Up, _Ep>' against 'SymbolTable *' 241 | _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT { | ^ /usr/include/c++/v1/__memory/unique_ptr.h:263:67: note: candidate function not viable: no known conversion from 'SymbolTable *' to 'nullptr_t' (aka 'std::nullptr_t') for 1st argument 263 | _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(nullptr_t) _NOEXCEPT { | ^ ~~~~~~~~~ /usr/include/c++/v1/__memory/unique_ptr.h:138:59: note: candidate function (the implicit copy assignment operator) not viable: no known conversion from 'SymbolTable *' to 'const unique_ptr' for 1st argument 138 | class _LIBCPP_UNIQUE_PTR_TRIVIAL_ABI _LIBCPP_TEMPLATE_VIS unique_ptr { | ^~~~~~~~~~ and: ./../include/fst/bi-table.h:330:25: error: no member named 's_' in 'VectorHashBiTable' 330 | : selector_(table.s_), | ~~~~~ ^ The first error can be fixed by using `std::unique_ptr<>::reset` instead of the assignment operator. The second error can be fixed by using the correct class member, `selector_`. PR: 282513 Approved by: yuri (maintainer) MFH: 2024Q3 (cherry picked from commit e8b22e75d75924f1f6567044252abe2a3d60078e) --- math/openfst-vosk/files/patch-src_include_fst_bi-table.h | 11 +++++++++++ math/openfst-vosk/files/patch-src_include_fst_fst.h | 13 +++++++++++++ 2 files changed, 24 insertions(+) diff --git a/math/openfst-vosk/files/patch-src_include_fst_bi-table.h b/math/openfst-vosk/files/patch-src_include_fst_bi-table.h new file mode 100644 index 000000000000..b6b8a0a22c26 --- /dev/null +++ b/math/openfst-vosk/files/patch-src_include_fst_bi-table.h @@ -0,0 +1,11 @@ +--- src/include/fst/bi-table.h.orig 2021-02-07 08:38:45 UTC ++++ src/include/fst/bi-table.h +@@ -327,7 +327,7 @@ class VectorHashBiTable { + } + + VectorHashBiTable(const VectorHashBiTable &table) +- : selector_(table.s_), ++ : selector_(table.selector_), + fp_(table.fp_), + h_(table.h_), + id2entry_(table.id2entry_), diff --git a/math/openfst-vosk/files/patch-src_include_fst_fst.h b/math/openfst-vosk/files/patch-src_include_fst_fst.h new file mode 100644 index 000000000000..ee516a070325 --- /dev/null +++ b/math/openfst-vosk/files/patch-src_include_fst_fst.h @@ -0,0 +1,13 @@ +--- src/include/fst/fst.h.orig 2021-02-07 08:38:45 UTC ++++ src/include/fst/fst.h +@@ -701,8 +701,8 @@ class FstImpl { + properties_.store(impl.properties_.load(std::memory_order_relaxed), + std::memory_order_relaxed); + type_ = impl.type_; +- isymbols_ = impl.isymbols_ ? impl.isymbols_->Copy() : nullptr; +- osymbols_ = impl.osymbols_ ? impl.osymbols_->Copy() : nullptr; ++ isymbols_.reset(impl.isymbols_ ? impl.isymbols_->Copy() : nullptr); ++ osymbols_.reset(impl.osymbols_ ? impl.osymbols_->Copy() : nullptr); + return *this; + } +