math/octave-forge-sparsersb: Unbreak.

freebsd · Apr 9, 2022 · 2e57a83 · 2e57a83
1 parent a82c4b2
commit 2e57a83
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git 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
@@ -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();