Date: Friday, August 7, 2015 @ 14:38:57 Author: ronald Revision: 243108
upgpkg: octave 4.0.0-1 update to 4.0.0 Modified: octave/trunk/PKGBUILD octave/trunk/octave.install Deleted: octave/trunk/octave-suitesparse.patch --------------------------+ PKGBUILD | 16 -- octave-suitesparse.patch | 299 --------------------------------------------- octave.install | 2 3 files changed, 7 insertions(+), 310 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-08-07 10:19:10 UTC (rev 243107) +++ PKGBUILD 2015-08-07 12:38:57 UTC (rev 243108) @@ -4,8 +4,8 @@ # Contributor : cyberdune <[email protected]> pkgname=octave -pkgver=3.8.2 -pkgrel=6 +pkgver=4.0.0 +pkgrel=1 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org"; @@ -15,19 +15,13 @@ optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting' 'qscintilla: experimental gui') -source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig} 'octave-suitesparse.patch') +source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.xz{,.sig}) options=('!emptydirs') install=octave.install -sha1sums=('02c38e0f69bce4e6dd7be7d301898347085d9c2d' - 'SKIP' - 'acbe2b6d77d6d5f7b9f6fc4019c362be36cf9452') validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton +sha1sums=('795c7ef1fb8d92f4cf9cae9eabba374a0328b1a9' + 'SKIP') -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/octave-suitesparse.patch" -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" Deleted: octave-suitesparse.patch =================================================================== --- octave-suitesparse.patch 2015-08-07 10:19:10 UTC (rev 243107) +++ octave-suitesparse.patch 2015-08-07 12:38:57 UTC (rev 243108) @@ -1,299 +0,0 @@ - -# HG changeset patch -# User John W. Eaton <[email protected]> -# Date 1411328708 14400 -# Node ID afd6179d2616bfc429a5d24f14d50f01c5e56546 -# Parent ebeb3defae373a628ccd11eba69d7bde33855cc7 -allow building with new version of SuiteSparse (bug #43063) - -* oct-sparse.h (SUITESPARSE_ASSIGN_FPTR, SUITESPARSE_ASSIGN_FPTR2): -New macros. -* amd.cc, symbfact.cc, CSparse.cc, dSparse.cc, sparse-base-chol.cc: -Use as needed. - -From Andre da Costa Barros <[email protected]>. - -diff --git a/libinterp/dldfcn/amd.cc b/libinterp/dldfcn/amd.cc ---- a/libinterp/dldfcn/amd.cc -+++ b/libinterp/dldfcn/amd.cc -@@ -164,11 +164,11 @@ - - // FIXME: how can we manage the memory allocation of amd - // in a cleaner manner? -- amd_malloc = malloc; -- amd_free = free; -- amd_calloc = calloc; -- amd_realloc = realloc; -- amd_printf = printf; -+ SUITESPARSE_ASSIGN_FPTR (malloc_func, amd_malloc, malloc); -+ SUITESPARSE_ASSIGN_FPTR (free_func, amd_free, free); -+ SUITESPARSE_ASSIGN_FPTR (calloc_func, amd_calloc, calloc); -+ SUITESPARSE_ASSIGN_FPTR (realloc_func, amd_realloc, realloc); -+ SUITESPARSE_ASSIGN_FPTR (printf_func, amd_printf, printf); - - octave_idx_type result = AMD_NAME (_order) (n_col, cidx, ridx, P, - Control, Info); -diff --git a/libinterp/dldfcn/symbfact.cc b/libinterp/dldfcn/symbfact.cc ---- a/libinterp/dldfcn/symbfact.cc -+++ b/libinterp/dldfcn/symbfact.cc -@@ -114,17 +114,17 @@ - if (spu == 0.) - { - cm->print = -1; -- cm->print_function = 0; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0); - } - else - { - cm->print = static_cast<int> (spu) + 2; -- cm->print_function =&SparseCholPrint; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint); - } - - cm->error_handler = &SparseCholError; -- cm->complex_divide = CHOLMOD_NAME(divcomplex); -- cm->hypotenuse = CHOLMOD_NAME(hypot); -+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex); -+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot); - - double dummy; - cholmod_sparse Astore; -diff --git a/liboctave/array/CSparse.cc b/liboctave/array/CSparse.cc ---- a/liboctave/array/CSparse.cc -+++ b/liboctave/array/CSparse.cc -@@ -5669,17 +5669,17 @@ - if (spu == 0.) - { - cm->print = -1; -- cm->print_function = 0; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0); - } - else - { - cm->print = static_cast<int> (spu) + 2; -- cm->print_function =&SparseCholPrint; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint); - } - - cm->error_handler = &SparseCholError; -- cm->complex_divide = CHOLMOD_NAME(divcomplex); -- cm->hypotenuse = CHOLMOD_NAME(hypot); -+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex); -+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot); - - cm->final_ll = true; - -@@ -5912,17 +5912,17 @@ - if (spu == 0.) - { - cm->print = -1; -- cm->print_function = 0; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0); - } - else - { - cm->print = static_cast<int> (spu) + 2; -- cm->print_function =&SparseCholPrint; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint); - } - - cm->error_handler = &SparseCholError; -- cm->complex_divide = CHOLMOD_NAME(divcomplex); -- cm->hypotenuse = CHOLMOD_NAME(hypot); -+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex); -+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot); - - cm->final_ll = true; - -@@ -6203,17 +6203,17 @@ - if (spu == 0.) - { - cm->print = -1; -- cm->print_function = 0; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0); - } - else - { - cm->print = static_cast<int> (spu) + 2; -- cm->print_function =&SparseCholPrint; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint); - } - - cm->error_handler = &SparseCholError; -- cm->complex_divide = CHOLMOD_NAME(divcomplex); -- cm->hypotenuse = CHOLMOD_NAME(hypot); -+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex); -+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot); - - cm->final_ll = true; - -@@ -6425,17 +6425,17 @@ - if (spu == 0.) - { - cm->print = -1; -- cm->print_function = 0; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0); - } - else - { - cm->print = static_cast<int> (spu) + 2; -- cm->print_function =&SparseCholPrint; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint); - } - - cm->error_handler = &SparseCholError; -- cm->complex_divide = CHOLMOD_NAME(divcomplex); -- cm->hypotenuse = CHOLMOD_NAME(hypot); -+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex); -+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot); - - cm->final_ll = true; - -diff --git a/liboctave/array/dSparse.cc b/liboctave/array/dSparse.cc ---- a/liboctave/array/dSparse.cc -+++ b/liboctave/array/dSparse.cc -@@ -5871,17 +5871,17 @@ - if (spu == 0.) - { - cm->print = -1; -- cm->print_function = 0; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0); - } - else - { - cm->print = static_cast<int> (spu) + 2; -- cm->print_function =&SparseCholPrint; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint); - } - - cm->error_handler = &SparseCholError; -- cm->complex_divide = CHOLMOD_NAME(divcomplex); -- cm->hypotenuse = CHOLMOD_NAME(hypot); -+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex); -+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot); - - cm->final_ll = true; - -@@ -6088,17 +6088,17 @@ - if (spu == 0.) - { - cm->print = -1; -- cm->print_function = 0; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0); - } - else - { - cm->print = static_cast<int> (spu) + 2; -- cm->print_function =&SparseCholPrint; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint); - } - - cm->error_handler = &SparseCholError; -- cm->complex_divide = CHOLMOD_NAME(divcomplex); -- cm->hypotenuse = CHOLMOD_NAME(hypot); -+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex); -+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot); - - cm->final_ll = true; - -@@ -6350,17 +6350,17 @@ - if (spu == 0.) - { - cm->print = -1; -- cm->print_function = 0; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0); - } - else - { - cm->print = static_cast<int> (spu) + 2; -- cm->print_function =&SparseCholPrint; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint); - } - - cm->error_handler = &SparseCholError; -- cm->complex_divide = CHOLMOD_NAME(divcomplex); -- cm->hypotenuse = CHOLMOD_NAME(hypot); -+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex); -+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot); - - cm->final_ll = true; - -@@ -6584,17 +6584,17 @@ - if (spu == 0.) - { - cm->print = -1; -- cm->print_function = 0; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0); - } - else - { - cm->print = static_cast<int> (spu) + 2; -- cm->print_function =&SparseCholPrint; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint); - } - - cm->error_handler = &SparseCholError; -- cm->complex_divide = CHOLMOD_NAME(divcomplex); -- cm->hypotenuse = CHOLMOD_NAME(hypot); -+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex); -+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot); - - cm->final_ll = true; - -diff --git a/liboctave/numeric/sparse-base-chol.cc b/liboctave/numeric/sparse-base-chol.cc ---- a/liboctave/numeric/sparse-base-chol.cc -+++ b/liboctave/numeric/sparse-base-chol.cc -@@ -105,17 +105,17 @@ - if (spu == 0.) - { - cm->print = -1; -- cm->print_function = 0; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, 0); - } - else - { - cm->print = static_cast<int> (spu) + 2; -- cm->print_function =&SparseCholPrint; -+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm->print_function, &SparseCholPrint); - } - - cm->error_handler = &SparseCholError; -- cm->complex_divide = CHOLMOD_NAME(divcomplex); -- cm->hypotenuse = CHOLMOD_NAME(hypot); -+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm->complex_divide, divcomplex); -+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm->hypotenuse, hypot); - - cm->final_asis = false; - cm->final_super = false; -diff --git a/liboctave/util/oct-sparse.h b/liboctave/util/oct-sparse.hz ---- a/liboctave/util/oct-sparse.h -+++ b/liboctave/util/oct-sparse.h -@@ -94,4 +94,14 @@ - #endif - #endif - -+// Cope with new suitesparse versions -+// -+#if defined (SUITESPARSE_VERSION) && SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3) -+# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (SuiteSparse_config.f_name = f_assign) -+# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (SuiteSparse_config.f_name = SuiteSparse_##f_assign) -+#else -+# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (f_var = f_assign) -+# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (f_var = CHOLMOD_NAME (f_assign)) - #endif -+ -+#endif - -diff --git a/liboctave/util/oct-sparse.h b/liboctave/util/oct-sparse.h - ---- a/liboctave/util/oct-sparse.h -+++ b/liboctave/util/oct-sparse.h -@@ -23,6 +23,8 @@ along with Octave; see the file COPYING. - #if !defined (octave_oct_sparse_h) - #define octave_oct_sparse_h 1 - -+#include <math.h> -+ - #if defined (HAVE_SUITESPARSE_AMD_H) - #include <suitesparse/amd.h> - #elif defined (HAVE_UFSPARSE_AMD_H) Modified: octave.install =================================================================== --- octave.install 2015-08-07 10:19:10 UTC (rev 243107) +++ octave.install 2015-08-07 12:38:57 UTC (rev 243108) @@ -5,6 +5,8 @@ for f in ${info_files[@]}; do install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null done + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q } post_upgrade() {
