haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

octave, bump to 10.3.0 (#13296)

Browse Source 
also drop lapack dependency
This commit is contained in:
Schrijvers Luc
2025-12-02 13:24:56 +01:00
committed by GitHub
parent ab73761390
commit 60d11c4fc1
2 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
sci-mathematics/octave/octave-9.4.0.recipe → sci-mathematics/octave/octave-10.3.0.recipe
View File

@@ -7,20 +7,23 @@ COPYRIGHT="1996-2022 John W. Eaton
1993-2024 The Octave Project Developers"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://ftp.gnu.org/gnu/octave/octave-$portVersion.tar.gz"
CHECKSUM_SHA256="da9481205bfa717660b7d4a16732d8b2d58aadceab4993d41242a8e2848ea6c1"
SOURCE_URI="https://ftpmirror.gnu.org/octave/octave-$portVersion.tar.gz
https://ftp.gnu.org/gnu/octave/octave-$portVersion.tar.gz"
CHECKSUM_SHA256="2fcb38dc062e440f1e06c069bbca840ed46dcc8f983e473e1558fcc38384ee6b"
PATCHES="octave-$portVersion.patchset"
ADDITIONAL_FILES="octave.rdef.in"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
liboctaveVersion="9.0.0"
liboctaveVersion="12.0.2"
liboctaveVersionCompat="$liboctaveVersion compat >= ${liboctaveVersion%%.*}"
liboctinterpVersion="10.0.0"
liboctguiVersion="13.0.2"
liboctguiVersionCompat="$liboctguiVersion compat >= ${liboctguiVersion%%.*}"
liboctinterpVersion="13.1.1"
liboctinterpVersionCompat="$liboctinterpVersion compat >= ${liboctinterpVersion%%.*}"
liboctguiVersion="8.0.0"
liboctguiVersionCompat="$liboctguiVersion compat >= ${liboctinterpVersion%%.*}"
liboctmexVersion="1.0.0"
liboctmexVersionCompat="$liboctmexVersion compat >= ${liboctmexVersion%%.*}"
PROVIDES="
octave$secondaryArchSuffix = $portVersion
@@ -35,8 +38,9 @@ PROVIDES="
cmd:octave_gui$secondaryArchSuffix = $portVersion
cmd:octave_svgconvert$secondaryArchSuffix = $portVersion
lib:liboctave$secondaryArchSuffix = $liboctaveVersionCompat
lib:liboctinterp$secondaryArchSuffix = $liboctinterpVersionCompat
lib:liboctgui$secondaryArchSuffix = $liboctguiVersionCompat
lib:liboctinterp$secondaryArchSuffix = $liboctinterpVersionCompat
lib:liboctmex$secondaryArchSuffix = $liboctmexVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -63,7 +67,6 @@ REQUIRES="
lib:libgraphicsmagick++$secondaryArchSuffix
lib:libhdf5$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:liblapack$secondaryArchSuffix
lib:libncursesw$secondaryArchSuffix
lib:libopenblas$secondaryArchSuffix
lib:libpcre2_8$secondaryArchSuffix
@@ -84,8 +87,9 @@ REQUIRES="
PROVIDES_devel="
octave${secondaryArchSuffix}_devel = $portVersion
devel:liboctave$secondaryArchSuffix = $liboctaveVersionCompat
devel:liboctinterp$secondaryArchSuffix = $liboctinterpVersionCompat
devel:liboctgui$secondaryArchSuffix = $liboctguiVersionCompat
devel:liboctinterp$secondaryArchSuffix = $liboctinterpVersionCompat
devel:liboctmex$secondaryArchSuffix = $liboctmexVersionCompat
"
REQUIRES_devel="
octave$secondaryArchSuffix == $portVersion base
@@ -113,7 +117,6 @@ BUILD_REQUIRES="
devel:libhdf5$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libklu$secondaryArchSuffix
devel:liblapack$secondaryArchSuffix
devel:libncursesw$secondaryArchSuffix
devel:libopenblas$secondaryArchSuffix
devel:libpcre$secondaryArchSuffix
@@ -134,6 +137,7 @@ BUILD_REQUIRES="
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:awk
cmd:bison >= 3
@@ -172,6 +176,7 @@ BUILD()
export CXXFLAGS="-D_BSD_SOURCE -O2"
export LDFLAGS="-lnetwork -lbsd"
autoreconf -fi
runConfigure ./configure \
--libexecdir=$libDir \
--disable-docs \
@@ -188,22 +193,15 @@ INSTALL()
# TODO libs should be left in $libDir/octave/$portVersion
# Move libs to $libDir to please Haikuporter complaining
# about missing libs.
for f in liboctave liboctinterp liboctgui; do
for f in liboctave liboctgui liboctinterp liboctmex; do
rm -rf $libDir/octave/$portVersion/$f.la
mv $libDir/octave/$portVersion/$f.so* $libDir
done
mv $libDir/octave/$portVersion/exec/*/octave-* $binDir
# Remove empty folders
rm -rf $libDir/octave/$portVersion/{site,exec}
for f in api-v57 site; do
rm -rf $libDir/octave/$f
done
# Remove unnecessary stuff
for f in appdata applications icons; do
for f in appdata applications icons metainfo; do
rm -rf $dataDir/$f
done
@@ -236,7 +234,8 @@ EOF
prepareInstalledDevelLibs \
liboctave \
liboctgui \
liboctinterp
liboctinterp \
liboctmex
fixPkgconfig
# devel package

20
sci-mathematics/octave/patches/octave-9.4.0.patchset → sci-mathematics/octave/patches/octave-10.3.0.patchset
View File

@@ -1,11 +1,11 @@
From 8eb38ce768b5aed42d4d8901a30bc37de91c7d34 Mon Sep 17 00:00:00 2001
From 231d9ac2d8055115fdce491749b558fbd286270f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 24 May 2022 21:46:17 +1000
Subject: Disable adjust figure position
diff --git a/libgui/graphics/Figure.cc b/libgui/graphics/Figure.cc
index b011545..061bf70 100644
index 72466f8..f9d4f59 100644
--- a/libgui/graphics/Figure.cc
+++ b/libgui/graphics/Figure.cc
@@ -136,7 +136,7 @@ Figure::Figure (octave::interpreter& interp,
@@ -18,17 +18,17 @@ index b011545..061bf70 100644
// Menubar
m_menuBar = new MenuBar (win);
--
2.45.2
2.51.0
From bc2ce7a1f36d04687533a78b07a9b04bee495f3d Mon Sep 17 00:00:00 2001
From e4be2cae3ca5a314de91ead63b6e5ea75d2fadc5 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 25 May 2022 11:10:42 +1000
Subject: Use Noto Sans Mono by Default
diff --git a/libgui/src/gui-preferences-global.h b/libgui/src/gui-preferences-global.h
index 8e876cb..b9a84e3 100644
index c1abb1d..b615cb8 100644
--- a/libgui/src/gui-preferences-global.h
+++ b/libgui/src/gui-preferences-global.h
@@ -43,6 +43,8 @@ extern gui_pref global_skip_welcome_wizard;
@@ -41,10 +41,10 @@ index 8e876cb..b9a84e3 100644
const QString global_font_family = "Monospace";
#endif
diff --git a/libgui/src/gui-settings.cc b/libgui/src/gui-settings.cc
index c313e5b..7af0f55 100644
index b14d77f..040fbce 100644
--- a/libgui/src/gui-settings.cc
+++ b/libgui/src/gui-settings.cc
@@ -312,7 +312,7 @@ QString gui_settings::get_default_font_family ()
@@ -334,7 +334,7 @@ gui_settings::get_default_font_family ()
QString default_family;
@@ -54,10 +54,10 @@ index c313e5b..7af0f55 100644
// default font is unreliable (see bug #59128).
// Test for macOS default fixed width font
--
2.45.2
2.51.0
From 562f4c31c8e1c942c09f870b07451467d202d4f1 Mon Sep 17 00:00:00 2001
From 05d4d6496901c969568b66629e66a0a98bf8fb1e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 25 May 2022 12:08:26 +1000
Subject: kpty: enable echo
@@ -80,5 +80,5 @@ index d3521fc..4d9fd01 100644
}
--
2.45.2
2.51.0