[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 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