octave: bump version

remove an obsolete patch
This commit is contained in:
Jerome Duval
2023-05-02 20:07:36 +02:00
parent 6937c0c417
commit ba30e8b390
2 changed files with 3 additions and 50 deletions

View File

@@ -5,9 +5,9 @@ for solving linear and nonlinear problems numerically."
HOMEPAGE="http://www.octave.org/"
COPYRIGHT="1996-2022 John W. Eaton"
LICENSE="GNU GPL v3"
REVISION="4"
REVISION="1"
SOURCE_URI="https://ftp.gnu.org/gnu/octave/octave-$portVersion.tar.gz"
CHECKSUM_SHA256="d4a9d81f3f67b4a6e07cb7a80dcb10ad5e9176fcc30762c70a81580a64b8b0b6"
CHECKSUM_SHA256="57d17f918a940d38ca3348211e110b34d735a322a87db71c177c4692a49a9c84"
PATCHES="octave-$portVersion.patchset"
ADDITIONAL_FILES="octave.rdef.in"
@@ -63,10 +63,9 @@ REQUIRES="
lib:libhdf5$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:liblapack$secondaryArchSuffix
lib:libmagick++_6.q16$secondaryArchSuffix
lib:libncursesw$secondaryArchSuffix
lib:libopenblas$secondaryArchSuffix
lib:libpcre$secondaryArchSuffix
lib:libpcre2_8$secondaryArchSuffix
lib:libqhull_r$secondaryArchSuffix
lib:libqscintilla2_qt5$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
@@ -114,7 +113,6 @@ BUILD_REQUIRES="
devel:libiconv$secondaryArchSuffix
devel:libklu$secondaryArchSuffix
devel:liblapack$secondaryArchSuffix
devel:libmagick++_6.q16$secondaryArchSuffix
devel:libncursesw$secondaryArchSuffix
devel:libopenblas$secondaryArchSuffix
devel:libpcre$secondaryArchSuffix

View File

@@ -1,48 +1,3 @@
From 6318e424c368baf644c140fb93aecd566ad174a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 26 Mar 2017 19:42:22 +0200
Subject: rusage Haiku patch
diff --git a/liboctave/wrappers/time-wrappers.c b/liboctave/wrappers/time-wrappers.c
index a22cd2e..b430281 100644
--- a/liboctave/wrappers/time-wrappers.c
+++ b/liboctave/wrappers/time-wrappers.c
@@ -131,6 +131,7 @@ octave_getrusage_wrapper (time_t *usr_sec, time_t *sys_sec,
*sys_sec = ru.ru_stime.tv_sec;
*sys_usec = ru.ru_stime.tv_usec;
+#ifndef __HAIKU__
*maxrss = ru.ru_maxrss;
*ixrss = ru.ru_ixrss;
*idrss = ru.ru_idrss;
@@ -145,6 +146,22 @@ octave_getrusage_wrapper (time_t *usr_sec, time_t *sys_sec,
*nsignals = ru.ru_nsignals;
*nvcsw = ru.ru_nvcsw;
*nivcsw = ru.ru_nivcsw;
+#else
+ *maxrss = 0;
+ *ixrss = 0;
+ *idrss = 0;
+ *isrss = 0;
+ *minflt = 0;
+ *majflt = 0;
+ *nswap = 0;
+ *inblock = 0;
+ *oublock = 0;
+ *msgsnd = 0;
+ *msgrcv = 0;
+ *nsignals = 0;
+ *nvcsw = 0;
+ *nivcsw = 0;
+#endif
}
return status;
--
2.36.1
From 534c52f22a174dd192993576579f1c07bbdafdb4 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 24 May 2022 21:46:17 +1000