[arch-commits] Commit in octave/repos (3 files)

2020-12-16 Thread Antonio Rojas via arch-commits
Date: Thursday, December 17, 2020 @ 07:17:53
  Author: arojas
Revision: 777093

archrelease: copy trunk to community-staging-x86_64

Added:
  octave/repos/community-staging-x86_64/
  octave/repos/community-staging-x86_64/PKGBUILD
(from rev 777092, octave/trunk/PKGBUILD)
  octave/repos/community-staging-x86_64/octave-sundials4.patch
(from rev 777092, octave/trunk/octave-sundials4.patch)

+
 PKGBUILD   |   52 
 octave-sundials4.patch |  599 +++
 2 files changed, 651 insertions(+)

Copied: octave/repos/community-staging-x86_64/PKGBUILD (from rev 777092, 
octave/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-12-17 07:17:53 UTC (rev 777093)
@@ -0,0 +1,52 @@
+# Maintainer: Ronald van Haren 
+# Contributor : shining 
+# Contributor : cyberdune 
+
+pkgname=octave
+pkgver=5.2.0
+pkgrel=7
+pkgdesc="A high-level language, primarily intended for numerical computations."
+arch=('x86_64')
+url="https://www.gnu.org/software/octave/;
+license=('GPL')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'arpack' 'glu' 
'ghostscript'
+  'sundials' 'gl2ps' 'qscintilla-qt5' 'libsndfile' 'qt5-tools' 
'qrupdate')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'fltk' 'portaudio' 'jdk8-openjdk')
+optdepends=('texinfo: for help-support in octave'
+'gnuplot: alternative plotting'
+'portaudio: audio support'
+'java-runtime: java support'
+'fltk: FLTK GUI')
+source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
+octave-sundials4.patch)
+options=('!emptydirs')
+validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
+sha512sums=('fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498'
+'SKIP'
+
'4b743602e8ca91e8be8dab69e09d3e476e9edd867b2eb0b9816fbe4ca344a16bff7a413c2e89b0c9fb769f4a815a696c4d67b70282b7e4fe8c24598bcce90d34')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../octave-sundials4.patch # Fix sundials support 
https://savannah.gnu.org/bugs/?52475
+  autoreconf -vif
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --libexecdir=/usr/lib \
+--enable-shared --disable-static \
+--with-quantum-depth=16 \
+--with-sundials_ida="-lsundials_ida -lsundials_sunlinsolklu"
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # add octave library path to ld.so.conf.d
+  install -d "${pkgdir}/etc/ld.so.conf.d"
+  echo "/usr/lib/${pkgname}/${pkgver}" > 
"${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
+}

Copied: octave/repos/community-staging-x86_64/octave-sundials4.patch (from rev 
777092, octave/trunk/octave-sundials4.patch)
===
--- community-staging-x86_64/octave-sundials4.patch 
(rev 0)
+++ community-staging-x86_64/octave-sundials4.patch 2020-12-17 07:17:53 UTC 
(rev 777093)
@@ -0,0 +1,599 @@
+# HG changeset patch
+# User Bill Greene 
+# Date 1550229868 -3600
+#  Fri Feb 15 12:24:28 2019 +0100
+# Node ID 4bf27c090f5695bcf545fc4af15e2a61a3941d46
+# Parent  f034b29320ad5034ad5c66480f64411e9d773440
+Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
+
+* libinterp/dldfcn/__ode15__.cc : use SUNDIALS API version 3.x
+
+diff --git a/libinterp/dldfcn/__ode15__.cc b/libinterp/dldfcn/__ode15__.cc
+--- a/libinterp/dldfcn/__ode15__.cc
 b/libinterp/dldfcn/__ode15__.cc
+@@ -1,6 +1,7 @@
+ /*
+ 
+ Copyright (C) 2016-2019 Francesco Faccio 
++Copyright (C) 2019 William Greene 
+ 
+ This file is part of Octave.
+ 
+@@ -112,7 +113,8 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (nullptr),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (nullptr), jacfun (nullptr), jacspfun 
(nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+@@ -122,11 +124,17 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (ida_fcn),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (daefun), jacfun (nullptr), jacspfun (nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+-~IDA (void) { IDAFree (); }
++~IDA (void)
++{
++  IDAFree ();
++  SUNLinSolFree(sunLinearSolver);
++  SUNMatDestroy(sunJacMatrix);
++}
+ 
+ IDA&
+ set_jacobian 

[arch-commits] Commit in octave/repos (3 files)

2020-11-02 Thread Antonio Rojas via arch-commits
Date: Tuesday, November 3, 2020 @ 07:57:03
  Author: arojas
Revision: 740404

archrelease: copy trunk to community-staging-x86_64

Added:
  octave/repos/community-staging-x86_64/
  octave/repos/community-staging-x86_64/PKGBUILD
(from rev 740403, octave/trunk/PKGBUILD)
  octave/repos/community-staging-x86_64/octave-sundials4.patch
(from rev 740403, octave/trunk/octave-sundials4.patch)

+
 PKGBUILD   |   52 
 octave-sundials4.patch |  599 +++
 2 files changed, 651 insertions(+)

Copied: octave/repos/community-staging-x86_64/PKGBUILD (from rev 740403, 
octave/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-11-03 07:57:03 UTC (rev 740404)
@@ -0,0 +1,52 @@
+# Maintainer: Ronald van Haren 
+# Contributor : shining 
+# Contributor : cyberdune 
+
+pkgname=octave
+pkgver=5.2.0
+pkgrel=6
+pkgdesc="A high-level language, primarily intended for numerical computations."
+arch=('x86_64')
+url="https://www.gnu.org/software/octave/;
+license=('GPL')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'arpack' 'glu' 
'ghostscript'
+  'sundials' 'gl2ps' 'qscintilla-qt5' 'libsndfile' 'qt5-tools' 
'qrupdate')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'fltk' 'portaudio' 'jdk8-openjdk')
+optdepends=('texinfo: for help-support in octave'
+'gnuplot: alternative plotting'
+'portaudio: audio support'
+'java-runtime: java support'
+'fltk: FLTK GUI')
+source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
+octave-sundials4.patch)
+options=('!emptydirs')
+validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
+sha512sums=('fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498'
+'SKIP'
+
'4b743602e8ca91e8be8dab69e09d3e476e9edd867b2eb0b9816fbe4ca344a16bff7a413c2e89b0c9fb769f4a815a696c4d67b70282b7e4fe8c24598bcce90d34')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../octave-sundials4.patch # Fix sundials support 
https://savannah.gnu.org/bugs/?52475
+  autoreconf -vif
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --libexecdir=/usr/lib \
+--enable-shared --disable-static \
+--with-quantum-depth=16 \
+--with-sundials_ida="-lsundials_ida -lsundials_sunlinsolklu"
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # add octave library path to ld.so.conf.d
+  install -d "${pkgdir}/etc/ld.so.conf.d"
+  echo "/usr/lib/${pkgname}/${pkgver}" > 
"${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
+}

Copied: octave/repos/community-staging-x86_64/octave-sundials4.patch (from rev 
740403, octave/trunk/octave-sundials4.patch)
===
--- community-staging-x86_64/octave-sundials4.patch 
(rev 0)
+++ community-staging-x86_64/octave-sundials4.patch 2020-11-03 07:57:03 UTC 
(rev 740404)
@@ -0,0 +1,599 @@
+# HG changeset patch
+# User Bill Greene 
+# Date 1550229868 -3600
+#  Fri Feb 15 12:24:28 2019 +0100
+# Node ID 4bf27c090f5695bcf545fc4af15e2a61a3941d46
+# Parent  f034b29320ad5034ad5c66480f64411e9d773440
+Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
+
+* libinterp/dldfcn/__ode15__.cc : use SUNDIALS API version 3.x
+
+diff --git a/libinterp/dldfcn/__ode15__.cc b/libinterp/dldfcn/__ode15__.cc
+--- a/libinterp/dldfcn/__ode15__.cc
 b/libinterp/dldfcn/__ode15__.cc
+@@ -1,6 +1,7 @@
+ /*
+ 
+ Copyright (C) 2016-2019 Francesco Faccio 
++Copyright (C) 2019 William Greene 
+ 
+ This file is part of Octave.
+ 
+@@ -112,7 +113,8 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (nullptr),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (nullptr), jacfun (nullptr), jacspfun 
(nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+@@ -122,11 +124,17 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (ida_fcn),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (daefun), jacfun (nullptr), jacspfun (nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+-~IDA (void) { IDAFree (); }
++~IDA (void)
++{
++  IDAFree ();
++  SUNLinSolFree(sunLinearSolver);
++  SUNMatDestroy(sunJacMatrix);
++}
+ 
+ IDA&
+ set_jacobian 

[arch-commits] Commit in octave/repos (3 files)

2020-06-13 Thread Antonio Rojas via arch-commits
Date: Saturday, June 13, 2020 @ 08:35:15
  Author: arojas
Revision: 642833

archrelease: copy trunk to community-staging-x86_64

Added:
  octave/repos/community-staging-x86_64/
  octave/repos/community-staging-x86_64/PKGBUILD
(from rev 642832, octave/trunk/PKGBUILD)
  octave/repos/community-staging-x86_64/octave-sundials4.patch
(from rev 642832, octave/trunk/octave-sundials4.patch)

+
 PKGBUILD   |   52 
 octave-sundials4.patch |  599 +++
 2 files changed, 651 insertions(+)

Copied: octave/repos/community-staging-x86_64/PKGBUILD (from rev 642832, 
octave/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-06-13 08:35:15 UTC (rev 642833)
@@ -0,0 +1,52 @@
+# Maintainer: Ronald van Haren 
+# Contributor : shining 
+# Contributor : cyberdune 
+
+pkgname=octave
+pkgver=5.2.0
+pkgrel=5
+pkgdesc="A high-level language, primarily intended for numerical computations."
+arch=('x86_64')
+url="https://www.gnu.org/software/octave/;
+license=('GPL')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'arpack' 'glu' 
'ghostscript'
+  'sundials' 'gl2ps' 'qscintilla-qt5' 'libsndfile' 'qt5-tools' 
'qrupdate')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'fltk' 'portaudio' 'jdk8-openjdk')
+optdepends=('texinfo: for help-support in octave'
+'gnuplot: alternative plotting'
+'portaudio: audio support'
+'java-runtime: java support'
+'fltk: FLTK GUI')
+source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
+octave-sundials4.patch)
+options=('!emptydirs')
+validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
+sha512sums=('fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498'
+'SKIP'
+
'4b743602e8ca91e8be8dab69e09d3e476e9edd867b2eb0b9816fbe4ca344a16bff7a413c2e89b0c9fb769f4a815a696c4d67b70282b7e4fe8c24598bcce90d34')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../octave-sundials4.patch # Fix sundials support 
https://savannah.gnu.org/bugs/?52475
+  autoreconf -vif
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --libexecdir=/usr/lib \
+--enable-shared --disable-static \
+--with-quantum-depth=16 \
+--with-sundials_ida="-lsundials_ida -lsundials_sunlinsolklu"
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # add octave library path to ld.so.conf.d
+  install -d "${pkgdir}/etc/ld.so.conf.d"
+  echo "/usr/lib/${pkgname}/${pkgver}" > 
"${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
+}

Copied: octave/repos/community-staging-x86_64/octave-sundials4.patch (from rev 
642832, octave/trunk/octave-sundials4.patch)
===
--- community-staging-x86_64/octave-sundials4.patch 
(rev 0)
+++ community-staging-x86_64/octave-sundials4.patch 2020-06-13 08:35:15 UTC 
(rev 642833)
@@ -0,0 +1,599 @@
+# HG changeset patch
+# User Bill Greene 
+# Date 1550229868 -3600
+#  Fri Feb 15 12:24:28 2019 +0100
+# Node ID 4bf27c090f5695bcf545fc4af15e2a61a3941d46
+# Parent  f034b29320ad5034ad5c66480f64411e9d773440
+Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
+
+* libinterp/dldfcn/__ode15__.cc : use SUNDIALS API version 3.x
+
+diff --git a/libinterp/dldfcn/__ode15__.cc b/libinterp/dldfcn/__ode15__.cc
+--- a/libinterp/dldfcn/__ode15__.cc
 b/libinterp/dldfcn/__ode15__.cc
+@@ -1,6 +1,7 @@
+ /*
+ 
+ Copyright (C) 2016-2019 Francesco Faccio 
++Copyright (C) 2019 William Greene 
+ 
+ This file is part of Octave.
+ 
+@@ -112,7 +113,8 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (nullptr),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (nullptr), jacfun (nullptr), jacspfun 
(nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+@@ -122,11 +124,17 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (ida_fcn),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (daefun), jacfun (nullptr), jacspfun (nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+-~IDA (void) { IDAFree (); }
++~IDA (void)
++{
++  IDAFree ();
++  SUNLinSolFree(sunLinearSolver);
++  SUNMatDestroy(sunJacMatrix);
++}
+ 
+ IDA&
+ set_jacobian 

[arch-commits] Commit in octave/repos (3 files)

2020-05-07 Thread Felix Yan via arch-commits
Date: Thursday, May 7, 2020 @ 06:32:04
  Author: felixonmars
Revision: 625286

archrelease: copy trunk to community-staging-x86_64

Added:
  octave/repos/community-staging-x86_64/
  octave/repos/community-staging-x86_64/PKGBUILD
(from rev 625285, octave/trunk/PKGBUILD)
  octave/repos/community-staging-x86_64/octave-sundials4.patch
(from rev 625285, octave/trunk/octave-sundials4.patch)

+
 PKGBUILD   |   52 
 octave-sundials4.patch |  599 +++
 2 files changed, 651 insertions(+)

Copied: octave/repos/community-staging-x86_64/PKGBUILD (from rev 625285, 
octave/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-05-07 06:32:04 UTC (rev 625286)
@@ -0,0 +1,52 @@
+# Maintainer: Ronald van Haren 
+# Contributor : shining 
+# Contributor : cyberdune 
+
+pkgname=octave
+pkgver=5.2.0
+pkgrel=4
+pkgdesc="A high-level language, primarily intended for numerical computations."
+arch=('x86_64')
+url="https://www.gnu.org/software/octave/;
+license=('GPL')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'arpack' 'glu' 
'ghostscript'
+  'sundials' 'gl2ps' 'qscintilla-qt5' 'libsndfile' 'qt5-tools' 
'qrupdate')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'fltk' 'portaudio' 'jdk8-openjdk')
+optdepends=('texinfo: for help-support in octave'
+'gnuplot: alternative plotting'
+'portaudio: audio support'
+'java-runtime: java support'
+'fltk: FLTK GUI')
+source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
+octave-sundials4.patch)
+options=('!emptydirs')
+validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
+sha512sums=('fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498'
+'SKIP'
+
'4b743602e8ca91e8be8dab69e09d3e476e9edd867b2eb0b9816fbe4ca344a16bff7a413c2e89b0c9fb769f4a815a696c4d67b70282b7e4fe8c24598bcce90d34')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../octave-sundials4.patch # Fix sundials support 
https://savannah.gnu.org/bugs/?52475
+  autoreconf -vif
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --libexecdir=/usr/lib \
+--enable-shared --disable-static \
+--with-quantum-depth=16 \
+--with-sundials_ida="-lsundials_ida -lsundials_sunlinsolklu"
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # add octave library path to ld.so.conf.d
+  install -d "${pkgdir}/etc/ld.so.conf.d"
+  echo "/usr/lib/${pkgname}/${pkgver}" > 
"${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
+}

Copied: octave/repos/community-staging-x86_64/octave-sundials4.patch (from rev 
625285, octave/trunk/octave-sundials4.patch)
===
--- community-staging-x86_64/octave-sundials4.patch 
(rev 0)
+++ community-staging-x86_64/octave-sundials4.patch 2020-05-07 06:32:04 UTC 
(rev 625286)
@@ -0,0 +1,599 @@
+# HG changeset patch
+# User Bill Greene 
+# Date 1550229868 -3600
+#  Fri Feb 15 12:24:28 2019 +0100
+# Node ID 4bf27c090f5695bcf545fc4af15e2a61a3941d46
+# Parent  f034b29320ad5034ad5c66480f64411e9d773440
+Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
+
+* libinterp/dldfcn/__ode15__.cc : use SUNDIALS API version 3.x
+
+diff --git a/libinterp/dldfcn/__ode15__.cc b/libinterp/dldfcn/__ode15__.cc
+--- a/libinterp/dldfcn/__ode15__.cc
 b/libinterp/dldfcn/__ode15__.cc
+@@ -1,6 +1,7 @@
+ /*
+ 
+ Copyright (C) 2016-2019 Francesco Faccio 
++Copyright (C) 2019 William Greene 
+ 
+ This file is part of Octave.
+ 
+@@ -112,7 +113,8 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (nullptr),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (nullptr), jacfun (nullptr), jacspfun 
(nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+@@ -122,11 +124,17 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (ida_fcn),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (daefun), jacfun (nullptr), jacspfun (nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+-~IDA (void) { IDAFree (); }
++~IDA (void)
++{
++  IDAFree ();
++  SUNLinSolFree(sunLinearSolver);
++  SUNMatDestroy(sunJacMatrix);
++}
+ 
+ IDA&
+ set_jacobian 

[arch-commits] Commit in octave/repos (3 files)

2020-04-30 Thread Felix Yan via arch-commits
Date: Friday, May 1, 2020 @ 02:02:30
  Author: felixonmars
Revision: 623536

archrelease: copy trunk to community-staging-x86_64

Added:
  octave/repos/community-staging-x86_64/
  octave/repos/community-staging-x86_64/PKGBUILD
(from rev 623535, octave/trunk/PKGBUILD)
  octave/repos/community-staging-x86_64/octave-sundials4.patch
(from rev 623535, octave/trunk/octave-sundials4.patch)

+
 PKGBUILD   |   52 
 octave-sundials4.patch |  599 +++
 2 files changed, 651 insertions(+)

Copied: octave/repos/community-staging-x86_64/PKGBUILD (from rev 623535, 
octave/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-05-01 02:02:30 UTC (rev 623536)
@@ -0,0 +1,52 @@
+# Maintainer: Ronald van Haren 
+# Contributor : shining 
+# Contributor : cyberdune 
+
+pkgname=octave
+pkgver=5.2.0
+pkgrel=3
+pkgdesc="A high-level language, primarily intended for numerical computations."
+arch=('x86_64')
+url="https://www.gnu.org/software/octave/;
+license=('GPL')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'arpack' 'glu' 
'ghostscript'
+  'sundials' 'gl2ps' 'qscintilla-qt5' 'libsndfile' 'qt5-tools' 
'qrupdate')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'fltk' 'portaudio' 'jdk8-openjdk')
+optdepends=('texinfo: for help-support in octave'
+'gnuplot: alternative plotting'
+'portaudio: audio support'
+'java-runtime: java support'
+'fltk: FLTK GUI')
+source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
+octave-sundials4.patch)
+options=('!emptydirs')
+validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
+sha512sums=('fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498'
+'SKIP'
+
'4b743602e8ca91e8be8dab69e09d3e476e9edd867b2eb0b9816fbe4ca344a16bff7a413c2e89b0c9fb769f4a815a696c4d67b70282b7e4fe8c24598bcce90d34')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../octave-sundials4.patch # Fix sundials support 
https://savannah.gnu.org/bugs/?52475
+  autoreconf -vif
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --libexecdir=/usr/lib \
+--enable-shared --disable-static \
+--with-quantum-depth=16 \
+--with-sundials_ida="-lsundials_ida -lsundials_sunlinsolklu"
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # add octave library path to ld.so.conf.d
+  install -d "${pkgdir}/etc/ld.so.conf.d"
+  echo "/usr/lib/${pkgname}/${pkgver}" > 
"${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
+}

Copied: octave/repos/community-staging-x86_64/octave-sundials4.patch (from rev 
623535, octave/trunk/octave-sundials4.patch)
===
--- community-staging-x86_64/octave-sundials4.patch 
(rev 0)
+++ community-staging-x86_64/octave-sundials4.patch 2020-05-01 02:02:30 UTC 
(rev 623536)
@@ -0,0 +1,599 @@
+# HG changeset patch
+# User Bill Greene 
+# Date 1550229868 -3600
+#  Fri Feb 15 12:24:28 2019 +0100
+# Node ID 4bf27c090f5695bcf545fc4af15e2a61a3941d46
+# Parent  f034b29320ad5034ad5c66480f64411e9d773440
+Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
+
+* libinterp/dldfcn/__ode15__.cc : use SUNDIALS API version 3.x
+
+diff --git a/libinterp/dldfcn/__ode15__.cc b/libinterp/dldfcn/__ode15__.cc
+--- a/libinterp/dldfcn/__ode15__.cc
 b/libinterp/dldfcn/__ode15__.cc
+@@ -1,6 +1,7 @@
+ /*
+ 
+ Copyright (C) 2016-2019 Francesco Faccio 
++Copyright (C) 2019 William Greene 
+ 
+ This file is part of Octave.
+ 
+@@ -112,7 +113,8 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (nullptr),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (nullptr), jacfun (nullptr), jacspfun 
(nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+@@ -122,11 +124,17 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (ida_fcn),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (daefun), jacfun (nullptr), jacspfun (nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+-~IDA (void) { IDAFree (); }
++~IDA (void)
++{
++  IDAFree ();
++  SUNLinSolFree(sunLinearSolver);
++  SUNMatDestroy(sunJacMatrix);
++}
+ 
+ IDA&
+ set_jacobian 

[arch-commits] Commit in octave/repos (3 files)

2020-04-12 Thread Filipe LaĆ­ns via arch-commits
Date: Sunday, April 12, 2020 @ 18:30:11
  Author: ffy00
Revision: 613447

archrelease: copy trunk to community-staging-x86_64

Added:
  octave/repos/community-staging-x86_64/
  octave/repos/community-staging-x86_64/PKGBUILD
(from rev 613446, octave/trunk/PKGBUILD)
  octave/repos/community-staging-x86_64/octave-sundials4.patch
(from rev 613446, octave/trunk/octave-sundials4.patch)

+
 PKGBUILD   |   52 
 octave-sundials4.patch |  599 +++
 2 files changed, 651 insertions(+)

Copied: octave/repos/community-staging-x86_64/PKGBUILD (from rev 613446, 
octave/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2020-04-12 18:30:11 UTC (rev 613447)
@@ -0,0 +1,52 @@
+# Maintainer: Ronald van Haren 
+# Contributor : shining 
+# Contributor : cyberdune 
+
+pkgname=octave
+pkgver=5.2.0
+pkgrel=2
+pkgdesc="A high-level language, primarily intended for numerical computations."
+arch=('x86_64')
+url="https://www.gnu.org/software/octave/;
+license=('GPL')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'arpack' 'glu' 
'ghostscript'
+  'sundials' 'gl2ps' 'qscintilla-qt5' 'libsndfile' 'qt5-tools' 
'qrupdate')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'fltk' 'portaudio' 'jdk8-openjdk')
+optdepends=('texinfo: for help-support in octave'
+'gnuplot: alternative plotting'
+'portaudio: audio support'
+'java-runtime: java support'
+'fltk: FLTK GUI')
+source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
+octave-sundials4.patch)
+options=('!emptydirs')
+validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
+sha256sums=('2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1'
+'SKIP'
+'bfa7253f7b572158ce05fee117cd24325ec73e7f3acbcc73b3c34d6e52f01f5a')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../octave-sundials4.patch # Fix sundials support 
https://savannah.gnu.org/bugs/?52475
+  autoreconf -vif
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --libexecdir=/usr/lib \
+--enable-shared --disable-static \
+--with-quantum-depth=16 \
+--with-sundials_ida="-lsundials_ida -lsundials_sunlinsolklu"
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # add octave library path to ld.so.conf.d
+  install -d "${pkgdir}/etc/ld.so.conf.d"
+  echo "/usr/lib/${pkgname}/${pkgver}" > 
"${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
+}

Copied: octave/repos/community-staging-x86_64/octave-sundials4.patch (from rev 
613446, octave/trunk/octave-sundials4.patch)
===
--- community-staging-x86_64/octave-sundials4.patch 
(rev 0)
+++ community-staging-x86_64/octave-sundials4.patch 2020-04-12 18:30:11 UTC 
(rev 613447)
@@ -0,0 +1,599 @@
+# HG changeset patch
+# User Bill Greene 
+# Date 1550229868 -3600
+#  Fri Feb 15 12:24:28 2019 +0100
+# Node ID 4bf27c090f5695bcf545fc4af15e2a61a3941d46
+# Parent  f034b29320ad5034ad5c66480f64411e9d773440
+Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
+
+* libinterp/dldfcn/__ode15__.cc : use SUNDIALS API version 3.x
+
+diff --git a/libinterp/dldfcn/__ode15__.cc b/libinterp/dldfcn/__ode15__.cc
+--- a/libinterp/dldfcn/__ode15__.cc
 b/libinterp/dldfcn/__ode15__.cc
+@@ -1,6 +1,7 @@
+ /*
+ 
+ Copyright (C) 2016-2019 Francesco Faccio 
++Copyright (C) 2019 William Greene 
+ 
+ This file is part of Octave.
+ 
+@@ -112,7 +113,8 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (nullptr),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (nullptr), jacfun (nullptr), jacspfun 
(nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+@@ -122,11 +124,17 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (ida_fcn),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (daefun), jacfun (nullptr), jacspfun (nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+-~IDA (void) { IDAFree (); }
++~IDA (void)
++{
++  IDAFree ();
++  SUNLinSolFree(sunLinearSolver);
++  SUNMatDestroy(sunJacMatrix);
++}
+ 
+ IDA&
+ set_jacobian (octave_function *jac, DAEJacFuncDense j)
+@@ -184,7 +192,7 @@
+ static N_Vector ColToNVec (const ColumnVector& data, long int n);
+ 
+ 

[arch-commits] Commit in octave/repos (3 files)

2019-10-22 Thread Antonio Rojas via arch-commits
Date: Tuesday, October 22, 2019 @ 17:16:17
  Author: arojas
Revision: 518385

archrelease: copy trunk to community-staging-x86_64

Added:
  octave/repos/community-staging-x86_64/
  octave/repos/community-staging-x86_64/PKGBUILD
(from rev 518384, octave/trunk/PKGBUILD)
  octave/repos/community-staging-x86_64/octave-sundials4.patch
(from rev 518384, octave/trunk/octave-sundials4.patch)

+
 PKGBUILD   |   52 
 octave-sundials4.patch |  599 +++
 2 files changed, 651 insertions(+)

Copied: octave/repos/community-staging-x86_64/PKGBUILD (from rev 518384, 
octave/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2019-10-22 17:16:17 UTC (rev 518385)
@@ -0,0 +1,52 @@
+# Maintainer: Ronald van Haren 
+# Contributor : shining 
+# Contributor : cyberdune 
+
+pkgname=octave
+pkgver=5.1.0
+pkgrel=5
+pkgdesc="A high-level language, primarily intended for numerical computations."
+arch=('x86_64')
+url="https://www.gnu.org/software/octave/;
+license=('GPL')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'arpack' 'glu' 
'ghostscript'
+  'sundials' 'gl2ps' 'qscintilla-qt5' 'libsndfile' 'qt5-tools' 
'qrupdate')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'fltk' 'portaudio' 'jdk8-openjdk' 'sundials')
+optdepends=('texinfo: for help-support in octave'
+'gnuplot: alternative plotting'
+'portaudio: audio support'
+'java-runtime: java support'
+'fltk: FLTK GUI')
+source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
+octave-sundials4.patch)
+options=('!emptydirs')
+validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
+sha256sums=('e36b1124cac27c7caa51cc57de408c31676d5f0096349b4d50b57bfe1bcd7495'
+'SKIP'
+'bfa7253f7b572158ce05fee117cd24325ec73e7f3acbcc73b3c34d6e52f01f5a')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../octave-sundials4.patch # Fix sundials support 
https://savannah.gnu.org/bugs/?52475
+  autoreconf -vif
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --libexecdir=/usr/lib \
+--enable-shared --disable-static \
+--with-quantum-depth=16 \
+--with-sundials_ida="-lsundials_ida -lsundials_sunlinsolklu"
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # add octave library path to ld.so.conf.d
+  install -d "${pkgdir}/etc/ld.so.conf.d"
+  echo "/usr/lib/${pkgname}/${pkgver}" > 
"${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
+}

Copied: octave/repos/community-staging-x86_64/octave-sundials4.patch (from rev 
518384, octave/trunk/octave-sundials4.patch)
===
--- community-staging-x86_64/octave-sundials4.patch 
(rev 0)
+++ community-staging-x86_64/octave-sundials4.patch 2019-10-22 17:16:17 UTC 
(rev 518385)
@@ -0,0 +1,599 @@
+# HG changeset patch
+# User Bill Greene 
+# Date 1550229868 -3600
+#  Fri Feb 15 12:24:28 2019 +0100
+# Node ID 4bf27c090f5695bcf545fc4af15e2a61a3941d46
+# Parent  f034b29320ad5034ad5c66480f64411e9d773440
+Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
+
+* libinterp/dldfcn/__ode15__.cc : use SUNDIALS API version 3.x
+
+diff --git a/libinterp/dldfcn/__ode15__.cc b/libinterp/dldfcn/__ode15__.cc
+--- a/libinterp/dldfcn/__ode15__.cc
 b/libinterp/dldfcn/__ode15__.cc
+@@ -1,6 +1,7 @@
+ /*
+ 
+ Copyright (C) 2016-2019 Francesco Faccio 
++Copyright (C) 2019 William Greene 
+ 
+ This file is part of Octave.
+ 
+@@ -112,7 +113,8 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (nullptr),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (nullptr), jacfun (nullptr), jacspfun 
(nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+@@ -122,11 +124,17 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (ida_fcn),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (daefun), jacfun (nullptr), jacspfun (nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+-~IDA (void) { IDAFree (); }
++~IDA (void)
++{
++  IDAFree ();
++  SUNLinSolFree(sunLinearSolver);
++  SUNMatDestroy(sunJacMatrix);
++}
+ 
+ IDA&
+ set_jacobian (octave_function *jac, DAEJacFuncDense j)
+@@ -184,7 +192,7 @@
+ static N_Vector ColToNVec (const ColumnVector& data, long int 

[arch-commits] Commit in octave/repos (3 files)

2019-03-16 Thread Antonio Rojas via arch-commits
Date: Saturday, March 16, 2019 @ 22:40:36
  Author: arojas
Revision: 442252

archrelease: copy trunk to community-staging-x86_64

Added:
  octave/repos/community-staging-x86_64/
  octave/repos/community-staging-x86_64/PKGBUILD
(from rev 442251, octave/trunk/PKGBUILD)
  octave/repos/community-staging-x86_64/octave-sundials4.patch
(from rev 442251, octave/trunk/octave-sundials4.patch)

+
 PKGBUILD   |   52 
 octave-sundials4.patch |  599 +++
 2 files changed, 651 insertions(+)

Copied: octave/repos/community-staging-x86_64/PKGBUILD (from rev 442251, 
octave/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2019-03-16 22:40:36 UTC (rev 442252)
@@ -0,0 +1,52 @@
+# Maintainer: Ronald van Haren 
+# Contributor : shining 
+# Contributor : cyberdune 
+
+pkgname=octave
+pkgver=5.1.0
+pkgrel=3
+pkgdesc="A high-level language, primarily intended for numerical computations."
+arch=('x86_64')
+url="http://www.octave.org;
+license=('GPL')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'arpack' 'glu' 
'ghostscript'
+  'sundials' 'gl2ps' 'qscintilla-qt5' 'libsndfile' 'qt5-tools' 
'qrupdate')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'fltk' 'portaudio' 'jdk8-openjdk' 'sundials')
+optdepends=('texinfo: for help-support in octave'
+'gnuplot: alternative plotting'
+'portaudio: audio support'
+'java-runtime: java support'
+'fltk: FLTK GUI')
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
+octave-sundials4.patch)
+options=('!emptydirs')
+validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
+sha512sums=('a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb'
+'SKIP'
+
'4b743602e8ca91e8be8dab69e09d3e476e9edd867b2eb0b9816fbe4ca344a16bff7a413c2e89b0c9fb769f4a815a696c4d67b70282b7e4fe8c24598bcce90d34')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../octave-sundials4.patch # Fix sundials support 
https://savannah.gnu.org/bugs/?52475
+  autoreconf -vif
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --libexecdir=/usr/lib \
+  --enable-shared --disable-static --enable-link-all-dependencies \
+  --with-quantum-depth=16
+
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # add octave library path to ld.so.conf.d
+  install -d "${pkgdir}/etc/ld.so.conf.d"
+  echo "/usr/lib/${pkgname}/${pkgver}" > 
"${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
+}

Copied: octave/repos/community-staging-x86_64/octave-sundials4.patch (from rev 
442251, octave/trunk/octave-sundials4.patch)
===
--- community-staging-x86_64/octave-sundials4.patch 
(rev 0)
+++ community-staging-x86_64/octave-sundials4.patch 2019-03-16 22:40:36 UTC 
(rev 442252)
@@ -0,0 +1,599 @@
+# HG changeset patch
+# User Bill Greene 
+# Date 1550229868 -3600
+#  Fri Feb 15 12:24:28 2019 +0100
+# Node ID 4bf27c090f5695bcf545fc4af15e2a61a3941d46
+# Parent  f034b29320ad5034ad5c66480f64411e9d773440
+Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
+
+* libinterp/dldfcn/__ode15__.cc : use SUNDIALS API version 3.x
+
+diff --git a/libinterp/dldfcn/__ode15__.cc b/libinterp/dldfcn/__ode15__.cc
+--- a/libinterp/dldfcn/__ode15__.cc
 b/libinterp/dldfcn/__ode15__.cc
+@@ -1,6 +1,7 @@
+ /*
+ 
+ Copyright (C) 2016-2019 Francesco Faccio 
++Copyright (C) 2019 William Greene 
+ 
+ This file is part of Octave.
+ 
+@@ -112,7 +113,8 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (nullptr),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (nullptr), jacfun (nullptr), jacspfun 
(nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+@@ -122,11 +124,17 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (ida_fcn),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (daefun), jacfun (nullptr), jacspfun (nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+ 
+ 
+-~IDA (void) { IDAFree (); }
++~IDA (void)
++{
++  IDAFree ();
++  SUNLinSolFree(sunLinearSolver);
++  SUNMatDestroy(sunJacMatrix);
++}
+ 
+ IDA&
+ set_jacobian (octave_function *jac, DAEJacFuncDense j)
+@@ -184,7 

[arch-commits] Commit in octave/repos (3 files)

2017-12-13 Thread Antonio Rojas via arch-commits
Date: Wednesday, December 13, 2017 @ 21:35:47
  Author: arojas
Revision: 274308

archrelease: copy trunk to community-staging-x86_64

Added:
  octave/repos/community-staging-x86_64/
  octave/repos/community-staging-x86_64/PKGBUILD
(from rev 274307, octave/trunk/PKGBUILD)
  octave/repos/community-staging-x86_64/octave-qscintilla-2.10.patch
(from rev 274307, octave/trunk/octave-qscintilla-2.10.patch)

--+
 PKGBUILD |   58 +
 octave-qscintilla-2.10.patch |   11 +++
 2 files changed, 69 insertions(+)

Copied: octave/repos/community-staging-x86_64/PKGBUILD (from rev 274307, 
octave/trunk/PKGBUILD)
===
--- community-staging-x86_64/PKGBUILD   (rev 0)
+++ community-staging-x86_64/PKGBUILD   2017-12-13 21:35:47 UTC (rev 274308)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Ronald van Haren 
+# Contributor : shining 
+# Contributor : cyberdune 
+
+pkgname=octave
+pkgver=4.2.1
+pkgrel=8
+pkgdesc="A high-level language, primarily intended for numerical computations."
+arch=('x86_64')
+url="http://www.octave.org;
+license=('GPL')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu' 'ghostscript'
+  'suitesparse' 'gl2ps' 'qscintilla-qt5' 'libsndfile')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'qt5-tools' 'portaudio')
+optdepends=('texinfo: for help-support in octave'
+'gnuplot: alternative plotting'
+'portaudio: audio support')
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig} 
octave-qscintilla-2.10.patch
+
octave-abort-exit.patch::"http://hg.savannah.gnu.org/hgweb/octave/raw-rev/16fae04366b2;)
+options=('!emptydirs')
+validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
+sha1sums=('3d60e860d97c2497ec42de67f85a1eea2c79cdfd'
+  'SKIP'
+  'ba53969f6fd923051cd306f414af0646ed7dc526'
+  'e9a3cd2cd5938fc71bfeb05ea34bcd40a1b040db')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix abort on exit https://savannah.gnu.org/bugs/?49515
+  patch -p1 -i ../octave-abort-exit.patch
+  # Fix qscintilla 2.10 detection
+  patch -p1 -i ../octave-qscintilla-2.10.patch
+  autoreconf -vi
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr --libexecdir=/usr/lib \
+  --enable-shared --disable-static \
+  --with-quantum-depth=16 \
+  --with-umfpack="-lumfpack -lsuitesparseconfig"
+# 
https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html 
+
+  LANG=C make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  # add octave library path to ld.so.conf.d
+  install -d "${pkgdir}/etc/ld.so.conf.d"
+  echo "/usr/lib/${pkgname}/${pkgver}" > 
"${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
+}

Copied: octave/repos/community-staging-x86_64/octave-qscintilla-2.10.patch 
(from rev 274307, octave/trunk/octave-qscintilla-2.10.patch)
===
--- community-staging-x86_64/octave-qscintilla-2.10.patch   
(rev 0)
+++ community-staging-x86_64/octave-qscintilla-2.10.patch   2017-12-13 
21:35:47 UTC (rev 274308)
@@ -0,0 +1,11 @@
+--- octave-4.2.1/m4/acinclude.m4.orig  2017-03-01 11:05:40.10610 +
 octave-4.2.1/m4/acinclude.m4   2017-03-01 11:06:05.612735530 +
+@@ -1346,7 +1346,7 @@
+ ;;
+ 5)
+   QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
+-  octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
++  octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2 
qscintilla2_qt5"
+ ;;
+ *)
+   AC_MSG_ERROR([Unrecognized Qt version $qt_version])