From nobody Sat Jul 1 17:59:22 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 4Qtg1Q4v8rz4lVVk; Sat, 1 Jul 2023 17:59:22 +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 4Qtg1Q4Fgkz443G; Sat, 1 Jul 2023 17:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688234362; 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=mdPYzocjdL9gUBZTp8Z+v96q6ghheemxXdw4Sq3aaw0=; b=o4YOedR5McMWcSWYQ0MJSmMpnwmeC8chw08ehO8V3/bwg1Epj8jiE0/cIIkjx2I1Loh2tO 5GJEm1sjOeChJzsWDgiRVGkWdS0p4S9Bd7FQG/9G9zzfKP8u76EpS1Hg2xRyONMOWVH/A4 S7hNcESk3AtPkOXAWEJbEzFODd1y64A/Gl+wTGuoYTUM3Bv/v2HmXl9KJLflpfYO1EDvXL gxnsg2FqWbGNmQzS0h+1NolQSDjDPgicyCwgk+234fXYCw6nijkKKp48lCXYni7xtrhipt zXSqMN+Y8GSq+3ldwPJdV5S06wU2+pbqt+IE/+p77vYpq1sq2jDdtB1lvnBYpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688234362; 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=mdPYzocjdL9gUBZTp8Z+v96q6ghheemxXdw4Sq3aaw0=; b=svxxd5nbnYeIJ75WZg5PX1BMnne8fY8LAFSJS5Zd+kiLGPgIA/7hwk30NRvusEbV/nHafw C8dGJbhJYRWSH885CEodDMzbxNA8ptU88UuCzgQbBsSzkXweD5lt9qQtAYaQAMpPv/d5Sy Ieuak7KfkXQ8Jqt9dxgihOopCVfeHf+f0tnIu3ragDBLpZOCVNiIJQ8SzcyL3Gp6e4obuE CPwTOS+wdsjENuVlsRHisJJwgMqNZxEZNs8mr0gWua9peZIvT5PaW49wEmDeZLZXBAGdZx +xY/SgI+dwK7CcgffohxLe4pPOtVbCoXFiafF3wxA0hteRK2vDb6HaEgrPcUpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688234362; a=rsa-sha256; cv=none; b=UTayp0KI2aWGqXG4sitwsh0er7bvxGAmcjOHY/I9q3kpcb2E3wgzMIAgS5HzDl+MBCauEX nQ9lhDNNCl/WVLRf7Zq+tbg99eVq1cxFH+Y4pS5zCFW065duriP/JU1QCZcfoOnQFBt3v9 etg64MvOFlKOOr6ufF20XSnXSeJfd7RQGrWpSbCjyz68iFcgxL/9PS8R/tO/lCk62knCDK 6TgxkZGNVJH03S9uSrCVRZlXFPGXwXpIMCYZwStsJr7yaTGw5iMjd3ykRqZ69pMtFz+Pq0 VUh9jsqkb2hHuUdEWq7PTZdaXVUTctGebs4OprspSYgdvn8NkEaR183HyuNkmA== 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 4Qtg1Q3JWczZgm; Sat, 1 Jul 2023 17:59:22 +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 361HxMh6021050; Sat, 1 Jul 2023 17:59:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 361HxMM3021049; Sat, 1 Jul 2023 17:59:22 GMT (envelope-from git) Date: Sat, 1 Jul 2023 17:59:22 GMT Message-Id: <202307011759.361HxMM3021049@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stephen Montgomery-Smith Subject: git: 624b3209c0ae - main - math/octave: Fix build. 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: stephen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 624b3209c0ae5fa34830ed0a94999197a66e2009 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=624b3209c0ae5fa34830ed0a94999197a66e2009 commit 624b3209c0ae5fa34830ed0a94999197a66e2009 Author: Stephen Montgomery-Smith AuthorDate: 2023-07-01 17:54:52 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2023-07-01 17:59:12 +0000 math/octave: Fix build. Necessitated by recent update of suitesparse. --- .../files/patch-liboctave_numeric_sparse-qr.cc | 92 ++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/math/octave/files/patch-liboctave_numeric_sparse-qr.cc b/math/octave/files/patch-liboctave_numeric_sparse-qr.cc new file mode 100644 index 000000000000..0ea48c7d50eb --- /dev/null +++ b/math/octave/files/patch-liboctave_numeric_sparse-qr.cc @@ -0,0 +1,92 @@ +--- liboctave/numeric/sparse-qr.cc.orig 2023-04-13 16:43:35 UTC ++++ liboctave/numeric/sparse-qr.cc +@@ -1786,7 +1786,7 @@ sparse_qr::sparse_qr_rep::Q (bool + OCTAVE_LOCAL_BUFFER (cs_complex_t, bvec, nr); + + for (octave_idx_type i = 0; i < nr; i++) +- bvec[i] = cs_complex_t (0.0, 0.0); ++ bvec[i] = (cs_complex_t)0; + + OCTAVE_LOCAL_BUFFER (Complex, buf, S->m2); + +@@ -1813,7 +1813,7 @@ sparse_qr::sparse_qr_rep::Q (bool + for (octave_idx_type i = 0; i < nr; i++) + vec[i+idx] = buf[i]; + +- bvec[j] = cs_complex_t (0.0, 0.0); ++ bvec[j] = (cs_complex_t)0; + } + } + +@@ -2073,7 +2073,7 @@ sparse_qr::sparse_qr_rep::tall_so + Xx[j] = b.xelem (j, i); + + for (octave_idx_type j = nr; j < S->m2; j++) +- buf[j] = cs_complex_t (0.0, 0.0); ++ buf[j] = (cs_complex_t)0; + + CXSPARSE_ZNAME (_ipvec) (S->pinv, + reinterpret_cast(Xx), +@@ -2143,7 +2143,7 @@ sparse_qr::sparse_qr_rep::wide_so + Xx[j] = b.xelem (j, i); + + for (octave_idx_type j = nr; j < nbuf; j++) +- buf[j] = cs_complex_t (0.0, 0.0); ++ buf[j] = (cs_complex_t)0; + + CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast (Xx), + buf, nr); +@@ -2206,7 +2206,7 @@ sparse_qr::sparse_qr_rep::tall_so + Xx[j] = b.xelem (j, i); + + for (octave_idx_type j = nr; j < S->m2; j++) +- buf[j] = cs_complex_t (0.0, 0.0); ++ buf[j] = (cs_complex_t)0; + + CXSPARSE_ZNAME (_ipvec) (S->pinv, + reinterpret_cast (Xx), +@@ -2304,7 +2304,7 @@ sparse_qr::sparse_qr_rep::wide_so + Xx[j] = b.xelem (j, i); + + for (octave_idx_type j = nr; j < nbuf; j++) +- buf[j] = cs_complex_t (0.0, 0.0); ++ buf[j] = (cs_complex_t)0; + + CXSPARSE_ZNAME (_pvec) (S->q, + reinterpret_cast (Xx), +@@ -2392,7 +2392,7 @@ sparse_qr::sparse_qr_rep::tall_so + octave_quit (); + + for (octave_idx_type j = nr; j < S->m2; j++) +- buf[j] = cs_complex_t (0.0, 0.0); ++ buf[j] = (cs_complex_t)0; + + CXSPARSE_ZNAME (_ipvec) (S->pinv, bvec + bidx, buf, nr); + +@@ -2460,7 +2460,7 @@ sparse_qr::sparse_qr_rep::wide_so + octave_quit (); + + for (octave_idx_type j = nr; j < nbuf; j++) +- buf[j] = cs_complex_t (0.0, 0.0); ++ buf[j] = (cs_complex_t)0; + + CXSPARSE_ZNAME (_pvec) (S->q, bvec + bidx, buf, nr); + CXSPARSE_ZNAME (_utsolve) (N->U, buf); +@@ -2522,7 +2522,7 @@ sparse_qr::sparse_qr_rep::tall_so + Xx[j] = b.xelem (j, i); + + for (octave_idx_type j = nr; j < S->m2; j++) +- buf[j] = cs_complex_t (0.0, 0.0); ++ buf[j] = (cs_complex_t)0; + + CXSPARSE_ZNAME (_ipvec) (S->pinv, + reinterpret_cast (Xx), +@@ -2620,7 +2620,7 @@ sparse_qr::sparse_qr_rep::wide_so + Xx[j] = b.xelem (j, i); + + for (octave_idx_type j = nr; j < nbuf; j++) +- buf[j] = cs_complex_t (0.0, 0.0); ++ buf[j] = (cs_complex_t)0; + + CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast(Xx), + buf, nr);