testing/octave: upgrade to 4.2.0

4 files changed, 43 insertions, 48 deletions

diff --git a/testing/octave/APKBUILD b/testing/octave/APKBUILD
index fde2a5cd88b..83c7b83bed3 100644
--- a/testing/octave/APKBUILD
+++ b/testing/octave/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Daniel Sabogal <dsabogalcc@gmail.com>
 # Maintainer:
 pkgname=octave
-pkgver=4.0.3
-pkgrel=2
+pkgver=4.2.0
+pkgrel=0
 pkgdesc="A high-level language, primarily intended for numerical computations"
 url="https://www.gnu.org/software/octave/"
 arch="all"
@@ -13,7 +13,7 @@ makedepends="autoconf automake bison curl fftw-dev fltk-dev fontconfig-dev
 	freetype-dev gfortran glu-dev gnuplot imagemagick-dev hdf5-dev
 	lapack-dev libsm-dev libltdl lcms2-dev pcre-dev perl pkgconf qt-dev
 	readline-dev texinfo zlib-dev"
-source="ftp://ftp.gnu.org/gnu/octave/$pkgname-$pkgver.tar.xz
+source="ftp://ftp.gnu.org/gnu/octave/$pkgname-$pkgver.tar.gz
 	less-docs.patch
 	libinterp-deps.patch
 	abs.patch
@@ -50,18 +50,18 @@ package() {
 	rm -rf "$pkgdir"/usr/lib/charset.alias
 }
 
-md5sums="73b140bc69ac21cfaa3e473b91b6842b  octave-4.0.3.tar.xz
-79635f1a1a0fd1b583a4a01555cc40e8  less-docs.patch
-a9e3611f8526c609751dae3c35afaa8c  libinterp-deps.patch
-e08fd7a3d035fde524dd92ed0603ce57  abs.patch
+md5sums="4423db4dd6c2b43cacf9e9dcfa95473d  octave-4.2.0.tar.gz
+1b8f1f97aa4acc3777c8760759ef3bb0  less-docs.patch
+cf78869bd53964b339578c054614de38  libinterp-deps.patch
+bb971c157909841c1ccbe17ae0c6244c  abs.patch
 e22f7385ef92fab75191c8925455c097  gnulib.patch"
-sha256sums="dc2bec8c68fa5733a5847563634b1729356a84f3a5071008ecdb793293f0aa85  octave-4.0.3.tar.xz
-2f6c87158b73c2d5881d3f5ae5b4e6811398b8868ae9ba9b202631f4b0588296  less-docs.patch
-1cbfb7648783a9320a7a03f0f391074af5d1318bef796ddffd2d9cbacc685d22  libinterp-deps.patch
-28ac40c2e4dbafac313f34a68560da42027815b08a880d44c61f97d9c660ce04  abs.patch
+sha256sums="443ba73782f3531c94bcf016f2f0362a58e186ddb8269af7dcce973562795567  octave-4.2.0.tar.gz
+827aae1d7ca615a855733d031aa77aedc076b4db01bb70add4e5631f9084a326  less-docs.patch
+978280090f7e490c5e5b92785854b6dbe2971e1c7ed9c1f3c087a6e6f61a40e8  libinterp-deps.patch
+fe0683d91d36805a7787fb5b70ccc052a6aaf08594b95b97a904504f5227986d  abs.patch
 75562bd81b6cb44e9e5bacf8b1ba556df565001f9dea7960a4346073ed997c33  gnulib.patch"
-sha512sums="bad009235b04be09c051dd27ebef7df2542adec0a0b57c070662deebe33a0cdceb7d6816653f5afc3fc0cc1287ba1ca1a5c50858169004210224039374c9c55d  octave-4.0.3.tar.xz
-d1f1e4c475cbeeac805c5ffefe19e1a65185259dfc55dabc5debc57b184de3573065c3879295ec42101ac3c7a57798c56330793eef84ae361c09e61ed3dc0f0c  less-docs.patch
-5ae08ddcdea63804154f5ba3808369558f717fd696f1a4ee7dccfd96c52cdb8afc85a564522d5b0cdc83c1f0a7f5ef8d509a293af2d227c8f0fe188420349733  libinterp-deps.patch
-52ff16908f5ffb736dfb442bf1950b7595d8999464bbcb8265b754b8a3bdfe4f18fe5194bd4ec8606219d0e70fc82d60429e8c3c4aa33b8eb1fe54c2c5490ca2  abs.patch
+sha512sums="5d16665d4ef8f218320f471704f8702f3a2911cc4a083cae318c1df0f787d50dddbc511dc91e11379314d65cecac6d521abac026860feca19d11ffdb52d3e678  octave-4.2.0.tar.gz
+eb2b754c15eda423bf59061728052993a2ee9611d474e7fa6026f2961561764e6fc56fbb8128ec266bb569e99d7fecb5b68b5ed3f02ae33dd27709a89426f204  less-docs.patch
+093b13ad457e290d746908a5de1855071b2cd27b4c08101826d32fcf63398e863c3b72bb81f19255a04a880a2bf49e3ced1141bf7d0044db1328c6f2c9492f66  libinterp-deps.patch
+bcd111f35baf2681da2b1ad1edbe956ee359c5fb0114797b27747fa78e6f118406bb7fb325c1fa03c18e29815d2d4b8d9a28faf72c1fbbec526e8fbaed0cb820  abs.patch
 50d9a7cefc0d39b666b646abe26148d7640ed2c4505244e3b5d4ba4348f80fc5d0d08465a575682fcae88d245bf72e7ba13df580003a2c5de6b7b222131a5392  gnulib.patch"
diff --git a/testing/octave/abs.patch b/testing/octave/abs.patch
index e7059f3cc03..3b892f3b5a2 100644
--- a/testing/octave/abs.patch
+++ b/testing/octave/abs.patch
@@ -1,16 +1,6 @@
-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.abs	2015-05-23 08:21:53.000000000 -0600
-+++ octave-4.0.0/libinterp/corefcn/pr-output.cc	2016-02-21 08:59:30.966291273 -0700
-@@ -21,7 +21,7 @@ along with Octave; see the file COPYING.
- */
- 
- #ifdef HAVE_CONFIG_H
--#include <config.h>
-+#include "config.h"
- #endif
- 
- #include <cfloat>
-@@ -3145,6 +3145,14 @@ PRINT_INT_SCALAR_INTERNAL (uint32_t)
+--- octave-4.2.0/libinterp/corefcn/pr-output.cc.orig
++++ octave-4.2.0/libinterp/corefcn/pr-output.cc
+@@ -3152,6 +3152,14 @@
  PRINT_INT_SCALAR_INTERNAL (int64_t)
  PRINT_INT_SCALAR_INTERNAL (uint64_t)
  
@@ -22,6 +12,6 @@ diff -up octave-4.0.0/libinterp/corefcn/pr-output.cc.abs octave-4.0.0/libinterp/
 +inline signed char abs (signed char x) { return abs((int)x); }
 +inline short int abs (short int x) { return abs((int)x); }
 +
- template <class T>
+ template <typename T>
  /* static */ inline void
  octave_print_internal_template (std::ostream& os, const intNDArray<T>& nda,
diff --git a/testing/octave/less-docs.patch b/testing/octave/less-docs.patch
index c46ee2553b5..743f05c18c3 100644
--- a/testing/octave/less-docs.patch
+++ b/testing/octave/less-docs.patch
@@ -1,11 +1,16 @@
---- octave-4.0.3/doc/interpreter/Makefile.in.orig
-+++ octave-4.0.3/doc/interpreter/Makefile.in
-@@ -3357,7 +3357,7 @@
- plot-textproperties.texi: genpropdoc.m
- 	$(AM_V_GEN)$(call gen-propdoc-texi,text)
+--- octave-4.2.0/doc/interpreter/module.mk.orig
++++ octave-4.2.0/doc/interpreter/module.mk
+@@ -250,12 +250,7 @@
  
--all-local: dvi html pdf ps doc-cache
-+all-local: doc-cache
- 
- html: $(HTMLDIR_IMAGES)
+ DOC_TARGETS += \
+   $(srcdir)/doc/interpreter/octave.info \
+-  doc/interpreter/doc-cache \
+-  doc/interpreter/octave.ps \
+-  doc/interpreter/octave.pdf \
+-  $(OCTAVE_HTML_STAMP) \
+-  $(HTMLDIR_IMAGES) \
+-  $(HTMLDIR_CSS)
++  doc/interpreter/doc-cache
  
+ ## Distribute both OCTAVE_CSS and HTMLDIR_CSS so that the rules for
+ ## building HTMLDIR_CSS work properly.
diff --git a/testing/octave/libinterp-deps.patch b/testing/octave/libinterp-deps.patch
index 6fd09a066b3..0c8736069d8 100644
--- a/testing/octave/libinterp-deps.patch
+++ b/testing/octave/libinterp-deps.patch
@@ -1,10 +1,10 @@
---- octave-4.0.3/libinterp/link-deps.mk.orig
-+++ octave-4.0.3/libinterp/link-deps.mk
-@@ -10,6 +10,7 @@
-   $(FT2_LIBS) \
-   $(HDF5_LIBS) \
-   $(MAGICK_LIBS) \
-+  $(Z_LIBS) \
-   $(FFTW_XLIBS) \
-   $(OPENGL_LIBS) \
-   $(X11_LIBS) \
+--- a/libinterp/corefcn/module.mk
++++ b/libinterp/corefcn/module.mk
+@@ -318,6 +318,7 @@
+   $(HDF5_CPPFLAGS) \
+   $(LLVM_CPPFLAGS) \
+   $(Z_CPPFLAGS)
++libinterp_corefcn_libcorefcn_la_LIBADD = $(Z_LIBS)
+ 
+ libinterp_corefcn_libcorefcn_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
+