diff options
| author | Kyle Guinn <elyk03@gmail.com> | 2014-03-28 12:27:59 -0500 |
|---|---|---|
| committer | Erik Hanson <erik@slackbuilds.org> | 2014-04-12 13:59:47 -0500 |
| commit | a4817c984eb33b8ad06ace78e79c8e54159ac261 (patch) | |
| tree | 1ae093bcdae4e3fa08b2f079138867d470e71b98 /academic/octave/patches | |
| parent | e7695c5163dc2e7abd8e1b8e49a0e47604ca3958 (diff) | |
academic/octave: Updated for version 3.8.1.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'academic/octave/patches')
| -rw-r--r-- | academic/octave/patches/compressed-info.diff | 13 | ||||
| -rw-r--r-- | academic/octave/patches/no-qt5.diff | 2 | ||||
| -rw-r--r-- | academic/octave/patches/umfpack-cppflags.diff | 31 |
3 files changed, 1 insertions, 45 deletions
diff --git a/academic/octave/patches/compressed-info.diff b/academic/octave/patches/compressed-info.diff deleted file mode 100644 index 48178d773f1e9..0000000000000 --- a/academic/octave/patches/compressed-info.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scripts/help/doc.m b/scripts/help/doc.m ---- a/scripts/help/doc.m -+++ b/scripts/help/doc.m -@@ -80,7 +80,8 @@ - if (err < 0) - info_file_name = info_file (); - -- if (! exist (info_file_name, "file")) -+ if (! exist (info_file_name, "file") -+ && ! exist ([info_file_name ".gz"], "file")) - __gripe_missing_component__ ("doc", "info-file"); - endif - endif diff --git a/academic/octave/patches/no-qt5.diff b/academic/octave/patches/no-qt5.diff index 48044ef831db9..8da1234a9a69f 100644 --- a/academic/octave/patches/no-qt5.diff +++ b/academic/octave/patches/no-qt5.diff @@ -1,7 +1,7 @@ diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac -@@ -2707,10 +2707,10 @@ +@@ -2745,10 +2745,10 @@ fi if test $build_gui = yes; then diff --git a/academic/octave/patches/umfpack-cppflags.diff b/academic/octave/patches/umfpack-cppflags.diff deleted file mode 100644 index d56ba1f8ebdf5..0000000000000 --- a/academic/octave/patches/umfpack-cppflags.diff +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -1512,7 +1512,9 @@ - - if test -n "$UMFPACK_LIBS"; then - ## SuiteSparse >= 4.0 needs additional link library for SuiteSparse_time() -+ save_CPPFLAGS="$CPPFLAGS" - save_LIBS="$LIBS"; -+ CPPFLAGS="$UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CPPFLAGS" - LIBS="$UMFPACK_LIBS $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" - xtra_libs= - OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME -@@ -1535,13 +1537,17 @@ - esac - fi - LIBS="$save_LIBS" -+ CPPFLAGS="$save_CPPFLAGS" - - ## Check for UMFPACK separately split complex matrix and RHS. - if test -n "$UMFPACK_LIBS"; then -+ save_CPPFLAGS="$CPPFLAGS" - save_LIBS="$LIBS"; -+ CPPFLAGS="$UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CPPFLAGS" - LIBS="$UMFPACK_LIBS $CHOLMOD_LDFLAGS $CHOLMOD_LIBS $AMD_LDFLAGS $AMD_LIBS $COLAMD_LDFLAGS $COLAMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs" - OCTAVE_UMFPACK_SEPARATE_SPLIT - LIBS="$save_LIBS" -+ CPPFLAGS="$save_CPPFLAGS" - fi - fi - |