haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

octave, bump version (#11756)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-02-10 12:47:57 +01:00
committed by GitHub
parent 197b3edecb
commit 8386d1797c
2 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sci-mathematics/octave/octave-8.2.0.recipe → sci-mathematics/octave/octave-9.4.0.recipe
View File

@@ -3,11 +3,12 @@ DESCRIPTION="GNU Octave is a high-level language, primarily intended for \
numerical computations. It provides a convenient command line interface \
for solving linear and nonlinear problems numerically."
HOMEPAGE="http://www.octave.org/"
COPYRIGHT="1996-2022 John W. Eaton"
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="57d17f918a940d38ca3348211e110b34d735a322a87db71c177c4692a49a9c84"
CHECKSUM_SHA256="da9481205bfa717660b7d4a16732d8b2d58aadceab4993d41242a8e2848ea6c1"
PATCHES="octave-$portVersion.patchset"
ADDITIONAL_FILES="octave.rdef.in"
@@ -167,8 +168,8 @@ BUILD()
touch etc/icons/octave-logo-{16,22,24,32,48,64,128,256,512}.png
touch etc/icons/octave-logo.ico
export CFLAGS="-D_BSD_SOURCE"
export CXXFLAGS="-D_BSD_SOURCE"
export CFLAGS="-D_BSD_SOURCE -O2"
export CXXFLAGS="-D_BSD_SOURCE -O2"
export LDFLAGS="-lnetwork -lbsd"
runConfigure ./configure \
@@ -205,7 +206,6 @@ INSTALL()
for f in appdata applications icons; do
rm -rf $dataDir/$f
done
local APP_SIGNATURE="application/x-vnd.octave-gui"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
@@ -222,7 +222,7 @@ INSTALL()
addResourcesToBinaries octave.rdef $binDir/octave-gui
mimeset -f $binDir/octave-gui
mkdir -p $appsDir
cat > $appsDir/Octave << EOF
#!/bin/sh
@@ -237,7 +237,6 @@ EOF
liboctave \
liboctgui \
liboctinterp
fixPkgconfig
# devel package

52
sci-mathematics/octave/patches/octave-8.2.0.patchset → sci-mathematics/octave/patches/octave-9.4.0.patchset
View File

@@ -1,37 +1,37 @@
From 534c52f22a174dd192993576579f1c07bbdafdb4 Mon Sep 17 00:00:00 2001
From 8eb38ce768b5aed42d4d8901a30bc37de91c7d34 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 3fa56a0..22eba33 100644
index b011545..061bf70 100644
--- a/libgui/graphics/Figure.cc
+++ b/libgui/graphics/Figure.cc
@@ -137,7 +137,7 @@ namespace octave
m_innerRect = boundingBoxToRect (fp.get_boundingbox (true));
m_outerRect = boundingBoxToRect (fp.get_boundingbox (false));
@@ -136,7 +136,7 @@ Figure::Figure (octave::interpreter& interp,
m_innerRect = boundingBoxToRect (fp.get_boundingbox (true));
m_outerRect = boundingBoxToRect (fp.get_boundingbox (false));
- set_geometry (m_innerRect);
- set_geometry (m_innerRect);
+// set_geometry (m_innerRect);
// Menubar
m_menuBar = new MenuBar (win);
// Menubar
m_menuBar = new MenuBar (win);
--
2.36.1
2.45.2
From 2a0ddea06c7d98d08e2e62e6674d672bf2e5eddb Mon Sep 17 00:00:00 2001
From bc2ce7a1f36d04687533a78b07a9b04bee495f3d 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 34ab815..c6165e9 100644
index 8e876cb..b9a84e3 100644
--- a/libgui/src/gui-preferences-global.h
+++ b/libgui/src/gui-preferences-global.h
@@ -39,6 +39,8 @@ const QString gui_obj_name_main_window = "MainWindow";
@@ -43,6 +43,8 @@ extern gui_pref global_skip_welcome_wizard;
const QString global_font_family = "Courier";
#elif defined (Q_OS_MAC)
const QString global_font_family = "Monaco";
@@ -40,31 +40,31 @@ index 34ab815..c6165e9 100644
#else
const QString global_font_family = "Monospace";
#endif
diff --git a/libgui/src/resource-manager.cc b/libgui/src/resource-manager.cc
index b0bbafa..29b4d6f 100644
--- a/libgui/src/resource-manager.cc
+++ b/libgui/src/resource-manager.cc
@@ -217,7 +217,7 @@ namespace octave
for (int index = 0; index < font_combo_box.count(); index++)
fonts << font_combo_box.itemText(index);
diff --git a/libgui/src/gui-settings.cc b/libgui/src/gui-settings.cc
index c313e5b..7af0f55 100644
--- a/libgui/src/gui-settings.cc
+++ b/libgui/src/gui-settings.cc
@@ -312,7 +312,7 @@ QString gui_settings::get_default_font_family ()
QString default_family;
-#if defined (Q_OS_MAC)
+#if defined (Q_OS_MAC) || defined(Q_OS_HAIKU)
// Use hard coded default on macOS, since selection of fixed width
// default font is unreliable (see bug #59128).
// Test for macOS default fixed width font
// Use hard coded default on macOS, since selection of fixed width
// default font is unreliable (see bug #59128).
// Test for macOS default fixed width font
--
2.36.1
2.45.2
From 297486ce3fd58402428c76ca93adec9f6c414129 Mon Sep 17 00:00:00 2001
From 562f4c31c8e1c942c09f870b07451467d202d4f1 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
diff --git a/libgui/qterminal/libqterminal/unix/kpty.cpp b/libgui/qterminal/libqterminal/unix/kpty.cpp
index 09d1db8..30fde45 100644
index d3521fc..4d9fd01 100644
--- a/libgui/qterminal/libqterminal/unix/kpty.cpp
+++ b/libgui/qterminal/libqterminal/unix/kpty.cpp
@@ -390,6 +390,11 @@ bool KPty::open()
@@ -80,5 +80,5 @@ index 09d1db8..30fde45 100644
}
--
2.36.1
2.45.2