[arch-commits] Commit in octave/trunk (PKGBUILD octave-sundials4.patch)

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

Update to 6.1.0

Modified:
  octave/trunk/PKGBUILD
Deleted:
  octave/trunk/octave-sundials4.patch

+
 PKGBUILD   |   23 -
 octave-sundials4.patch |  599 ---
 2 files changed, 7 insertions(+), 615 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-17 07:40:44 UTC (rev 777101)
+++ PKGBUILD2020-12-17 08:08:16 UTC (rev 777102)
@@ -3,8 +3,8 @@
 # Contributor : cyberdune 
 
 pkgname=octave
-pkgver=5.2.0
-pkgrel=7
+pkgver=6.1.0
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="https://www.gnu.org/software/octave/;
@@ -17,32 +17,23 @@
 '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)
+source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
-sha512sums=('fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498'
-'SKIP'
-
'4b743602e8ca91e8be8dab69e09d3e476e9edd867b2eb0b9816fbe4ca344a16bff7a413c2e89b0c9fb769f4a815a696c4d67b70282b7e4fe8c24598bcce90d34')
+sha512sums=('34abe6fa489aea94bfeb08027653cd83a73611c6032c8b3ddc4b59223f316ee275f74490048a45aebf178858494f6920593565e612f6e77351102494cb9f49f7'
+'SKIP')
 
-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"
+--with-quantum-depth=16
   make
 }
 
 package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   make DESTDIR="${pkgdir}" install
 

Deleted: octave-sundials4.patch
===
--- octave-sundials4.patch  2020-12-17 07:40:44 UTC (rev 777101)
+++ octave-sundials4.patch  2020-12-17 08:08:16 UTC (rev 777102)
@@ -1,599 +0,0 @@
-# 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);
- 
- void
--set_up (void);
-+set_up (const ColumnVector& y);
- 
- void
- set_tolerance (ColumnVector& abstol, realtype reltol);
-@@ -199,25 +207,24 @@
- void
- resfun_impl (realtype t, N_Vector& yy,
-  N_Vector& yyp, N_Vector& rr);
--
- static int
--jacdense (long int Neq, realtype t,  realtype cj, N_Vector yy,
--  N_Vector yyp, N_Vector, DlsMat JJ, void *user_data,
-+jacdense (realtype t, realtype cj, N_Vector yy,
-+  N_Vector yyp, N_Vector, SUNMatrix JJ, void *user_data,
-   N_Vector, N_Vector, N_Vector)
- {
-   IDA *self = static_cast  

[arch-commits] Commit in octave/trunk (PKGBUILD)

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

sundials 5.6.1 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-17 07:06:26 UTC (rev 777091)
+++ PKGBUILD2020-12-17 07:17:39 UTC (rev 777092)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=5.2.0
-pkgrel=6
+pkgrel=7
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="https://www.gnu.org/software/octave/;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2020-11-02 Thread Antonio Rojas via arch-commits
Date: Tuesday, November 3, 2020 @ 07:56:52
  Author: arojas
Revision: 740403

sundials 5.5.0 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-11-03 07:55:51 UTC (rev 740402)
+++ PKGBUILD2020-11-03 07:56:52 UTC (rev 740403)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=5.2.0
-pkgrel=5
+pkgrel=6
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="https://www.gnu.org/software/octave/;


[arch-commits] Commit in octave/trunk (PKGBUILD)

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

qhull 2020.1 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-13 06:44:55 UTC (rev 642831)
+++ PKGBUILD2020-06-13 08:35:03 UTC (rev 642832)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=5.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="https://www.gnu.org/software/octave/;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2020-05-07 Thread Felix Yan via arch-commits
Date: Thursday, May 7, 2020 @ 06:31:47
  Author: felixonmars
Revision: 625285

upgpkg: octave 5.2.0-4: rebuild with gl2ps 1.4.2

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-07 06:21:35 UTC (rev 625284)
+++ PKGBUILD2020-05-07 06:31:47 UTC (rev 625285)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=5.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="https://www.gnu.org/software/octave/;


[arch-commits] Commit in octave/trunk (PKGBUILD)

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

upgpkg: octave 5.2.0-3: rebuild with gl2ps 1.4.1

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-01 01:54:09 UTC (rev 623534)
+++ PKGBUILD2020-05-01 02:02:12 UTC (rev 623535)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=5.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="https://www.gnu.org/software/octave/;
@@ -21,9 +21,9 @@
 octave-sundials4.patch)
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
-sha256sums=('2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1'
+sha512sums=('fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498'
 'SKIP'
-'bfa7253f7b572158ce05fee117cd24325ec73e7f3acbcc73b3c34d6e52f01f5a')
+
'4b743602e8ca91e8be8dab69e09d3e476e9edd867b2eb0b9816fbe4ca344a16bff7a413c2e89b0c9fb769f4a815a696c4d67b70282b7e4fe8c24598bcce90d34')
 
 prepare() {
   cd $pkgname-$pkgver


[arch-commits] Commit in octave/trunk (PKGBUILD)

2020-04-12 Thread Filipe Laíns via arch-commits
Date: Sunday, April 12, 2020 @ 18:29:58
  Author: ffy00
Revision: 613446

upgpkg: octave 6.2.0-2 (hdf5 1.12.0 rebuild)

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-12 17:55:02 UTC (rev 613445)
+++ PKGBUILD2020-04-12 18:29:58 UTC (rev 613446)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=5.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="https://www.gnu.org/software/octave/;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2020-02-04 Thread Antonio Rojas via arch-commits
Date: Tuesday, February 4, 2020 @ 16:42:22
  Author: arojas
Revision: 562065

Update to 5.2.0

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-04 16:42:11 UTC (rev 562064)
+++ PKGBUILD2020-02-04 16:42:22 UTC (rev 562065)
@@ -3,8 +3,8 @@
 # Contributor : cyberdune 
 
 pkgname=octave
-pkgver=5.1.0
-pkgrel=5
+pkgver=5.2.0
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="https://www.gnu.org/software/octave/;
@@ -11,7 +11,7 @@
 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')
+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'
@@ -21,7 +21,7 @@
 octave-sundials4.patch)
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
-sha256sums=('e36b1124cac27c7caa51cc57de408c31676d5f0096349b4d50b57bfe1bcd7495'
+sha256sums=('2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1'
 'SKIP'
 'bfa7253f7b572158ce05fee117cd24325ec73e7f3acbcc73b3c34d6e52f01f5a')
 


[arch-commits] Commit in octave/trunk (PKGBUILD)

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

sundials 5.0 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-22 17:05:26 UTC (rev 518383)
+++ PKGBUILD2019-10-22 17:15:47 UTC (rev 518384)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=5.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="https://www.gnu.org/software/octave/;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2019-05-16 Thread Ronald van Haren via arch-commits
Date: Thursday, May 16, 2019 @ 20:05:32
  Author: ronald
Revision: 467601

use https

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-16 20:05:23 UTC (rev 467600)
+++ PKGBUILD2019-05-16 20:05:32 UTC (rev 467601)
@@ -7,7 +7,7 @@
 pkgrel=4
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
-url="http://www.octave.org;
+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')
@@ -17,13 +17,13 @@
 'portaudio: audio support'
 'java-runtime: java support'
 'fltk: FLTK GUI')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
+source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
 octave-sundials4.patch)
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
-sha512sums=('a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb'
+sha256sums=('e36b1124cac27c7caa51cc57de408c31676d5f0096349b4d50b57bfe1bcd7495'
 'SKIP'
-
'4b743602e8ca91e8be8dab69e09d3e476e9edd867b2eb0b9816fbe4ca344a16bff7a413c2e89b0c9fb769f4a815a696c4d67b70282b7e4fe8c24598bcce90d34')
+'bfa7253f7b572158ce05fee117cd24325ec73e7f3acbcc73b3c34d6e52f01f5a')
 
 prepare() {
   cd $pkgname-$pkgver


[arch-commits] Commit in octave/trunk (PKGBUILD)

2019-03-16 Thread Antonio Rojas via arch-commits
Date: Saturday, March 16, 2019 @ 23:32:20
  Author: arojas
Revision: 442263

Revert unintended changes

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-16 23:26:11 UTC (rev 442262)
+++ PKGBUILD2019-03-16 23:32:20 UTC (rev 442263)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=5.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="http://www.octave.org;
@@ -35,9 +35,9 @@
   cd ${pkgname}-${pkgver}
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static --enable-link-all-dependencies \
-  --with-quantum-depth=16
-
+--enable-shared --disable-static \
+--with-quantum-depth=16 \
+--with-sundials_ida="-lsundials_ida -lsundials_sunlinsolklu"
   make
 }
 


[arch-commits] Commit in octave/trunk (PKGBUILD octave-sundials4.patch)

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

netcdf 4.6.3 rebuild

Modified:
  octave/trunk/PKGBUILD
  octave/trunk/octave-sundials4.patch

+
 PKGBUILD   |9 -
 octave-sundials4.patch |3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-16 22:21:02 UTC (rev 442250)
+++ PKGBUILD2019-03-16 22:40:11 UTC (rev 442251)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=5.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="http://www.octave.org;
@@ -23,7 +23,7 @@
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
 
sha512sums=('a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb'
 'SKIP'
-
'c05514859d661c8064973c4728ab68a91ca97910792b9ee6deee28748c79867b1204517775fe12f716e23576632f7b741bfe90c79ada288a1f57b58877b0fd76')
+
'4b743602e8ca91e8be8dab69e09d3e476e9edd867b2eb0b9816fbe4ca344a16bff7a413c2e89b0c9fb769f4a815a696c4d67b70282b7e4fe8c24598bcce90d34')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -35,9 +35,8 @@
   cd ${pkgname}-${pkgver}
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static \
-  --with-quantum-depth=16 \
-  --with-sundials_ida="-lsundials_ida -lsundials_sunlinsolklu"
+  --enable-shared --disable-static --enable-link-all-dependencies \
+  --with-quantum-depth=16
 
   make
 }

Modified: octave-sundials4.patch
===
--- octave-sundials4.patch  2019-03-16 22:21:02 UTC (rev 442250)
+++ octave-sundials4.patch  2019-03-16 22:40:11 UTC (rev 442251)
@@ -297,7 +297,7 @@
 diff --git a/libinterp/dldfcn/__ode15__.cc b/libinterp/dldfcn/__ode15__.cc
 --- a/libinterp/dldfcn/__ode15__.cc
 +++ b/libinterp/dldfcn/__ode15__.cc
-@@ -45,15 +45,32 @@
+@@ -45,15 +45,31 @@
  #include 
  #  endif
  
@@ -323,7 +323,6 @@
 +
 +#  if defined (HAVE_SUNDIALS_SUNDIALS_SPARSE_H)
  #include 
-+#include 
  #  endif
  
 +


[arch-commits] Commit in octave/trunk (PKGBUILD octave-sundials4.patch)

2019-02-28 Thread Antonio Rojas via arch-commits
Date: Thursday, February 28, 2019 @ 13:28:31
  Author: arojas
Revision: 437032

Fix sundials support (FS#61879)

Added:
  octave/trunk/octave-sundials4.patch
Modified:
  octave/trunk/PKGBUILD

+
 PKGBUILD   |   25 +
 octave-sundials4.patch |  600 +++
 2 files changed, 615 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-28 12:29:36 UTC (rev 437031)
+++ PKGBUILD2019-02-28 13:28:31 UTC (rev 437032)
@@ -4,37 +4,42 @@
 
 pkgname=octave
 pkgver=5.1.0
-pkgrel=1
+pkgrel=2
 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'
-  'suitesparse' 'gl2ps' 'qscintilla-qt5' 'libsndfile' 'qt5-tools' 
'qrupdate')
+  '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'
-'sundials: ode15i and ode15s solvers'
 'fltk: FLTK GUI')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
+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')
+'SKIP'
+
'c05514859d661c8064973c4728ab68a91ca97910792b9ee6deee28748c79867b1204517775fe12f716e23576632f7b741bfe90c79ada288a1f57b58877b0fd76')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../octave-sundials4.patch # Fix sundials support 
https://savannah.gnu.org/bugs/?52475
+  autoreconf -vif
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
-  export QCOLLECTIONGENERATOR=qhelpgenerator # Fix build with Qt 5.12
   ./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 
+  --with-sundials_ida="-lsundials_ida -lsundials_sunlinsolklu"
 
-  LANG=C make
+  make
 }
 
 package(){

Added: octave-sundials4.patch
===
--- octave-sundials4.patch  (rev 0)
+++ octave-sundials4.patch  2019-02-28 13:28:31 UTC (rev 437032)
@@ -0,0 +1,600 @@
+# 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);
+ 
+ void
+-set_up (void);
++set_up (const ColumnVector& y);
+ 
+ void
+ set_tolerance (ColumnVector& abstol, realtype reltol);
+@@ -199,25 +207,24 @@
+ void
+ 

[arch-commits] Commit in octave/trunk (PKGBUILD)

2019-02-26 Thread Antonio Rojas via arch-commits
Date: Tuesday, February 26, 2019 @ 13:24:22
  Author: arojas
Revision: 436144

Update to 5.1.0

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-26 13:23:55 UTC (rev 436143)
+++ PKGBUILD2019-02-26 13:24:22 UTC (rev 436144)
@@ -3,8 +3,8 @@
 # Contributor : cyberdune 
 
 pkgname=octave
-pkgver=4.4.1
-pkgrel=7
+pkgver=5.1.0
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="http://www.octave.org;
@@ -21,7 +21,7 @@
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
-sha512sums=('21a1f13e2145fa530f2169254d19442b572745d65b91453ba1f552f6eda6aecfead57dbe0260b3293a29db0aa0f27cfd4f26df332e6d640848a822b20c1232f8'
+sha512sums=('a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb'
 'SKIP')
 
 build() {


[arch-commits] Commit in octave/trunk (PKGBUILD)

2019-02-14 Thread Antonio Rojas via arch-commits
Date: Thursday, February 14, 2019 @ 17:38:33
  Author: arojas
Revision: 432223

qscintilla 2.11.1 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-14 17:22:05 UTC (rev 43)
+++ PKGBUILD2019-02-14 17:38:33 UTC (rev 432223)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=4.4.1
-pkgrel=6
+pkgrel=7
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2019-02-10 Thread Antonio Rojas via arch-commits
Date: Sunday, February 10, 2019 @ 15:37:33
  Author: arojas
Revision: 431467

qscintilla 2.11 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-10 15:35:55 UTC (rev 431466)
+++ PKGBUILD2019-02-10 15:37:33 UTC (rev 431467)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=4.4.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2019-01-14 Thread Antonio Rojas via arch-commits
Date: Monday, January 14, 2019 @ 21:17:44
  Author: arojas
Revision: 423092

Restore GUI (FS#61406), enable ode15 solvers (FS#61398)

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-14 21:07:32 UTC (rev 423091)
+++ PKGBUILD2019-01-14 21:17:44 UTC (rev 423092)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=4.4.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="http://www.octave.org;
@@ -11,11 +11,12 @@
 license=('GPL')
 depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'arpack' 'glu' 
'ghostscript'
   'suitesparse' 'gl2ps' 'qscintilla-qt5' 'libsndfile' 'qt5-tools' 
'qrupdate')
-makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'fltk' 'portaudio' 'jdk8-openjdk')
+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'
+'sundials: ode15i and ode15s solvers'
 'fltk: FLTK GUI')
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
 options=('!emptydirs')
@@ -26,6 +27,7 @@
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  export QCOLLECTIONGENERATOR=qhelpgenerator # Fix build with Qt 5.12
   ./configure --prefix=/usr --libexecdir=/usr/lib \
   --enable-shared --disable-static \
   --with-quantum-depth=16 \


[arch-commits] Commit in octave/trunk (PKGBUILD)

2019-01-11 Thread Evangelos Foutras via arch-commits
Date: Friday, January 11, 2019 @ 08:11:18
  Author: foutrelis
Revision: 422314

Readline 8.0 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-11 08:11:09 UTC (rev 422313)
+++ PKGBUILD2019-01-11 08:11:18 UTC (rev 422314)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=4.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2018-10-23 Thread Antonio Rojas via arch-commits
Date: Tuesday, October 23, 2018 @ 16:42:33
  Author: arojas
Revision: 398684

HDF5 1.10.4 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-23 16:33:27 UTC (rev 398683)
+++ PKGBUILD2018-10-23 16:42:33 UTC (rev 398684)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=4.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2018-08-23 Thread Antonio Rojas via arch-commits
Date: Thursday, August 23, 2018 @ 18:16:57
  Author: arojas
Revision: 373461

hdf5 1.10.3 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-23 17:34:33 UTC (rev 373460)
+++ PKGBUILD2018-08-23 18:16:57 UTC (rev 373461)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2018-08-18 Thread Antonio Rojas via arch-commits
Date: Sunday, August 19, 2018 @ 00:05:43
  Author: arojas
Revision: 372725

Update to 4.4.1

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 4 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-18 23:40:03 UTC (rev 372724)
+++ PKGBUILD2018-08-19 00:05:43 UTC (rev 372725)
@@ -4,7 +4,7 @@
 # Contributor : cyberdune 
 
 pkgname=octave
-pkgver=4.4.0
+pkgver=4.4.1
 pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
@@ -18,19 +18,12 @@
 'portaudio: audio support'
 'java-runtime: java support'
 'fltk: FLTK GUI')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
-
octave-qt5.11.patch::"https://hg.savannah.gnu.org/hgweb/octave/raw-rev/cdaa884568b1;)
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
-sha512sums=('6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2'
-'SKIP'
-
'5bbd5e54ac94ce57407714593aed0b65befa823be914376944f400c7dc18692d679df87ac90867c7adc8bd91c73855a13066e4b197e78fd89cb060d50dede69f')
+sha512sums=('21a1f13e2145fa530f2169254d19442b572745d65b91453ba1f552f6eda6aecfead57dbe0260b3293a29db0aa0f27cfd4f26df332e6d640848a822b20c1232f8'
+'SKIP')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../octave-qt5.11.patch # Fix build with Qt 5.11
-}
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 


[arch-commits] Commit in octave/trunk (PKGBUILD)

2018-06-27 Thread Antonio Rojas via arch-commits
Date: Wednesday, June 27, 2018 @ 15:30:02
  Author: arojas
Revision: 346422

Fix build with Qt 5.11 (FS#59156)

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-27 15:29:49 UTC (rev 346421)
+++ PKGBUILD2018-06-27 15:30:02 UTC (rev 346422)
@@ -18,12 +18,18 @@
 'portaudio: audio support'
 'java-runtime: java support'
 'fltk: FLTK GUI')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
+
octave-qt5.11.patch::"https://hg.savannah.gnu.org/hgweb/octave/raw-rev/cdaa884568b1;)
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
 
sha512sums=('6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2'
-'SKIP')
+'SKIP'
+
'5bbd5e54ac94ce57407714593aed0b65befa823be914376944f400c7dc18692d679df87ac90867c7adc8bd91c73855a13066e4b197e78fd89cb060d50dede69f')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../octave-qt5.11.patch # Fix build with Qt 5.11
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"


[arch-commits] Commit in octave/trunk (PKGBUILD)

2018-05-02 Thread Antonio Rojas via arch-commits
Date: Wednesday, May 2, 2018 @ 22:46:17
  Author: arojas
Revision: 318714

Update to 4.4.0, rebuild for GCC 8, add qrupdate support

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-02 22:45:07 UTC (rev 318713)
+++ PKGBUILD2018-05-02 22:46:17 UTC (rev 318714)
@@ -4,23 +4,24 @@
 # Contributor : cyberdune 
 
 pkgname=octave
-pkgver=4.2.2
+pkgver=4.4.0
 pkgrel=1
 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' 'jdk8-openjdk')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'arpack' 'glu' 
'ghostscript'
+  'suitesparse' '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')
+'java-runtime: java support'
+'fltk: FLTK GUI')
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
-sha512sums=('b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2'
+sha512sums=('6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2'
 'SKIP')
 
 


[arch-commits] Commit in octave/trunk (PKGBUILD octave-qscintilla-2.10.patch)

2018-03-19 Thread Ronald van Haren via arch-commits
Date: Monday, March 19, 2018 @ 15:14:48
  Author: ronald
Revision: 309168

upgpkg: octave 4.2.2-1

update to 4.2.2; remove upstream included patch

Modified:
  octave/trunk/PKGBUILD
Deleted:
  octave/trunk/octave-qscintilla-2.10.patch

--+
 PKGBUILD |   22 +-
 octave-qscintilla-2.10.patch |   11 ---
 2 files changed, 5 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-19 14:13:16 UTC (rev 309167)
+++ PKGBUILD2018-03-19 15:14:48 UTC (rev 309168)
@@ -4,8 +4,8 @@
 # Contributor : cyberdune 
 
 pkgname=octave
-pkgver=4.2.1
-pkgrel=9
+pkgver=4.2.2
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="http://www.octave.org;
@@ -17,25 +17,13 @@
 'gnuplot: alternative plotting'
 'portaudio: audio support'
 'java-runtime: java 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;)
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
-sha1sums=('3d60e860d97c2497ec42de67f85a1eea2c79cdfd'
-  'SKIP'
-  'ba53969f6fd923051cd306f414af0646ed7dc526'
-  'e9a3cd2cd5938fc71bfeb05ea34bcd40a1b040db')
+sha512sums=('b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2'
+'SKIP')
 
-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}"
 

Deleted: octave-qscintilla-2.10.patch
===
--- octave-qscintilla-2.10.patch2018-03-19 14:13:16 UTC (rev 309167)
+++ octave-qscintilla-2.10.patch2018-03-19 15:14:48 UTC (rev 309168)
@@ -1,11 +0,0 @@
 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])


[arch-commits] Commit in octave/trunk (PKGBUILD)

2018-02-25 Thread Antonio Rojas via arch-commits
Date: Sunday, February 25, 2018 @ 12:08:11
  Author: arojas
Revision: 297948

Enable java support (FS#47763)

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-25 09:59:55 UTC (rev 297947)
+++ PKGBUILD2018-02-25 12:08:11 UTC (rev 297948)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.2.1
-pkgrel=8
+pkgrel=9
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="http://www.octave.org;
@@ -12,10 +12,11 @@
 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')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'qt5-tools' 'portaudio' 'jdk8-openjdk')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting'
-'portaudio: audio support')
+'portaudio: audio support'
+'java-runtime: java 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')


[arch-commits] Commit in octave/trunk (PKGBUILD)

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

suitesparse 5.1.0 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-13 21:14:20 UTC (rev 274306)
+++ PKGBUILD2017-12-13 21:35:22 UTC (rev 274307)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.2.1
-pkgrel=7
+pkgrel=8
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2017-09-08 Thread Antonio Rojas
Date: Friday, September 8, 2017 @ 11:21:12
  Author: arojas
Revision: 256223

Fix abort on exit (FS#53478)

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-08 11:20:41 UTC (rev 256222)
+++ PKGBUILD2017-09-08 11:21:12 UTC (rev 256223)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.2.1
-pkgrel=6
+pkgrel=7
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;
@@ -16,16 +16,20 @@
 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)
+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')
+  '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


[arch-commits] Commit in octave/trunk (PKGBUILD)

2017-06-17 Thread Antonio Rojas
Date: Saturday, June 17, 2017 @ 14:28:37
  Author: arojas
Revision: 237894

hdf5 1.10.1 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-17 14:25:13 UTC (rev 237893)
+++ PKGBUILD2017-06-17 14:28:37 UTC (rev 237894)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.2.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2017-05-15 Thread Bartłomiej Piotrowski
Date: Monday, May 15, 2017 @ 20:52:47
  Author: bpiotrowski
Revision: 296148

upgpkg: octave 4.2.1-5

rebuild against gcc-fortran 7.1

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-15 20:52:29 UTC (rev 296147)
+++ PKGBUILD2017-05-15 20:52:47 UTC (rev 296148)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.2.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD octave-qscintilla-2.10.patch)

2017-03-01 Thread Antonio Rojas
Date: Wednesday, March 1, 2017 @ 11:33:49
  Author: arojas
Revision: 289753

Fix qscintilla 2.10 support (FS#53122)

Added:
  octave/trunk/octave-qscintilla-2.10.patch
Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 octave-qscintilla-2.10.patch |   11 +++
 2 files changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-01 08:48:23 UTC (rev 289752)
+++ PKGBUILD2017-03-01 11:33:49 UTC (rev 289753)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;
@@ -16,12 +16,21 @@
 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})
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig} 
octave-qscintilla-2.10.patch)
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
 sha1sums=('3d60e860d97c2497ec42de67f85a1eea2c79cdfd'
-  'SKIP')
+  'SKIP'
+  'ba53969f6fd923051cd306f414af0646ed7dc526')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix qscintilla 2.10 detection
+  patch -p1 -i ../octave-qscintilla-2.10.patch
+  autoreconf -vi
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 

Added: octave-qscintilla-2.10.patch
===
--- octave-qscintilla-2.10.patch(rev 0)
+++ octave-qscintilla-2.10.patch2017-03-01 11:33:49 UTC (rev 289753)
@@ -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])


[arch-commits] Commit in octave/trunk (PKGBUILD)

2017-02-26 Thread Antonio Rojas
Date: Sunday, February 26, 2017 @ 10:15:57
  Author: arojas
Revision: 289560

Enable audio support

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-26 09:29:27 UTC (rev 289559)
+++ PKGBUILD2017-02-26 10:15:57 UTC (rev 289560)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;
@@ -12,9 +12,10 @@
 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')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'qt5-tools' 'portaudio')
 optdepends=('texinfo: for help-support in octave'
-'gnuplot: alternative plotting')
+'gnuplot: alternative plotting'
+'portaudio: audio support')
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton


[arch-commits] Commit in octave/trunk (PKGBUILD)

2017-02-25 Thread Antonio Rojas
Date: Saturday, February 25, 2017 @ 13:18:27
  Author: arojas
Revision: 289527

qscintilla 2.10 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-25 12:23:25 UTC (rev 289526)
+++ PKGBUILD2017-02-25 13:18:27 UTC (rev 289527)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2017-02-25 Thread Antonio Rojas
Date: Saturday, February 25, 2017 @ 10:33:28
  Author: arojas
Revision: 289517

Update to 4.2.1

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-25 10:12:23 UTC (rev 289516)
+++ PKGBUILD2017-02-25 10:33:28 UTC (rev 289517)
@@ -4,7 +4,7 @@
 # Contributor : cyberdune 
 
 pkgname=octave
-pkgver=4.2.0
+pkgver=4.2.1
 pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
-sha1sums=('9fac578c08a7efabd79ccc38bc196b9627e3212f'
+sha1sums=('3d60e860d97c2497ec42de67f85a1eea2c79cdfd'
   'SKIP')
 
 build() {


[arch-commits] Commit in octave/trunk (PKGBUILD octave-gcc6.patch)

2016-12-09 Thread Antonio Rojas
Date: Friday, December 9, 2016 @ 19:57:11
  Author: arojas
Revision: 282973

Update to 4.2.0

Modified:
  octave/trunk/PKGBUILD
Deleted:
  octave/trunk/octave-gcc6.patch

---+
 PKGBUILD  |   28 
 octave-gcc6.patch |   38 --
 2 files changed, 8 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-09 19:53:01 UTC (rev 282972)
+++ PKGBUILD2016-12-09 19:57:11 UTC (rev 282973)
@@ -4,42 +4,30 @@
 # Contributor : cyberdune 
 
 pkgname=octave
-pkgver=4.0.3
-pkgrel=2
+pkgver=4.2.0
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;
 license=('GPL')
 depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu' 'ghostscript'
-  'suitesparse' 'gl2ps' 'qscintilla' 'libsndfile')
-makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'qscintilla')
+  'suitesparse' 'gl2ps' 'qscintilla-qt5' 'libsndfile')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'qt5-tools')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.xz{,.sig} 
octave-gcc6.patch)
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
-sha1sums=('c798346a8271e0141d9dbe5610584dabb8311277'
-  'SKIP'
-  '646a285266faf054ae72b1897e575f08da779d6e')
+sha1sums=('9fac578c08a7efabd79ccc38bc196b9627e3212f'
+  'SKIP')
 
-prepare() {
-  cd $pkgname-$pkgver
-  # Fix build with GCC 6 (Fedora)
-  patch -p1 -i ../octave-gcc6.patch
-  find -name \*.cc -o -name \*.h -o -name \*.yy | xargs sed -i -e 's/#include 
/#include <\1.h>/'
-  find -name \*.h -o -name \*.cc | xargs sed -i -e 's//"config.h"/' 
-e 's//"base-list.h"/'
-}
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  autoreconf -vfi
-
   ./configure --prefix=/usr --libexecdir=/usr/lib \
   --enable-shared --disable-static \
   --with-quantum-depth=16 \
-  --with-umfpack="-lumfpack -lsuitesparseconfig"  \
-  MOC=moc-qt4 UIC=uic-qt4
+  --with-umfpack="-lumfpack -lsuitesparseconfig"
 # 
https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html 
 
   LANG=C make

Deleted: octave-gcc6.patch
===
--- octave-gcc6.patch   2016-12-09 19:53:01 UTC (rev 282972)
+++ octave-gcc6.patch   2016-12-09 19:57:11 UTC (rev 282973)
@@ -1,38 +0,0 @@
-diff -up octave-4.0.0/libinterp/corefcn/pr-output.cc.abs 
octave-4.0.0/libinterp/corefcn/pr-output.cc
 octave-4.0.0/libinterp/corefcn/pr-output.cc.abs2015-05-23 
08:21:53.0 -0600
-+++ octave-4.0.0/libinterp/corefcn/pr-output.cc2016-02-21 
08:59:30.966291273 -0700
-@@ -21,7 +21,7 @@ along with Octave; see the file COPYING.
- */
- 
- #ifdef HAVE_CONFIG_H
--#include 
-+#include "config.h"
- #endif
- 
- #include 
-@@ -3145,6 +3145,14 @@ PRINT_INT_SCALAR_INTERNAL (uint32_t)
- PRINT_INT_SCALAR_INTERNAL (int64_t)
- PRINT_INT_SCALAR_INTERNAL (uint64_t)
- 
-+inline unsigned int abs (unsigned int x) { return x; }
-+inline long unsigned int abs (long unsigned int x) { return x; }
-+inline long long unsigned int abs (long long unsigned int x) { return x; }
-+inline short unsigned int abs (short unsigned int x) { return x; }
-+inline unsigned char abs (unsigned char x) { return x; }
-+inline signed char abs (signed char x) { return abs((int)x); }
-+inline short int abs (short int x) { return abs((int)x); }
-+
- template 
- /* static */ inline void
- octave_print_internal_template (std::ostream& os, const intNDArray& nda,
-diff -up octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh.gnulib 
octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh
 octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh.gnulib   2015-05-23 
08:21:53.0 -0600
-+++ octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh  2016-02-19 
19:50:04.693811663 -0700
-@@ -27,6 +27,7 @@
- #ifndef FADDEEVA_HH
- #define FADDEEVA_HH 1
- 
-+#include 
- #include 
- 
- namespace Faddeeva {


[arch-commits] Commit in octave/trunk (PKGBUILD)

2016-11-07 Thread Evangelos Foutras
Date: Monday, November 7, 2016 @ 19:54:04
  Author: foutrelis
Revision: 280126

readline 7.0 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-07 19:48:30 UTC (rev 280125)
+++ PKGBUILD2016-11-07 19:54:04 UTC (rev 280126)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD octave-gcc6.patch)

2016-08-03 Thread Antonio Rojas
Date: Wednesday, August 3, 2016 @ 08:15:45
  Author: arojas
Revision: 272948

Update to 4.0.3

Modified:
  octave/trunk/PKGBUILD
  octave/trunk/octave-gcc6.patch

---+
 PKGBUILD  |6 +++---
 octave-gcc6.patch |   21 -
 2 files changed, 3 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-03 07:43:08 UTC (rev 272947)
+++ PKGBUILD2016-08-03 08:15:45 UTC (rev 272948)
@@ -4,7 +4,7 @@
 # Contributor : cyberdune 
 
 pkgname=octave
-pkgver=4.0.2
+pkgver=4.0.3
 pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
@@ -18,9 +18,9 @@
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.xz{,.sig} 
octave-gcc6.patch)
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
-sha1sums=('34384a5ddeea1b29bdfedd5e8d2bdb13b7b2daf5'
+sha1sums=('c798346a8271e0141d9dbe5610584dabb8311277'
   'SKIP'
-  'a723bace13eeb09d8ea3223b9f594124ab5cc05f')
+  '646a285266faf054ae72b1897e575f08da779d6e')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: octave-gcc6.patch
===
--- octave-gcc6.patch   2016-08-03 07:43:08 UTC (rev 272947)
+++ octave-gcc6.patch   2016-08-03 08:15:45 UTC (rev 272948)
@@ -36,24 +36,3 @@
  #include 
  
  namespace Faddeeva {
-diff -up octave-4.0.1/libgnu/math.in.h.signbit octave-4.0.1/libgnu/math.in.h
 octave-4.0.1/libgnu/math.in.h.signbit  2015-05-14 01:31:01.0 
-0600
-+++ octave-4.0.1/libgnu/math.in.h  2016-03-23 17:34:43.719131933 -0600
-@@ -1,6 +1,6 @@
- /* A GNU-like .
- 
--   Copyright (C) 2002-2003, 2007-2015 Free Software Foundation, Inc.
-+   Copyright (C) 2002-2003, 2007-2016 Free Software Foundation, Inc.
- 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-@@ -2205,7 +2205,8 @@ _GL_WARN_REAL_FLOATING_DECL (isnan);
- 
- 
- #if @GNULIB_SIGNBIT@
--# if @REPLACE_SIGNBIT_USING_GCC@
-+# if (@REPLACE_SIGNBIT_USING_GCC@ \
-+  && (!defined __cplusplus || __cplusplus < 201103L))
- #  undef signbit
-/* GCC 4.0 and newer provides three built-ins for signbit.  */
- #  define signbit(x) \


[arch-commits] Commit in octave/trunk (PKGBUILD octave-gcc6.patch octave.install)

2016-05-14 Thread Antonio Rojas
Date: Sunday, May 15, 2016 @ 00:03:18
  Author: arojas
Revision: 268045

Hooks

Added:
  octave/trunk/octave-gcc6.patch
Modified:
  octave/trunk/PKGBUILD
Deleted:
  octave/trunk/octave.install

---+
 PKGBUILD  |   20 -
 octave-gcc6.patch |   59 
 octave.install|   20 -
 3 files changed, 73 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-14 21:15:23 UTC (rev 268044)
+++ PKGBUILD2016-05-14 22:03:18 UTC (rev 268045)
@@ -4,8 +4,8 @@
 # Contributor : cyberdune 
 
 pkgname=octave
-pkgver=4.0.1
-pkgrel=4
+pkgver=4.0.2
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;
@@ -15,13 +15,21 @@
 makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'qscintilla')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.xz{,.sig})
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.xz{,.sig} 
octave-gcc6.patch)
 options=('!emptydirs')
-install=octave.install
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
-sha1sums=('76b531063e37df13fdbe3467a6e3c14dce364d9e'
-  'SKIP')
+sha1sums=('34384a5ddeea1b29bdfedd5e8d2bdb13b7b2daf5'
+  'SKIP'
+  'a723bace13eeb09d8ea3223b9f594124ab5cc05f')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # Fix build with GCC 6 (Fedora)
+  patch -p1 -i ../octave-gcc6.patch
+  find -name \*.cc -o -name \*.h -o -name \*.yy | xargs sed -i -e 's/#include 
/#include <\1.h>/'
+  find -name \*.h -o -name \*.cc | xargs sed -i -e 's//"config.h"/' 
-e 's//"base-list.h"/'
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 

Added: octave-gcc6.patch
===
--- octave-gcc6.patch   (rev 0)
+++ octave-gcc6.patch   2016-05-14 22:03:18 UTC (rev 268045)
@@ -0,0 +1,59 @@
+diff -up octave-4.0.0/libinterp/corefcn/pr-output.cc.abs 
octave-4.0.0/libinterp/corefcn/pr-output.cc
+--- octave-4.0.0/libinterp/corefcn/pr-output.cc.abs2015-05-23 
08:21:53.0 -0600
 octave-4.0.0/libinterp/corefcn/pr-output.cc2016-02-21 
08:59:30.966291273 -0700
+@@ -21,7 +21,7 @@ along with Octave; see the file COPYING.
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+-#include 
++#include "config.h"
+ #endif
+ 
+ #include 
+@@ -3145,6 +3145,14 @@ PRINT_INT_SCALAR_INTERNAL (uint32_t)
+ PRINT_INT_SCALAR_INTERNAL (int64_t)
+ PRINT_INT_SCALAR_INTERNAL (uint64_t)
+ 
++inline unsigned int abs (unsigned int x) { return x; }
++inline long unsigned int abs (long unsigned int x) { return x; }
++inline long long unsigned int abs (long long unsigned int x) { return x; }
++inline short unsigned int abs (short unsigned int x) { return x; }
++inline unsigned char abs (unsigned char x) { return x; }
++inline signed char abs (signed char x) { return abs((int)x); }
++inline short int abs (short int x) { return abs((int)x); }
++
+ template 
+ /* static */ inline void
+ octave_print_internal_template (std::ostream& os, const intNDArray& nda,
+diff -up octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh.gnulib 
octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh
+--- octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh.gnulib   2015-05-23 
08:21:53.0 -0600
 octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh  2016-02-19 
19:50:04.693811663 -0700
+@@ -27,6 +27,7 @@
+ #ifndef FADDEEVA_HH
+ #define FADDEEVA_HH 1
+ 
++#include 
+ #include 
+ 
+ namespace Faddeeva {
+diff -up octave-4.0.1/libgnu/math.in.h.signbit octave-4.0.1/libgnu/math.in.h
+--- octave-4.0.1/libgnu/math.in.h.signbit  2015-05-14 01:31:01.0 
-0600
 octave-4.0.1/libgnu/math.in.h  2016-03-23 17:34:43.719131933 -0600
+@@ -1,6 +1,6 @@
+ /* A GNU-like .
+ 
+-   Copyright (C) 2002-2003, 2007-2015 Free Software Foundation, Inc.
++   Copyright (C) 2002-2003, 2007-2016 Free Software Foundation, Inc.
+ 
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+@@ -2205,7 +2205,8 @@ _GL_WARN_REAL_FLOATING_DECL (isnan);
+ 
+ 
+ #if @GNULIB_SIGNBIT@
+-# if @REPLACE_SIGNBIT_USING_GCC@
++# if (@REPLACE_SIGNBIT_USING_GCC@ \
++  && (!defined __cplusplus || __cplusplus < 201103L))
+ #  undef signbit
+/* GCC 4.0 and newer provides three built-ins for signbit.  */
+ #  define signbit(x) \

Deleted: octave.install
===
--- octave.install  2016-05-14 21:15:23 UTC (rev 268044)
+++ octave.install  2016-05-14 22:03:18 UTC (rev 268045)
@@ -1,20 +0,0 @@
-info_dir=/usr/share/info
-info_files=(octave.info octave.info-1 octave.info-2 

[arch-commits] Commit in octave/trunk (PKGBUILD)

2016-04-14 Thread Ronald van Haren
Date: Thursday, April 14, 2016 @ 11:23:32
  Author: ronald
Revision: 264939

upgpkg: octave 4.0.1-4

hdf5 soname bump

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-14 09:10:42 UTC (rev 264938)
+++ PKGBUILD2016-04-14 09:23:32 UTC (rev 264939)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2016-04-06 Thread Antonio Rojas
Date: Wednesday, April 6, 2016 @ 09:41:04
  Author: arojas
Revision: 263940

qhull 2015.2 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-06 07:00:46 UTC (rev 263939)
+++ PKGBUILD2016-04-06 07:41:04 UTC (rev 263940)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2016-04-04 Thread Antonio Rojas
Date: Monday, April 4, 2016 @ 19:18:31
  Author: arojas
Revision: 263869

glpk 4.60 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-04 17:18:02 UTC (rev 263868)
+++ PKGBUILD2016-04-04 17:18:31 UTC (rev 263869)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2016-03-25 Thread Antonio Rojas
Date: Friday, March 25, 2016 @ 20:04:57
  Author: arojas
Revision: 262558

Update to 4.0.1

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-25 18:56:01 UTC (rev 262557)
+++ PKGBUILD2016-03-25 19:04:57 UTC (rev 262558)
@@ -4,13 +4,14 @@
 # Contributor : cyberdune 
 
 pkgname=octave
-pkgver=4.0.0
-pkgrel=8
+pkgver=4.0.1
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;
 license=('GPL')
-depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu' 'ghostscript' 'suitesparse' 'gl2ps' 'qscintilla' 'libsndfile')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu' 'ghostscript'
+  'suitesparse' 'gl2ps' 'qscintilla' 'libsndfile')
 makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'qscintilla')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting')
@@ -18,7 +19,7 @@
 options=('!emptydirs')
 install=octave.install
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
-sha1sums=('795c7ef1fb8d92f4cf9cae9eabba374a0328b1a9'
+sha1sums=('76b531063e37df13fdbe3467a6e3c14dce364d9e'
   'SKIP')
 
 build() {


[arch-commits] Commit in octave/trunk (PKGBUILD)

2016-03-06 Thread Antonio Rojas
Date: Sunday, March 6, 2016 @ 19:08:35
  Author: arojas
Revision: 261118

glpk 4.58 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-06 17:16:15 UTC (rev 261117)
+++ PKGBUILD2016-03-06 18:08:35 UTC (rev 261118)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.0.0
-pkgrel=7
+pkgrel=8
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2015-12-07 Thread Bartłomiej Piotrowski
Date: Monday, December 7, 2015 @ 14:07:36
  Author: bpiotrowski
Revision: 253353

C++11 ABI rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 13:02:31 UTC (rev 253352)
+++ PKGBUILD2015-12-07 13:07:36 UTC (rev 253353)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.0.0
-pkgrel=6
+pkgrel=7
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2015-10-27 Thread Evangelos Foutras
Date: Wednesday, October 28, 2015 @ 02:48:26
  Author: foutrelis
Revision: 249821

hdf5 1.8.15 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-28 01:26:47 UTC (rev 249820)
+++ PKGBUILD2015-10-28 01:48:26 UTC (rev 249821)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.0.0
-pkgrel=5
+pkgrel=6
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2015-10-12 Thread Ronald van Haren
Date: Monday, October 12, 2015 @ 13:32:58
  Author: ronald
Revision: 248921

upgpkg: octave 4.0.0-5

add libsndfile to deps: FS#46231

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-12 10:27:55 UTC (rev 248920)
+++ PKGBUILD2015-10-12 11:32:58 UTC (rev 248921)
@@ -5,12 +5,12 @@
 
 pkgname=octave
 pkgver=4.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;
 license=('GPL')
-depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu' 'ghostscript' 'suitesparse' 'gl2ps' 'qscintilla')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu' 'ghostscript' 'suitesparse' 'gl2ps' 'qscintilla' 'libsndfile')
 makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'qscintilla')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting')


[arch-commits] Commit in octave/trunk (PKGBUILD)

2015-10-09 Thread Gaetan Bisson
Date: Friday, October 9, 2015 @ 21:13:02
  Author: bisson
Revision: 248706

rebuild for graphicsmagick-1.3.22

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-09 19:03:51 UTC (rev 248705)
+++ PKGBUILD2015-10-09 19:13:02 UTC (rev 248706)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2015-09-09 Thread Evangelos Foutras
Date: Thursday, September 10, 2015 @ 06:46:19
  Author: foutrelis
Revision: 245672

ncurses 6.0 rebuild.

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-10 04:14:32 UTC (rev 245671)
+++ PKGBUILD2015-09-10 04:46:19 UTC (rev 245672)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2015-09-08 Thread Ronald van Haren
Date: Tuesday, September 8, 2015 @ 11:11:49
  Author: ronald
Revision: 245521

upgpkg: octave 4.0.0-2

move qscintilla optdepends -> depends FS#45956

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-08 07:46:42 UTC (rev 245520)
+++ PKGBUILD2015-09-08 09:11:49 UTC (rev 245521)
@@ -5,16 +5,15 @@
 
 pkgname=octave
 pkgver=4.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org;
 license=('GPL')
-depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu' 'ghostscript' 'suitesparse' 'gl2ps')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu' 'ghostscript' 'suitesparse' 'gl2ps' 'qscintilla')
 makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'qscintilla')
 optdepends=('texinfo: for help-support in octave'
-'gnuplot: alternative plotting'
-'qscintilla: experimental gui')
+'gnuplot: alternative plotting')
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.xz{,.sig})
 options=('!emptydirs')
 install=octave.install


[arch-commits] Commit in octave/trunk (PKGBUILD)

2015-04-29 Thread Felix Yan
Date: Wednesday, April 29, 2015 @ 11:39:56
  Author: fyan
Revision: 238244

upgpkg: octave 3.8.2-6

rebuild for qscintilla 2.9

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-29 09:27:52 UTC (rev 238243)
+++ PKGBUILD2015-04-29 09:39:56 UTC (rev 238244)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=3.8.2
-pkgrel=5
+pkgrel=6
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2015-03-05 Thread Gaetan Bisson
Date: Thursday, March 5, 2015 @ 20:33:38
  Author: bisson
Revision: 232906

fix FS#44055

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-05 15:41:55 UTC (rev 232905)
+++ PKGBUILD2015-03-05 19:33:38 UTC (rev 232906)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=3.8.2
-pkgrel=4
+pkgrel=5
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2015-01-27 Thread Felix Yan
Date: Tuesday, January 27, 2015 @ 16:34:22
  Author: fyan
Revision: 230119

upgpkg: octave 3.8.2-4

- add dependency on gl2ps (FS#38993)
- add validpgpkeys

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-27 14:43:22 UTC (rev 230118)
+++ PKGBUILD2015-01-27 15:34:22 UTC (rev 230119)
@@ -5,12 +5,12 @@
 
 pkgname=octave
 pkgver=3.8.2
-pkgrel=3
+pkgrel=4
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
 license=('GPL')
-depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu' 'ghostscript' 'suitesparse')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu' 'ghostscript' 'suitesparse' 'gl2ps')
 makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'qscintilla')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting'
@@ -21,6 +21,7 @@
 sha1sums=('02c38e0f69bce4e6dd7be7d301898347085d9c2d'
   'SKIP'
   'acbe2b6d77d6d5f7b9f6fc4019c362be36cf9452')
+validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}


[arch-commits] Commit in octave/trunk (PKGBUILD)

2014-11-24 Thread Felix Yan
Date: Tuesday, November 25, 2014 @ 05:19:08
  Author: fyan
Revision: 227075

upgpkg: octave 3.8.2-3

hdf5 1.8.14 rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-25 01:56:18 UTC (rev 227074)
+++ PKGBUILD2014-11-25 04:19:08 UTC (rev 227075)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=3.8.2
-pkgrel=2
+pkgrel=3
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD)

2014-11-20 Thread Ronald van Haren
Date: Thursday, November 20, 2014 @ 14:21:03
  Author: ronald
Revision: 226751

upgpkg: octave 3.8.2-2

fltk rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-20 12:55:48 UTC (rev 226750)
+++ PKGBUILD2014-11-20 13:21:03 UTC (rev 226751)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=3.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;


[arch-commits] Commit in octave/trunk (PKGBUILD octave-suitesparse.patch)

2014-10-06 Thread Ronald van Haren
Date: Monday, October 6, 2014 @ 21:31:21
  Author: ronald
Revision: 223933

fix building against suitesparse 3.4.1

Added:
  octave/trunk/octave-suitesparse.patch
Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |   20 ++-
 octave-suitesparse.patch |  299 +
 2 files changed, 313 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-06 18:46:37 UTC (rev 223932)
+++ PKGBUILD2014-10-06 19:31:21 UTC (rev 223933)
@@ -4,23 +4,29 @@
 # Contributor : cyberdune cyberd...@gmail.com
 
 pkgname=octave
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
 license=('GPL')
-depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu' 'ghostscript' 'suitesparse')
 makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'qscintilla')
 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})
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig} 
'octave-suitesparse.patch')
 options=('!emptydirs')
 install=octave.install
-sha1sums=('2951aeafe58d562672feb80dd8c3cfe0643a5087'
-  'SKIP')
+sha1sums=('02c38e0f69bce4e6dd7be7d301898347085d9c2d'
+  'SKIP'
+  'acbe2b6d77d6d5f7b9f6fc4019c362be36cf9452')
 
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/octave-suitesparse.patch
+}
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
@@ -29,7 +35,9 @@
   ./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
+  --with-umfpack=-lumfpack -lsuitesparseconfig  \
+  MOC=moc-qt4 UIC=uic-qt4
+# 
https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html 
 
   LANG=C make
 }

Added: octave-suitesparse.patch
===
--- octave-suitesparse.patch(rev 0)
+++ octave-suitesparse.patch2014-10-06 19:31:21 UTC (rev 223933)
@@ -0,0 +1,299 @@
+
+# HG changeset patch
+# User John W. Eaton j...@octave.org
+# 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 andre.cbar...@yahoo.com.
+
+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_castint (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
 

[arch-commits] Commit in octave/trunk (PKGBUILD)

2014-03-30 Thread Bartłomiej Piotrowski
Date: Sunday, March 30, 2014 @ 21:17:39
  Author: bpiotrowski
Revision: 209254

upgpkg: octave 3.8.1-1

- new upstream release
- build against glpk 4.54

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-30 18:46:11 UTC (rev 209253)
+++ PKGBUILD2014-03-30 19:17:39 UTC (rev 209254)
@@ -4,21 +4,21 @@
 # Contributor : cyberdune cyberd...@gmail.com
 
 pkgname=octave
-pkgver=3.8.0
-pkgrel=2
+pkgver=3.8.1
+pkgrel=1
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
 license=('GPL')
-depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu') 
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu')
 makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'qscintilla')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting'
-   'qscintilla: experimental gui')
+'qscintilla: experimental gui')
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig})
 options=('!emptydirs')
 install=octave.install
-sha1sums=('ebb03485b72d97fa01f105460f81016f94680f77'
+sha1sums=('2951aeafe58d562672feb80dd8c3cfe0643a5087'
   'SKIP')
 
 build() {



[arch-commits] Commit in octave/trunk (PKGBUILD)

2014-01-31 Thread Ronald van Haren
Date: Friday, January 31, 2014 @ 14:29:43
  Author: ronald
Revision: 204925

upgpkg: octave 3.8.0-2

change optional dep to qscintilla for experimental gui editor

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-31 12:48:39 UTC (rev 204924)
+++ PKGBUILD2014-01-31 13:29:43 UTC (rev 204925)
@@ -5,16 +5,16 @@
 
 pkgname=octave
 pkgver=3.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
 license=('GPL')
 depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu') 
-makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 
'qscintilla')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting'
-   'qt4: experimental gui')
+   'qscintilla: experimental gui')
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig})
 options=('!emptydirs')
 install=octave.install



[arch-commits] Commit in octave/trunk (PKGBUILD)

2014-01-27 Thread Ronald van Haren
Date: Monday, January 27, 2014 @ 20:21:46
  Author: ronald
Revision: 204806

upgpkg: octave 3.8.0-1

update to 3.8.0

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-27 16:16:12 UTC (rev 204805)
+++ PKGBUILD2014-01-27 19:21:46 UTC (rev 204806)
@@ -13,7 +13,8 @@
 depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu') 
 makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot')
 optdepends=('texinfo: for help-support in octave'
-'gnuplot: alternative plotting')
+'gnuplot: alternative plotting'
+   'qt4: experimental gui')
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig})
 options=('!emptydirs')
 install=octave.install



[arch-commits] Commit in octave/trunk (PKGBUILD mex-gcc-4.8.patch octave.install)

2014-01-26 Thread Ronald van Haren
Date: Sunday, January 26, 2014 @ 12:14:57
  Author: ronald
Revision: 204738

update PKGBUILD files for 3.8.0 release; extra makedepends are needed for 
building docs; patch no longer needed; wait for version 4 before including the 
gui, upstream doesn't considers it finished yet

Modified:
  octave/trunk/PKGBUILD
  octave/trunk/octave.install
Deleted:
  octave/trunk/mex-gcc-4.8.patch

---+
 PKGBUILD  |   21 ++---
 mex-gcc-4.8.patch |   31 ---
 octave.install|2 +-
 3 files changed, 7 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-26 10:45:02 UTC (rev 204737)
+++ PKGBUILD2014-01-26 11:14:57 UTC (rev 204738)
@@ -4,31 +4,22 @@
 # Contributor : cyberdune cyberd...@gmail.com
 
 pkgname=octave
-pkgver=3.6.4
-pkgrel=6
+pkgver=3.8.0
+pkgrel=1
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
 license=('GPL')
 depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu') 
-makedepends=('gcc-fortran' 'texlive-core' 'suitesparse')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}
-mex-gcc-4.8.patch)
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig})
 options=('!emptydirs')
 install=octave.install
-sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4'
-  'SKIP'
-  '0608af9b7ccce8455f534d2fc4acf2f4c8f83a60')
+sha1sums=('ebb03485b72d97fa01f105460f81016f94680f77'
+  'SKIP')
 
-prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # https://savannah.gnu.org/bugs/?38746
-  patch -Np1 -i ${srcdir}/mex-gcc-4.8.patch
-}
-
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 

Deleted: mex-gcc-4.8.patch
===
--- mex-gcc-4.8.patch   2014-01-26 10:45:02 UTC (rev 204737)
+++ mex-gcc-4.8.patch   2014-01-26 11:14:57 UTC (rev 204738)
@@ -1,31 +0,0 @@
-# HG changeset patch
-# User Clemens Buchacher dri...@aon.at
-# Date 1369937542 14400
-#  Thu May 30 14:12:22 2013 -0400
-# Node ID 122d3f62e179ba044d47e58510905719220d8706
-# Parent  e38a0fa08368d4dd6f3a0dfd20cbe28cf8555f73
-do not include C++ header in extern C context (bug #38746)
-
-* mex.h: Include mexproto.h outside of extern C block.
-
-diff -r e38a0fa08368 -r 122d3f62e179 src/mex.h
 a/src/mex.hMon May 27 21:41:57 2013 +0200
-+++ b/src/mex.hThu May 30 14:12:22 2013 -0400
-@@ -64,6 +64,8 @@
- 
- #define mxMAXNAME 64
- 
-+#include mexproto.h
-+
- #if defined (__cplusplus)
- extern C {
- #endif
-@@ -74,8 +76,6 @@
- void mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray *prhs[]);
- #endif
- 
--#include mexproto.h
--
- /* V4 floating point routines renamed in V5.  */
- #define mexIsNaN mxIsNaN
- #define mexIsFinite mxIsFinite

Modified: octave.install
===
--- octave.install  2014-01-26 10:45:02 UTC (rev 204737)
+++ octave.install  2014-01-26 11:14:57 UTC (rev 204738)
@@ -1,5 +1,5 @@
 info_dir=/usr/share/info
-info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 
octave.info-4 octave.info-5)
+info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 
octave.info-4 octave.info-5 octave.info-6 octave.info-7 octave.info-8)
 
 post_install() {
   for f in ${info_files[@]}; do



[arch-commits] Commit in octave/trunk (PKGBUILD)

2014-01-11 Thread Gaetan Bisson
Date: Saturday, January 11, 2014 @ 18:11:17
  Author: bisson
Revision: 203484

fix FS#38463

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-11 16:49:37 UTC (rev 203483)
+++ PKGBUILD2014-01-11 17:11:17 UTC (rev 203484)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=3.6.4
-pkgrel=5
+pkgrel=6
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
@@ -36,7 +36,7 @@
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
   --enable-shared --disable-static \
-  --with-quantum-depth=32 \
+  --with-quantum-depth=16 \
   --with-umfpack=-lumfpack -lsuitesparseconfig # 
https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html
 
   LANG=C make



[arch-commits] Commit in octave/trunk (PKGBUILD)

2013-12-23 Thread Ronald van Haren
Date: Monday, December 23, 2013 @ 20:41:07
  Author: ronald
Revision: 202660

upgpkg: octave 3.6.4-4

add quantum-dept=32 to configure flags; move suitesparse to makedepends; add 
glu to depends

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-23 18:00:07 UTC (rev 202659)
+++ PKGBUILD2013-12-23 19:41:07 UTC (rev 202660)
@@ -10,8 +10,8 @@
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
 license=('GPL')
-depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 
'suitesparse' 'arpack')
-makedepends=('gcc-fortran' 'texlive-core')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 
'glu') 
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting')
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}
@@ -22,16 +22,21 @@
   'SKIP'
   '0608af9b7ccce8455f534d2fc4acf2f4c8f83a60')
 
-build() {
+prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # https://savannah.gnu.org/bugs/?38746
   patch -Np1 -i ${srcdir}/mex-gcc-4.8.patch
+}
 
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
   autoreconf -vfi
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
   --enable-shared --disable-static \
+  --with-quantum-depth=32 \
   --with-umfpack=-lumfpack -lsuitesparseconfig # 
https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html
 
   LANG=C make



[arch-commits] Commit in octave/trunk (PKGBUILD)

2013-12-23 Thread Ronald van Haren
Date: Monday, December 23, 2013 @ 20:53:15
  Author: ronald
Revision: 202664

upgpkg: octave 3.6.4-5

add quantum-dept=32 to configure flags; move suitesparse to makedepends; add 
glu to depends

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-23 19:43:23 UTC (rev 202663)
+++ PKGBUILD2013-12-23 19:53:15 UTC (rev 202664)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=3.6.4
-pkgrel=4
+pkgrel=5
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;



[arch-commits] Commit in octave/trunk (PKGBUILD)

2013-09-14 Thread Bartłomiej Piotrowski
Date: Saturday, September 14, 2013 @ 12:56:47
  Author: bpiotrowski
Revision: 194350

upgpkg: octave 3.6.4-4

- rebuild against hdf5 1.8.11

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-14 10:32:15 UTC (rev 194349)
+++ PKGBUILD2013-09-14 10:56:47 UTC (rev 194350)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=3.6.4
-pkgrel=3
+pkgrel=4
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;



[arch-commits] Commit in octave/trunk (PKGBUILD)

2013-07-31 Thread Bartłomiej Piotrowski
Date: Wednesday, July 31, 2013 @ 18:19:53
  Author: bpiotrowski
Revision: 191853

upgpkg: octave 3.6.4-3

- rebuild against glpk 4.52

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-31 15:56:25 UTC (rev 191852)
+++ PKGBUILD2013-07-31 16:19:53 UTC (rev 191853)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=3.6.4
-pkgrel=2
+pkgrel=3
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;



[arch-commits] Commit in octave/trunk (PKGBUILD)

2013-05-17 Thread Ronald van Haren
Date: Friday, May 17, 2013 @ 15:45:31
  Author: ronald
Revision: 185712

upgpkg: octave 3.6.4-1

update to 3.6.4

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |   15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-17 13:08:14 UTC (rev 185711)
+++ PKGBUILD2013-05-17 13:45:31 UTC (rev 185712)
@@ -4,8 +4,8 @@
 # Contributor : cyberdune cyberd...@gmail.com
 
 pkgname=octave
-pkgver=3.6.3
-pkgrel=2
+pkgver=3.6.4
+pkgrel=1
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
@@ -14,20 +14,15 @@
 makedepends=('gcc-fortran' 'texlive-core')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}
-octave-gethelp.patch)
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig})
 options=('!emptydirs')
 install=octave.install
-sha1sums=('e8bd0c0b33ab9714ddb524f2258546c3536f0628'
-  'de009a9e6803de6b831cbd836cbc85c291de8a3c'
-  'd39d54763ac86114029f8bc5d60763d2adce27bb')
+sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4'
+  'SKIP')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # 
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-help.patch?view=log
-  patch -Np0 -i ${srcdir}/octave-gethelp.patch
-
   autoreconf -vfi
 
   # http://www.nabble.com/Random-rounding-errors-td16010966.html



[arch-commits] Commit in octave/trunk (PKGBUILD)

2013-02-16 Thread Ronald van Haren
Date: Saturday, February 16, 2013 @ 15:48:34
  Author: ronald
Revision: 178110

upgpkg: octave 3.6.3-2

glpk rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-16 12:42:26 UTC (rev 178109)
+++ PKGBUILD2013-02-16 14:48:34 UTC (rev 178110)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=3.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;



[arch-commits] Commit in octave/trunk (PKGBUILD buildfix.diff octave-gethelp.patch)

2012-10-12 Thread andyrtr
Date: Friday, October 12, 2012 @ 17:19:26
  Author: andyrtr
Revision: 168502

upgpkg: octave 3.6.2-2

mesa - glu rebuild; add some buildfixes

Added:
  octave/trunk/buildfix.diff
  octave/trunk/octave-gethelp.patch
Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |   24 ++---
 buildfix.diff|   85 +
 octave-gethelp.patch |   13 +++
 3 files changed, 116 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-12 19:21:30 UTC (rev 168501)
+++ PKGBUILD2012-10-12 21:19:26 UTC (rev 168502)
@@ -5,28 +5,40 @@
 
 pkgname=octave
 pkgver=3.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
 license=('GPL')
-depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 
'gcc-libs' 'qhull' 'fltk' 'suitesparse') 
+depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 
'gcc-libs' 'qhull' 'fltk' 'suitesparse')
 makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'suitesparse' 
'texlive-core')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2;)
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2;
+buildfix.diff
+octave-gethelp.patch)
 options=('!emptydirs')
 install=octave.install
-sha1sums=('145fef0122268086727a60e1c33e29d56fd546d7')
-   
+sha1sums=('145fef0122268086727a60e1c33e29d56fd546d7'
+  'a7cdba1e05fbdd182facdd804aeec3772921'
+  'd39d54763ac86114029f8bc5d60763d2adce27bb')
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  # patch by Gentoo 
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-gets.patch?view=log
+  patch -Np0 -i ${srcdir}/buildfix.diff
+  # 
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-help.patch?view=log
+  patch -Np0 -i ${srcdir}/octave-gethelp.patch
+
+  autoreconf -vfi
+
   # http://www.nabble.com/Random-rounding-errors-td16010966.html
   FFLAGS=-O -ffloat-store \
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static
+  --enable-shared --disable-static \
+  --with-umfpack=-lumfpack -lsuitesparseconfig # 
https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html
 
   LANG=C make
 }

Added: buildfix.diff
===
--- buildfix.diff   (rev 0)
+++ buildfix.diff   2012-10-12 21:19:26 UTC (rev 168502)
@@ -0,0 +1,85 @@
+--- libgnu/stdio.in.h.origs2012-05-24 12:46:13.0 -0600
 libgnu/stdio.in.h  2012-05-24 16:29:54.813734894 -0600
+@@ -1,12 +1,10 @@
+-/* -*- buffer-read-only: t -*- vi: set ro: */
+-/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+ /* A GNU-like stdio.h.
+ 
+Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc.
+ 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation; either version 3, or (at your option)
++   the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+This program is distributed in the hope that it will be useful,
+@@ -15,8 +13,7 @@
+GNU General Public License for more details.
+ 
+You should have received a copy of the GNU General Public License
+-   along with this program; if not, write to the Free Software Foundation,
+-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
++   along with this program; if not, see http://www.gnu.org/licenses/.  */
+ 
+ #if __GNUC__ = 3
+ @PRAGMA_SYSTEM_HEADER@
+@@ -55,7 +52,8 @@
+ #include stddef.h
+ 
+ /* Get off_t and ssize_t.  Needed on many systems, including glibc 2.8
+-   and eglibc 2.11.2.  */
++   and eglibc 2.11.2.
++   May also define off_t to a 64-bit type on native Windows.  */
+ #include sys/types.h
+ 
+ /* The __attribute__ feature is available in gcc versions 2.5 and later.
+@@ -701,22 +699,11 @@ _GL_WARN_ON_USE (getline, getline is un
+ # endif
+ #endif
+ 
+-#if @GNULIB_GETS@
+-# if @REPLACE_STDIO_READ_FUNCS@  @GNULIB_STDIO_H_NONBLOCKING@
+-#  if !(defined __cplusplus  defined GNULIB_NAMESPACE)
+-#   undef gets
+-#   define gets rpl_gets
+-#  endif
+-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
+-_GL_CXXALIAS_RPL (gets, char *, (char *s));
+-# else
+-_GL_CXXALIAS_SYS (gets, char *, (char *s));
+-#  undef gets
+-# endif
+-_GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
++   

[arch-commits] Commit in octave/trunk (PKGBUILD)

2012-06-17 Thread Ronald van Haren
Date: Sunday, June 17, 2012 @ 15:51:18
  Author: ronald
Revision: 161970

upgpkg: octave 3.6.2-1

update to 3.6.2

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-17 18:33:21 UTC (rev 161969)
+++ PKGBUILD2012-06-17 19:51:18 UTC (rev 161970)
@@ -4,8 +4,8 @@
 # Contributor : cyberdune cyberd...@gmail.com
 
 pkgname=octave
-pkgver=3.6.1
-pkgrel=2
+pkgver=3.6.2
+pkgrel=1
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
@@ -17,7 +17,7 @@
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2;)
 options=('!emptydirs')
 install=octave.install
-sha1sums=('46fdc0b3d7db1b0266975a7443e26769c939a9c7')
+sha1sums=('145fef0122268086727a60e1c33e29d56fd546d7')

 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -38,5 +38,5 @@
 
   # 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
+  echo /usr/lib/${pkgname}/${pkgver}  
${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
 }



[arch-commits] Commit in octave/trunk (PKGBUILD)

2012-03-18 Thread Ronald van Haren
Date: Sunday, March 18, 2012 @ 15:06:26
  Author: ronald
Revision: 153723

upgpkg: octave 3.6.1-2

rebuild against suitesparse

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-18 17:12:55 UTC (rev 153722)
+++ PKGBUILD2012-03-18 19:06:26 UTC (rev 153723)
@@ -5,16 +5,15 @@
 
 pkgname=octave
 pkgver=3.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
 license=('GPL')
-depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 
'gcc-libs' 'qhull' 'fltk')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core')
+depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 
'gcc-libs' 'qhull' 'fltk' 'suitesparse') 
+makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'suitesparse' 
'texlive-core')
 optdepends=('texinfo: for help-support in octave'
-'gnuplot: alternative plotting'
-   'umfpack: LU decomposition of some large sparse matrices')
+'gnuplot: alternative plotting')
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2;)
 options=('!emptydirs')
 install=octave.install
@@ -27,7 +26,7 @@
   FFLAGS=-O -ffloat-store \
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static --with-quantum-depth=16
+  --enable-shared --disable-static
 
   LANG=C make
 }



[arch-commits] Commit in octave/trunk (PKGBUILD)

2012-02-26 Thread Ronald van Haren
Date: Sunday, February 26, 2012 @ 03:17:31
  Author: ronald
Revision: 151389

upgpkg: octave 3.6.1-1

update to 3.6.1

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-26 00:32:41 UTC (rev 151388)
+++ PKGBUILD2012-02-26 08:17:31 UTC (rev 151389)
@@ -4,8 +4,8 @@
 # Contributor : cyberdune cyberd...@gmail.com
 
 pkgname=octave
-pkgver=3.6.0
-pkgrel=2
+pkgver=3.6.1
+pkgrel=1
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
@@ -18,7 +18,7 @@
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2;)
 options=('!emptydirs')
 install=octave.install
-sha1sums=('62116e090d257a601e9d605f969dd87b7de1ffce')
+sha1sums=('46fdc0b3d7db1b0266975a7443e26769c939a9c7')

 build() {
   cd ${srcdir}/${pkgname}-${pkgver}



[arch-commits] Commit in octave/trunk (PKGBUILD)

2012-02-21 Thread Ronald van Haren
Date: Tuesday, February 21, 2012 @ 16:02:36
  Author: ronald
Revision: 150771

upgpkg: octave 3.6.0-2

move fltk from optdepends to depends FS#28410

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-21 20:45:23 UTC (rev 150770)
+++ PKGBUILD2012-02-21 21:02:36 UTC (rev 150771)
@@ -5,17 +5,16 @@
 
 pkgname=octave
 pkgver=3.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
 license=('GPL')
-depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 
'gcc-libs' 'qhull')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core' 
'fltk')
+depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 
'gcc-libs' 'qhull' 'fltk')
+makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting'
-   'umfpack: LU decomposition of some large sparse matrices'
-   'fltk: alternative plotting')
+   'umfpack: LU decomposition of some large sparse matrices')
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2;)
 options=('!emptydirs')
 install=octave.install



[arch-commits] Commit in octave/trunk (PKGBUILD)

2012-02-13 Thread Ronald van Haren
Date: Monday, February 13, 2012 @ 09:10:32
  Author: ronald
Revision: 150142

upgpkg: octave 3.6.0-1

update to 3.6.0

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 13:07:00 UTC (rev 150141)
+++ PKGBUILD2012-02-13 14:10:32 UTC (rev 150142)
@@ -4,8 +4,8 @@
 # Contributor : cyberdune cyberd...@gmail.com
 
 pkgname=octave
-pkgver=3.4.3
-pkgrel=2
+pkgver=3.6.0
+pkgrel=1
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
@@ -19,7 +19,7 @@
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2;)
 options=('!emptydirs')
 install=octave.install
-sha1sums=('fe622c28a38f8730c59e46211bc7b18e7f51a679')
+sha1sums=('62116e090d257a601e9d605f969dd87b7de1ffce')

 build() {
   cd ${srcdir}/${pkgname}-${pkgver}



[arch-commits] Commit in octave/trunk (PKGBUILD)

2012-02-08 Thread Allan McRae
Date: Wednesday, February 8, 2012 @ 07:11:12
  Author: allan
Revision: 149531

upgpkg: octave 3.4.3-2

pcre rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-08 11:51:04 UTC (rev 149530)
+++ PKGBUILD2012-02-08 12:11:12 UTC (rev 149531)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=3.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;



[arch-commits] Commit in octave/trunk (PKGBUILD)

2011-10-27 Thread Ronald van Haren
Date: Thursday, October 27, 2011 @ 10:25:24
  Author: ronald
Revision: 141253

upgpkg: octave 3.4.3-1

bump to 3.4.3; implement FS#25804 16 bit quantum dept; implement FS#25913 
enable alternative fltk plot library

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |   19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-27 12:55:01 UTC (rev 141252)
+++ PKGBUILD2011-10-27 14:25:24 UTC (rev 141253)
@@ -4,34 +4,31 @@
 # Contributor : cyberdune cyberd...@gmail.com
 
 pkgname=octave
-pkgver=3.4.2
-pkgrel=2
+pkgver=3.4.3
+pkgrel=1
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
 license=('GPL')
 depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 
'gcc-libs' 'qhull')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core')
+makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core' 
'fltk')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting'
-   'umfpack: LU decomposition of some large sparse matrices')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2; curlfix.patch)
+   'umfpack: LU decomposition of some large sparse matrices'
+   'fltk: alternative plotting')
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2;)
 options=('!emptydirs')
 install=octave.install
-sha1sums=('12cac29ef7d1ab8374980e1e2fd14637b2f15ba5'
-  '3f856798f5f8aa15bce1200b8abd059154f3d909')
+sha1sums=('fe622c28a38f8730c59e46211bc7b18e7f51a679')

 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # remove curl/types.h include
-  patch -Np0 -i ${srcdir}/curlfix.patch
-
   # http://www.nabble.com/Random-rounding-errors-td16010966.html
   FFLAGS=-O -ffloat-store \
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static
+  --enable-shared --disable-static --with-quantum-depth=16
 
   LANG=C make
 }



[arch-commits] Commit in octave/trunk (PKGBUILD curlfix.patch)

2011-07-14 Thread Ronald van Haren
Date: Thursday, July 14, 2011 @ 08:35:49
  Author: ronald
Revision: 131750

upgpkg: octave 3.4.2-2
enable documentation; add texlive-core to makedepends

Added:
  octave/trunk/curlfix.patch
Modified:
  octave/trunk/PKGBUILD

---+
 PKGBUILD  |   23 ---
 curlfix.patch |   10 ++
 2 files changed, 22 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-14 12:11:14 UTC (rev 131749)
+++ PKGBUILD2011-07-14 12:35:49 UTC (rev 131750)
@@ -5,34 +5,35 @@
 
 pkgname=octave
 pkgver=3.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
 license=('GPL')
 depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 
'gcc-libs' 'qhull')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack')
+makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting'
'umfpack: LU decomposition of some large sparse matrices')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2;)
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2; curlfix.patch)
 options=('!emptydirs')
-#install=octave.install
-sha1sums=('12cac29ef7d1ab8374980e1e2fd14637b2f15ba5')
-
+install=octave.install
+sha1sums=('12cac29ef7d1ab8374980e1e2fd14637b2f15ba5'
+  '3f856798f5f8aa15bce1200b8abd059154f3d909')
+   
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  # remove curl/types.h include
+  patch -Np0 -i ${srcdir}/curlfix.patch
+
   # http://www.nabble.com/Random-rounding-errors-td16010966.html
   FFLAGS=-O -ffloat-store \
 
-  # Avoid build failure due to missing curl/types.h
-  sed -i /curl\/types.h/d src/DLD-FUNCTIONS/urlwrite.cc
-
   ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static --disable-docs 
+  --enable-shared --disable-static
 
-  make
+  LANG=C make
 }
 
 package(){

Added: curlfix.patch
===
--- curlfix.patch   (rev 0)
+++ curlfix.patch   2011-07-14 12:35:49 UTC (rev 131750)
@@ -0,0 +1,10 @@
+--- src/DLD-FUNCTIONS/urlwrite.cc.old  2011-07-02 16:39:22.466603778 +0200
 src/DLD-FUNCTIONS/urlwrite.cc  2011-07-02 16:39:54.543269859 +0200
+@@ -52,7 +52,6 @@
+ 
+ #include curl/curl.h
+ #include curl/curlver.h
+-#include curl/types.h
+ #include curl/easy.h
+ 
+ static int



[arch-commits] Commit in octave/trunk (PKGBUILD)

2011-07-09 Thread Stéphane Gaudreault
Date: Saturday, July 9, 2011 @ 16:49:15
  Author: stephane
Revision: 131039

upgpkg: octave 3.4.2-1
version bump, rebuild for hdf5

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |   18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-09 20:10:15 UTC (rev 131038)
+++ PKGBUILD2011-07-09 20:49:15 UTC (rev 131039)
@@ -4,8 +4,8 @@
 # Contributor : cyberdune cyberd...@gmail.com
 
 pkgname=octave
-pkgver=3.4.0
-pkgrel=2
+pkgver=3.4.2
+pkgrel=1
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
@@ -15,24 +15,22 @@
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting'
'umfpack: LU decomposition of some large sparse matrices')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2;
-   octave-3.4.0-gcc46.patch)
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2;)
 options=('!emptydirs')
 #install=octave.install
-sha1sums=('936a8fc962abd96e7568fb5909ec2a4d7997a1a8'
-  '791c905a80510783e5f9c556c12f02400887fbec')
+sha1sums=('12cac29ef7d1ab8374980e1e2fd14637b2f15ba5')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # fedora gcc46 patch
-  patch -Np1 -i ${srcdir}/octave-3.4.0-gcc46.patch
-
   # http://www.nabble.com/Random-rounding-errors-td16010966.html
   FFLAGS=-O -ffloat-store \
 
+  # Avoid build failure due to missing curl/types.h
+  sed -i /curl\/types.h/d src/DLD-FUNCTIONS/urlwrite.cc
+
   ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static --disable-docs
+  --enable-shared --disable-static --disable-docs 
 
   make
 }



[arch-commits] Commit in octave/trunk (PKGBUILD)

2011-07-01 Thread Ronald van Haren
Date: Friday, July 1, 2011 @ 12:38:23
  Author: ronald
Revision: 130057

FS#24508 - add octave library path to ld.so.conf.d

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |4 
 1 file changed, 4 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-01 16:19:47 UTC (rev 130056)
+++ PKGBUILD2011-07-01 16:38:23 UTC (rev 130057)
@@ -41,4 +41,8 @@
   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
 }



[arch-commits] Commit in octave/trunk (PKGBUILD)

2011-04-27 Thread Ronald van Haren
Date: Wednesday, April 27, 2011 @ 14:09:04
  Author: ronald
Revision: 120945

upgpkg: octave 3.4.0-2
disable install file (no info files as documentation fails to build)

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-27 15:50:47 UTC (rev 120944)
+++ PKGBUILD2011-04-27 18:09:04 UTC (rev 120945)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
@@ -18,7 +18,7 @@
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2;
octave-3.4.0-gcc46.patch)
 options=('!emptydirs')
-install=octave.install
+#install=octave.install
 sha1sums=('936a8fc962abd96e7568fb5909ec2a4d7997a1a8'
   '791c905a80510783e5f9c556c12f02400887fbec')
 



[arch-commits] Commit in octave/trunk (PKGBUILD)

2010-12-15 Thread Ronald van Haren
Date: Wednesday, December 15, 2010 @ 16:12:17
  Author: ronald
Revision: 103149

upgpkg: octave 3.2.4-2
imread patch for graphicsmagick 1.3.12

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-15 21:11:48 UTC (rev 103148)
+++ PKGBUILD2010-12-15 21:12:17 UTC (rev 103149)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=3.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
@@ -16,19 +16,21 @@
 'gnuplot: alternative plotting'
'umfpack: LU decomposition of some large sparse matrices')
 source=(ftp://ftp.octave.org/pub/octave/octave-$pkgver.tar.bz2;
-   'octave-3.2.0_as_needed.patch'  'octave-3.2.0_parallel_make.patch')
+   'octave-3.2.0_as_needed.patch'  'octave-3.2.0_parallel_make.patch' 
'imread.patch')
 options=('!emptydirs')
 install=octave.install
 md5sums=('608196657f4fa010420227b77333bb71'
  '33c8886cd908ace40f8b60334df1c34f'
- 'd59d783a8d7e8d8306caed4b2b8671a4')
+ 'd59d783a8d7e8d8306caed4b2b8671a4'
+ '72d33ba1a862244f970cf259923815d9')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # gentoo patches
-  patch -Np1 -i ${srcdir}/octave-3.2.0_as_needed.patch || return 1
-  patch -Np1 -i ${srcdir}/octave-3.2.0_parallel_make.patch || return 1
+  patch -Np1 -i ${srcdir}/octave-3.2.0_as_needed.patch
+  patch -Np1 -i ${srcdir}/octave-3.2.0_parallel_make.patch 
+  patch -Np0 -i ${srcdir}/imread.patch
   
   # http://www.nabble.com/Random-rounding-errors-td16010966.html
   FFLAGS=-O -ffloat-store \
@@ -36,7 +38,12 @@
   ./configure --prefix=/usr --libexecdir=/usr/lib \
   --enable-shared --disable-static
 
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
+}
 
+package(){
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+
 }



[arch-commits] Commit in octave/trunk (PKGBUILD)

2010-05-06 Thread Ronald van Haren
Date: Thursday, May 6, 2010 @ 16:51:49
  Author: ronald
Revision: 79776

add gcc-libs to deps, not catched by namcap but seems to be needed

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-06 16:37:54 UTC (rev 79775)
+++ PKGBUILD2010-05-06 20:51:49 UTC (rev 79776)
@@ -10,7 +10,7 @@
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
 license=('GPL')
-depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5')
+depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 
'gcc-libs')
 makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting'



[arch-commits] Commit in octave/trunk (PKGBUILD)

2010-01-22 Thread Ronald van Haren
Date: Friday, January 22, 2010 @ 03:58:45
  Author: ronald
Revision: 64811

upgpkg: octave 3.2.3-3
rebuild using correct makepkg.conf so info/dir is removed

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-22 08:53:36 UTC (rev 64810)
+++ PKGBUILD2010-01-22 08:58:45 UTC (rev 64811)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=3.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;



[arch-commits] Commit in octave/trunk (PKGBUILD)

2010-01-21 Thread Ronald van Haren
Date: Thursday, January 21, 2010 @ 08:01:38
  Author: ronald
Revision: 64622

upgpkg: octave 3.2.3-2
libpng / libjpeg rebuild

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-21 11:47:34 UTC (rev 64621)
+++ PKGBUILD2010-01-21 13:01:38 UTC (rev 64622)
@@ -5,13 +5,13 @@
 
 pkgname=octave
 pkgver=3.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
 license=('GPL')
-depends=('fftw=3.2.2' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick=1.3.6')
-makedepends=('texinfo' 'graphicsmagick')
+depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick')
+makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran')
 optdepends=('texinfo: for help-support in octave'
 'gnuplot: alternative plotting')
 source=(ftp://ftp.octave.org/pub/octave/octave-$pkgver.tar.bz2;