From 1ddb3e32dfd1f4c8aec3acc91105e12887346a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= Date: Tue, 3 Jun 2025 09:29:16 +0200 Subject: [PATCH] octave: update to 10.2.0 Remove patch that was applied upstream: https://github.com/gnu-octave/octave/commit/16ef607e71f21f68c30b8491b1f69a060d4cedf4 No longer disable documentation (for which no rebuild is triggered without that local patch). --- mingw-w64-octave/0002-mk-doc-cache-path.patch | 21 ------------------- mingw-w64-octave/PKGBUILD | 10 +++------ 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 mingw-w64-octave/0002-mk-doc-cache-path.patch diff --git a/mingw-w64-octave/0002-mk-doc-cache-path.patch b/mingw-w64-octave/0002-mk-doc-cache-path.patch deleted file mode 100644 index 0857a115a9..0000000000 --- a/mingw-w64-octave/0002-mk-doc-cache-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -# HG changeset patch -# User Markus Mützel -# Date 1630254948 -7200 -# Sun Aug 29 18:35:48 2021 +0200 -# Branch stable -# Node ID d79169008b5cfa61d2728b79ed5ddc7bab144667 -# Parent 754013c3658760136fe473911ba96165a07cb1f5 -mk-doc-cache.pl: Single-quote path (might contain unescaped backslashes). - -diff -r 754013c36587 -r d79169008b5c doc/interpreter/mk-doc-cache.pl ---- a/doc/interpreter/mk-doc-cache.pl Sun Jul 11 13:19:32 2021 -0400 -+++ b/doc/interpreter/mk-doc-cache.pl Sun Aug 29 18:35:48 2021 +0200 -@@ -99,7 +99,7 @@ - { - my $texi_path = shift; - -- my $makeinfo_command = "makeinfo --no-headers --no-warn --force --no-validate --fill-column=1024 $texi_path"; -+ my $makeinfo_command = "makeinfo --no-headers --no-warn --force --no-validate --fill-column=1024 '$texi_path'"; - my $info_text = `$makeinfo_command`; - - die "Unable to start makeinfo command '$makeinfo_command'" diff --git a/mingw-w64-octave/PKGBUILD b/mingw-w64-octave/PKGBUILD index f02192e3c2..2e11f2f9d6 100644 --- a/mingw-w64-octave/PKGBUILD +++ b/mingw-w64-octave/PKGBUILD @@ -3,8 +3,8 @@ _realname=octave pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} -pkgver=10.1.0 -pkgrel=2 +pkgver=10.2.0 +pkgrel=1 pkgdesc="GNU Octave: Interactive programming environment for numerical computations (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -62,13 +62,11 @@ optdepends=("unzip: for decompressing .zip archives" "${MINGW_PACKAGE_PREFIX}-gnuplot: alternative plotting" "${MINGW_PACKAGE_PREFIX}-portaudio: audio support") source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.xz{,.sig} - "0002-mk-doc-cache-path.patch" "0003-no-community-support.patch" "0005-makeinfo-perl.patch") validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton -sha256sums=('051d092fe7abbed4ed9b74c8c40f3dfb1b9aa9eede770ac6c7e9c8c9e895e0c9' +sha256sums=('c9a0b0f83381866e816842e83eb35042d9dbc9d684557ba776e9e30292b2f76b' 'SKIP' - 'aa5bd559d9774abc0f0c930a606762d1e452cc90278d16d8ae83561c0cae3bf8' 'e53af21ad087e10a2906506589aab89ab8b43f4e3e4994b4c28e4d8ae83639ad' '2df9666d75bb8dd4f549ec857c75aa3ec64b21fd3c9aa25a0d4127b284ec6822') @@ -84,7 +82,6 @@ prepare() { cd "${_realname}-${pkgver}" apply_patch_with_msg \ - 0002-mk-doc-cache-path.patch \ 0005-makeinfo-perl.patch if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then @@ -118,7 +115,6 @@ build() { --enable-shared \ --disable-static \ --enable-relocate-all \ - --disable-docs \ "${_extra_config[@]}" \ octave_cv_fftw3_threads_lib="-lfftw3_omp" \ octave_cv_fftw3f_threads_lib="-lfftw3f_omp" \