From nobody Sat Apr 09 04:20:21 2022 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 7D7F81AA9E15; Sat, 9 Apr 2022 04:20:21 +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 4Kb23931Tgz3qRY; Sat, 9 Apr 2022 04:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649478021; 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=d4CaEQSRMAwV6DRw2/t/Q8yTktkvIKdXbSCvTqmgfaI=; b=GCGqxGvKSahpOT1EjtgXO6556QAabGlf406Q+Jsf1+bC1KVO3p2Xbaazw3wHXLEdDEZUkR zIyvC+lG0x62piL4230U+EZiYAFdWrcPQD6FWkt14m/tZa45FHIno2a8p7d2npQ1DFa5E6 SYBNaQ47vyrMJmN6Py42X5Dgo5A0ERar/Uy/85ErucwkZ/95FqLUA9ibfaEZx/z8jDYEOW OmIhA+afY6JXDklooRR8CK0SbLmlhrsdE9x10aiFDdcR3YBKQDKKsmZZUeTggb4ylMoJvv lH2YBnoTdhmQP8qAA7uysFwRey+UwVsrKyvLceeqHMIA78fAyUIXcHVV7wblbw== 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 3EC8C13182; Sat, 9 Apr 2022 04:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2394KLXv078514; Sat, 9 Apr 2022 04:20:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2394KLEw078510; Sat, 9 Apr 2022 04:20:21 GMT (envelope-from git) Date: Sat, 9 Apr 2022 04:20:21 GMT Message-Id: <202204090420.2394KLEw078510@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: 2e57a8323ce6 - main - math/octave-forge-sparsersb: Unbreak. 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: 2e57a8323ce62db7d2f2567edee0f0f1a0cc8b56 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649478021; 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=d4CaEQSRMAwV6DRw2/t/Q8yTktkvIKdXbSCvTqmgfaI=; b=hSujcxavZDrs4yz8ROKDWVZ2+i2TKV2JSWvsH2ncTA6nk5aJez4eDhqXwi7GTKQtRCW0sK Whlf43ttury4CcCgWtoEWoBvwapBN7alpKvECdf0Az2Xx4shbK5pDOKMDY42hdeco2zykt sVAFQG90Zd2Psr2oV9SwVnv2KriofrqhfaaqdGV9e+7n1YVknbQXhrhK4L3ru6VbEdbg0k xk3fxV+AuPx1YhkRPnNq090IR8RtLsF6Bxxq3o4/wcn6k9TASwR8EImncsmvdLtf7SVF2z E0YkvQ63sU/ZaA2DgmD8b8knfU6eb2QP+P75JJC2UVdWuZK/xz+YyyTQznN9/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649478021; a=rsa-sha256; cv=none; b=X6SSCCRQn+CnQ0pGdMBQ36mZ3swlIsfUgWt/g5Xr+uPthiMFOnJoK2pF5jUQ3MbYTfG9zJ u/gS6Kr94WhmwtmUTYYcTZaRhstCOE3pdiHtUYSYoEuDvNQfOkQE9LcGrDWbVOjTK++JEr Lg7QMPaLDcGdfvuTT+AxjjaEv2u0k4pmNoIcAX34o1viKeLoqxif5SvArbJk/ouXeHD4Nv KIwmPTQIXscydorO/AXODpEj32h20np5ASLzIp7rMs1CLZRgsbQMYOzMGF+R1/4uBtZ/47 lZ3PB1vjdSznf7nmA+uEumesA4purcw0ex3bXhmCGsYIxDez4IN5S+6CE0wywQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=2e57a8323ce62db7d2f2567edee0f0f1a0cc8b56 commit 2e57a8323ce62db7d2f2567edee0f0f1a0cc8b56 Author: Stephen Montgomery-Smith AuthorDate: 2022-04-09 04:19:52 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2022-04-09 04:19:52 +0000 math/octave-forge-sparsersb: Unbreak. --- math/octave-forge-sparsersb/Makefile | 2 -- .../files/patch-sparsersb.cc | 26 ++++++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/math/octave-forge-sparsersb/Makefile b/math/octave-forge-sparsersb/Makefile index fd816234b18a..40c0333b19e4 100644 --- a/math/octave-forge-sparsersb/Makefile +++ b/math/octave-forge-sparsersb/Makefile @@ -11,8 +11,6 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME} LICENSE= GPLv3 LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING -BROKEN= does not build with octave version >= 7.1.0 - LIB_DEPENDS= librsb.so:math/librsb # OCTSRC is the name of the directory of the package. diff --git a/math/octave-forge-sparsersb/files/patch-sparsersb.cc b/math/octave-forge-sparsersb/files/patch-sparsersb.cc index 4786168e30ca..720eed62cb83 100644 --- a/math/octave-forge-sparsersb/files/patch-sparsersb.cc +++ b/math/octave-forge-sparsersb/files/patch-sparsersb.cc @@ -1,6 +1,6 @@ ---- sparsersb.cc.orig 2018-06-23 19:12:49 UTC +--- sparsersb.cc.orig 2021-09-20 23:24:21 UTC +++ sparsersb.cc -@@ -97,7 +97,7 @@ +@@ -118,7 +118,7 @@ #define RSBOI_WARN( MSG ) #endif #define RSBOI_TODO( MSG ) RSBOI_WARN( MSG )/* new */ @@ -9,3 +9,25 @@ #define RSBOI_PRINTF( ... ) printf( __VA_ARGS__ ) #if RSBOI_VERBOSE +@@ -949,8 +949,8 @@ octave_value do_index_op_subsparse(const idx_vector & + if(ovl(0).issparse()) + { + SparseBoolMatrix sm = SparseBoolMatrix (ovl(0).sparse_matrix_value()); +- const octave_idx_type * ir = sm.mex_get_ir (); +- const octave_idx_type * jc = sm.mex_get_jc (); ++ const octave_idx_type * ir = sm.ridx (); ++ const octave_idx_type * jc = sm.cidx (); + const octave_idx_type nr = sm.rows (); + const octave_idx_type nc = sm.cols (); + RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG); +@@ -1242,8 +1242,8 @@ err: + if(ovl(0).issparse() && ovl(0).isreal() && rhs.isreal()) + { + const SparseBoolMatrix sm = SparseBoolMatrix (ovl(0).sparse_matrix_value()); +- const octave_idx_type * ir = sm.mex_get_ir (); +- const octave_idx_type * jc = sm.mex_get_jc (); ++ const octave_idx_type * ir = sm.ridx (); ++ const octave_idx_type * jc = sm.cidx (); + const octave_idx_type nc = sm.cols (); + RSBOI_DEBUG_NOTICE(RSBOI_D_EMPTY_MSG); + const RSBOI_T rv = rhs.double_value();