aboutsummaryrefslogtreecommitdiff
path: root/math/scilab/files
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2021-07-20 20:49:57 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2021-07-23 11:05:29 +0000
commitc1a14b441f38e3fc8f713bb3f75e24d1be6eb198 (patch)
treefe8cc95782b9fb77ca88c8532158683309ee6000 /math/scilab/files
parent1b994585643fc17ef49e7c403a67dc19dfd3b886 (diff)
downloadports-c1a14b441f38e3fc8f713bb3f75e24d1be6eb198.tar.gz
ports-c1a14b441f38e3fc8f713bb3f75e24d1be6eb198.zip
math/scilab: Update to 6.1.1
- Drop stale patches - Add missing deps after math/suitesparse* split Changes: https://help.scilab.org/docs/6.1.1/en_US/CHANGES.html
Diffstat (limited to 'math/scilab/files')
-rw-r--r--math/scilab/files/patch-fnocommon30
-rw-r--r--math/scilab/files/patch-modules_core_src_cpp_hash_hash.hxx11
-rw-r--r--math/scilab/files/patch-modules_matio_src_cpp_GetSparseVariable.cpp20
3 files changed, 11 insertions, 50 deletions
diff --git a/math/scilab/files/patch-fnocommon b/math/scilab/files/patch-fnocommon
deleted file mode 100644
index 5481c29c53a4..000000000000
--- a/math/scilab/files/patch-fnocommon
+++ /dev/null
@@ -1,30 +0,0 @@
---- modules/tclsci/src/c/TCL_Command.c.orig 2020-02-25 10:00:14 UTC
-+++ modules/tclsci/src/c/TCL_Command.c
-@@ -38,6 +38,12 @@ int TclInterpReturn;
- // Global Tcl Return Result.
- char * TclInterpResult;
-
-+/* The tclLoop thread Id
-+in order to wait it ends when closing Scilab */
-+__threadId TclThread;
-+__threadSignal InterpReady;
-+__threadSignalLock InterpReadyLock;
-+
- // Single execution
- __threadLock singleExecutionLock;
-
---- modules/tclsci/src/c/TCL_Command.h.orig 2020-02-25 10:00:14 UTC
-+++ modules/tclsci/src/c/TCL_Command.h
-@@ -85,9 +85,9 @@ char *getTclCommandResult(void);
-
- /* The tclLoop thread Id
- in order to wait it ends when closing Scilab */
--__threadId TclThread;
-+extern __threadId TclThread;
-
--__threadSignal InterpReady;
--__threadSignalLock InterpReadyLock;
-+extern __threadSignal InterpReady;
-+extern __threadSignalLock InterpReadyLock;
-
- #endif /* !__TCL_COMMAND_H__ */
diff --git a/math/scilab/files/patch-modules_core_src_cpp_hash_hash.hxx b/math/scilab/files/patch-modules_core_src_cpp_hash_hash.hxx
new file mode 100644
index 000000000000..cf0e7b96b657
--- /dev/null
+++ b/math/scilab/files/patch-modules_core_src_cpp_hash_hash.hxx
@@ -0,0 +1,11 @@
+--- modules/core/src/cpp/hash/hash.hxx.orig 2021-07-15 11:55:00 UTC
++++ modules/core/src/cpp/hash/hash.hxx
+@@ -7,7 +7,7 @@
+ #pragma once
+
+ #ifndef _MSC_VER
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ #include <machine/endian.h>
+ #else
+ #include <endian.h>
diff --git a/math/scilab/files/patch-modules_matio_src_cpp_GetSparseVariable.cpp b/math/scilab/files/patch-modules_matio_src_cpp_GetSparseVariable.cpp
deleted file mode 100644
index fd9c297f40e5..000000000000
--- a/math/scilab/files/patch-modules_matio_src_cpp_GetSparseVariable.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- modules/matio/src/cpp/GetSparseVariable.cpp.orig 2020-02-25 10:00:03 UTC
-+++ modules/matio/src/cpp/GetSparseVariable.cpp
-@@ -65,7 +65,7 @@ matvar_t* GetSparseMatVar(types::Sparse* pSparse, cons
- int* itemsRow = new int[pSparse->getRows()];
- pSparse->getNbItemByRow(itemsRow);
-
-- int* colIndexes = (int*)MALLOC(sizeof(int) * (pSparse->getRows() + 1));
-+ mat_uint32_t* colIndexes = (mat_uint32_t*)MALLOC(sizeof(mat_uint32_t) * (pSparse->getRows() + 1));
- if (colIndexes == NULL)
- {
- FREE(sparseData);
-@@ -82,7 +82,7 @@ matvar_t* GetSparseMatVar(types::Sparse* pSparse, cons
- colIndexes[K + 1] = colIndexes[K] + itemsRow[K];
- }
-
-- int* rowIndexes = (int*)MALLOC(sizeof(int) * nonZeros);
-+ mat_uint32_t* rowIndexes = (mat_uint32_t*)MALLOC(sizeof(mat_uint32_t) * nonZeros);
- if (rowIndexes == NULL)
- {
- FREE(sparseData);