From f87c9a9d5c8ca846d1a0b466c6ec037eef1be7c2 Mon Sep 17 00:00:00 2001 From: Twaik Yont Date: Wed, 23 Oct 2024 08:33:50 +0300 Subject: [PATCH] bump({main,x11}/octave{,-x}): 9.2.0 --- packages/octave/0003-undefine-the-macro-in-pwd.h.patch | 7 +++---- packages/octave/build.sh | 5 ++--- .../octave-x/0003-undefine-the-macro-in-pwd.h.patch | 7 +++---- x11-packages/octave-x/build.sh | 6 +++--- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/packages/octave/0003-undefine-the-macro-in-pwd.h.patch b/packages/octave/0003-undefine-the-macro-in-pwd.h.patch index 0120402a06b42ce..1db6c7ccd9fbc0d 100644 --- a/packages/octave/0003-undefine-the-macro-in-pwd.h.patch +++ b/packages/octave/0003-undefine-the-macro-in-pwd.h.patch @@ -1,6 +1,5 @@ ---- a/liboctave/system/oct-password.cc -+++ b/liboctave/system/oct-password.cc -@@ -31,6 +31,15 @@ ++++ ./liboctave/wrappers/pwd-wrappers.c +@@ -32,6 +32,15 @@ #if defined (HAVE_PWD_H) # include @@ -15,4 +14,4 @@ +# endif #endif - #include "lo-error.h" + #include "pwd-wrappers.h" diff --git a/packages/octave/build.sh b/packages/octave/build.sh index a43a1bdb081b7cd..3627dbca91d957e 100644 --- a/packages/octave/build.sh +++ b/packages/octave/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://octave.org TERMUX_PKG_DESCRIPTION="GNU Octave is a high-level language, primarily intended for numerical computations. (only CLI)" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=8.4.0 -TERMUX_PKG_REVISION=6 +TERMUX_PKG_VERSION="9.2.0" TERMUX_PKG_SRCURL=https://ftpmirror.gnu.org/octave/octave-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=6f9ad73a3ee4291b6341d6c0f5e5c85d6e0310376e4991b959a6d340b3ffa8a8 +TERMUX_PKG_SHA256=21417afb579105b035cac0bea09201522e384893ae90a781b8727efa32765807 TERMUX_PKG_DEPENDS="arpack-ng, bzip2, fftw, fontconfig, freetype, glpk, graphicsmagick, libcurl, libhdf5, libiconv, libopenblas, libsndfile, openssl, pcre2, portaudio, qhull, qrupdate-ng, rapidjson, readline, suitesparse, sundials, zlib" TERMUX_PKG_BUILD_DEPENDS="gnuplot, less" TERMUX_PKG_RECOMMENDS="gnuplot, less" diff --git a/x11-packages/octave-x/0003-undefine-the-macro-in-pwd.h.patch b/x11-packages/octave-x/0003-undefine-the-macro-in-pwd.h.patch index 0120402a06b42ce..1db6c7ccd9fbc0d 100644 --- a/x11-packages/octave-x/0003-undefine-the-macro-in-pwd.h.patch +++ b/x11-packages/octave-x/0003-undefine-the-macro-in-pwd.h.patch @@ -1,6 +1,5 @@ ---- a/liboctave/system/oct-password.cc -+++ b/liboctave/system/oct-password.cc -@@ -31,6 +31,15 @@ ++++ ./liboctave/wrappers/pwd-wrappers.c +@@ -32,6 +32,15 @@ #if defined (HAVE_PWD_H) # include @@ -15,4 +14,4 @@ +# endif #endif - #include "lo-error.h" + #include "pwd-wrappers.h" diff --git a/x11-packages/octave-x/build.sh b/x11-packages/octave-x/build.sh index 978c6d0bc2dbdb6..c656e3aa19bff70 100644 --- a/x11-packages/octave-x/build.sh +++ b/x11-packages/octave-x/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://octave.org TERMUX_PKG_DESCRIPTION="GNU Octave is a high-level language, primarily intended for numerical computations. (only CLI)" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=8.4.0 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_VERSION="9.2.0" TERMUX_PKG_SRCURL=https://ftpmirror.gnu.org/octave/octave-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=6f9ad73a3ee4291b6341d6c0f5e5c85d6e0310376e4991b959a6d340b3ffa8a8 +TERMUX_PKG_SHA256=21417afb579105b035cac0bea09201522e384893ae90a781b8727efa32765807 TERMUX_PKG_DEPENDS="arpack-ng, bzip2, fftw, fltk, fontconfig, freetype, glpk, glu, graphicsmagick, libcurl, libhdf5, libiconv, libopenblas, libsndfile, opengl, openssl, pcre, portaudio, qhull, qrupdate-ng, rapidjson, readline, suitesparse, sundials, zlib" TERMUX_PKG_BUILD_DEPENDS="gnuplot, less" TERMUX_PKG_RECOMMENDS="gnuplot, less" @@ -13,6 +12,7 @@ TERMUX_PKG_CONFLICTS="octave-x" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-x +--without-qt --disable-java --enable-link-all-dependencies --disable-openmp