Skip to content

Commit 9075d7e

Browse files
mmuetzelmmuetzel
authored
Merge pull request #20362 from mmuetzel/octave
octave: update to 9.1.0
2 parents cfc98ce + 6ddc40c commit 9075d7e

File tree

2 files changed

+29
-45
lines changed

2 files changed

+29
-45
lines changed

‎mingw-w64-octave/0003-no-community-support.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
Add note about no community support for CLANG*64 versions.
88

99
diff -r 89850bb5eb31 -r aaffb33108d3 liboctave/version.cc
10-
--- a/liboctave/version.cc Fri Mar 31 18:07:24 2023 +0200
11-
+++ b/liboctave/version.cc Fri Mar 31 18:26:18 2023 +0200
12-
@@ -73,7 +73,8 @@
13-
// --version, the version number should follow the last space on the
14-
// line.
10+
--- octave-9.1.0/liboctave/version.cc.orig 2024-03-15 18:57:08.844733200 +0100
11+
+++ octave-9.1.0/liboctave/version.cc 2024-03-15 18:59:07.632471500 +0100
12+
@@ -76,7 +76,8 @@
1513

16-
- return "GNU Octave, version " OCTAVE_VERSION "\n" OCTAVE_COPYRIGHT;
17-
+ return "GNU Octave, version " OCTAVE_VERSION "\n" OCTAVE_COPYRIGHT
14+
return "GNU Octave, version " OCTAVE_VERSION
15+
+ br
16+
- + OCTAVE_COPYRIGHT;
17+
+ + OCTAVE_COPYRIGHT
1818
+ "\n\nThis version is not supported by the Octave community.\n";
1919
}
2020

‎mingw-w64-octave/PKGBUILD‎

Lines changed: 22 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
_realname=octave
22
pkgbase=mingw-w64-${_realname}
33
pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
4-
pkgver=8.4.0
5-
pkgrel=5
4+
pkgver=9.1.0
5+
pkgrel=1
66
pkgdesc="GNU Octave: Interactive programming environment for numerical computations (mingw-w64)"
77
url="https://www.octave.org"
88
msys2_repository_url="https://github.com/gnu-octave/octave"
@@ -14,27 +14,27 @@ arch=('any')
1414
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
1515
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
1616
$([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran")
17-
"${MINGW_PACKAGE_PREFIX}-openblas"
1817
"${MINGW_PACKAGE_PREFIX}-arpack"
1918
"${MINGW_PACKAGE_PREFIX}-curl"
2019
"${MINGW_PACKAGE_PREFIX}-fftw"
2120
"${MINGW_PACKAGE_PREFIX}-ghostscript"
2221
"${MINGW_PACKAGE_PREFIX}-gl2ps"
23-
$([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || echo "${MINGW_PACKAGE_PREFIX}-glpk")
22+
"${MINGW_PACKAGE_PREFIX}-glpk"
2423
"${MINGW_PACKAGE_PREFIX}-graphicsmagick"
2524
"${MINGW_PACKAGE_PREFIX}-hdf5"
2625
"${MINGW_PACKAGE_PREFIX}-libsndfile"
26+
"${MINGW_PACKAGE_PREFIX}-openblas"
2727
"${MINGW_PACKAGE_PREFIX}-pcre2"
2828
"${MINGW_PACKAGE_PREFIX}-qhull"
29-
"${MINGW_PACKAGE_PREFIX}-suitesparse"
30-
"${MINGW_PACKAGE_PREFIX}-sundials"
3129
"${MINGW_PACKAGE_PREFIX}-qrupdate"
32-
"${MINGW_PACKAGE_PREFIX}-qscintilla-qt5"
33-
"${MINGW_PACKAGE_PREFIX}-qt5-tools")
30+
$([[ ${CARCH} == i686 ]] && echo "${MINGW_PACKAGE_PREFIX}-qscintilla-qt5" || echo "${MINGW_PACKAGE_PREFIX}-qscintilla-qt6")
31+
$([[ ${CARCH} == i686 ]] && echo "${MINGW_PACKAGE_PREFIX}-qt5-tools" || echo "${MINGW_PACKAGE_PREFIX}-qt6-tools")
32+
"${MINGW_PACKAGE_PREFIX}-suitesparse"
33+
"${MINGW_PACKAGE_PREFIX}-sundials")
3434
makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
3535
"${MINGW_PACKAGE_PREFIX}-cc"
3636
"${MINGW_PACKAGE_PREFIX}-fc"
37-
$([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || echo "${MINGW_PACKAGE_PREFIX}-gnuplot")
37+
"${MINGW_PACKAGE_PREFIX}-gnuplot"
3838
"${MINGW_PACKAGE_PREFIX}-gperf"
3939
"${MINGW_PACKAGE_PREFIX}-fltk"
4040
"${MINGW_PACKAGE_PREFIX}-portaudio"
@@ -49,16 +49,16 @@ optdepends=('texinfo: for help-support in Octave'
4949
"${MINGW_PACKAGE_PREFIX}-gnuplot: alternative plotting"
5050
"${MINGW_PACKAGE_PREFIX}-portaudio: audio support")
5151
source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.xz{,.sig}
52-
"0001-no-namespace-in-extern-C.patch::https://hg.savannah.gnu.org/hgweb/octave/raw-rev/123c5d78fc9d"
52+
"0001-correct-LIBS.patch::https://hg.savannah.gnu.org/hgweb/octave/raw-rev/557fbfea93ab"
5353
"0002-mk-doc-cache-path.patch"
5454
"0003-no-community-support.patch"
5555
"0005-makeinfo-perl.patch")
5656
validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton
57-
sha256sums=('6f9ad73a3ee4291b6341d6c0f5e5c85d6e0310376e4991b959a6d340b3ffa8a8'
57+
sha256sums=('ed654b024aea56c44b26f131d31febc58b7cf6a82fad9f0b0bf6e3e9aa1a134b'
5858
'SKIP'
59-
'82909b2b878aff25b276e73def14a14c2756ae3688275df154a425105e3abc33'
59+
'71fb01e039c79781e52cf95506ad3126c9e911a5f20e796195ca84faa73e9b9c'
6060
'aa5bd559d9774abc0f0c930a606762d1e452cc90278d16d8ae83561c0cae3bf8'
61-
'14f6afe84529982041e20653a8c146630f598493abbdf5e8d52f0bee80326a5b'
61+
'e53af21ad087e10a2906506589aab89ab8b43f4e3e4994b4c28e4d8ae83639ad'
6262
'3f6756b39547d996955762b71ce6845a8ebfde6bad92a3a1a6d72fd43df5973d')
6363

6464
apply_patch_with_msg() {
@@ -73,49 +73,37 @@ prepare() {
7373
cd "${_realname}-${pkgver}"
7474

7575
apply_patch_with_msg \
76+
0001-correct-LIBS.patch \
7677
0002-mk-doc-cache-path.patch \
7778
0005-makeinfo-perl.patch
7879

7980
if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
8081
apply_patch_with_msg \
81-
0001-no-namespace-in-extern-C.patch \
8282
0003-no-community-support.patch
83-
84-
# We need the patched libtool with Flang specific changes.
85-
autoreconf -fiv
8683
fi
8784

85+
autoreconf -fiv
8886
}
8987

9088
build() {
9189
mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
9290

9391
declare -a _extra_config
9492
if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
95-
_extra_config+=(# Clang seems to require a different set of dllexport
96-
# attributes than GCC. For the time being, export all
97-
# symbols (including those from gnulib and other static
98-
# libraries linked into the Octave libraries). Doing that
99-
# might cause issues in some cases. But solving this
100-
# without breaking GCC support might be difficult.
101-
"--disable-lib-visibility-flags"
102-
# Libtool still needs some hints how to handle LLVM Flang:
103-
"--enable-fortran-calling-convention=gfortran"
93+
# Libtool still needs some hints how to handle LLVM Flang:
94+
_extra_config+=("--enable-fortran-calling-convention=gfortran"
10495
"ac_cv_f77_compiler_gnu=yes"
10596
"lt_cv_prog_gnu_ld=yes"
10697
"F77=${MINGW_PREFIX}/bin/flang"
107-
# LLVM 16 seems to have switched defaults to C++17.
108-
# Apparently, some STL functions that are deprecated in that
109-
# version of the standard are used. For the time being,
110-
# build with the C++14 feature set (and GNU extensions).
111-
"CXX=${MINGW_PREFIX}/bin/clang++ -std=gnu++14")
98+
"LDFLAGS=")
11299
# The headers from some dependent libraries (graphicsmagick++?) cause a
113100
# torrent of warnings about deprecated declarations. Sometimes to the
114101
# point that the build crashes with garbled characters in the terminal
115-
# output for some reason. Just calling `make all -j2` again in the build
116-
# tree lets the compilation finish successfully.
102+
# output for some reason. Same issue with dllimport attributes at
103+
# inlined functions in Qt6 headers. Just calling `make all -j2` again in
104+
# the build tree lets the compilation finish successfully.
117105
# Disable those warnings as a work-around.
118-
CXXFLAGS+=" -Wno-deprecated-declarations"
106+
CXXFLAGS+=" -Wno-deprecated-declarations -Wno-ignored-attributes"
119107
fi
120108

121109
# The configure step sometimes hangs for MINGW32 for currently unknown reasons.
@@ -127,14 +115,10 @@ build() {
127115
--target=${MINGW_CHOST} \
128116
--build=${MINGW_CHOST} \
129117
--prefix=${MINGW_PREFIX} \
130-
--libexecdir=${MINGW_PREFIX}/lib \
131-
--sbindir=${MINGW_PREFIX}/bin \
132118
--enable-shared \
133119
--disable-static \
134120
--enable-relocate-all \
135-
--enable-link-all-dependencies \
136121
"${_extra_config[@]}" \
137-
gl_cv_have_weak=no \
138122
octave_cv_fftw3_threads_lib="-lfftw3_omp" \
139123
octave_cv_fftw3f_threads_lib="-lfftw3f_omp" \
140124
JAVA_HOME=""

0 commit comments

Comments
 (0)