From: tornaria <tornaria@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] octave: update to 8.1.0.
Date: Tue, 04 Apr 2023 03:18:52 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43252@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1684 bytes --]
There is a new pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages octave
https://github.com/void-linux/void-packages/pull/43252
octave: update to 8.1.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
I did this on top of f #43153 to test the openblas update to 0.3.23.
Also included a minor upgrade to GraphicsMagick.
I built arpack-ng 3.9.0 and octave seems to work ok with the update. However, this causes a test failure on igraph (see https://github.com/igraph/igraph/issues/2311 and https://github.com/opencollab/arpack-ng/issues/401). This version is masked in gentoo (see https://packages.gentoo.org/packages/sci-libs/arpack).
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/43252.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-octave-43252.patch --]
[-- Type: text/x-diff, Size: 8432 bytes --]
From c412e8ee79e8ce6db90bac8995da7966103d405f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 2 Apr 2023 16:34:23 -0300
Subject: [PATCH 1/4] openblas: update to 0.3.23.
---
srcpkgs/openblas/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/openblas/template b/srcpkgs/openblas/template
index c51bd98e2963..61a891a86a30 100644
--- a/srcpkgs/openblas/template
+++ b/srcpkgs/openblas/template
@@ -1,8 +1,7 @@
# Template file for 'openblas'
pkgname=openblas
-reverts="0.3.22_1"
-version=0.3.21
-revision=2
+version=0.3.23
+revision=1
build_style=gnu-makefile
make_build_args="HOSTCC=gcc USE_OPENMP=1"
make_install_args="OPENBLAS_INCLUDE_DIR=\$(PREFIX)/include/openblas"
@@ -12,9 +11,9 @@ short_desc="Optimized BLAS (Basic Linear Algebra Subprograms) based on GotoBLAS2
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://www.openblas.net/"
-changelog="https://raw.githubusercontent.com/xianyi/OpenBLAS/v${version}/Changelog.txt"
+changelog="https://raw.githubusercontent.com/xianyi/OpenBLAS/develop/Changelog.txt"
distfiles="https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"
-checksum=f36ba3d7a60e7c8bcc54cd9aaa9b1223dd42eaf02c811791c37e8ca707c241ca
+checksum=5d9491d07168a5d00116cdc068a40022c3455bf9293c7cb86a65b1054d7e5114
case "$XBPS_TARGET_MACHINE" in
ppc64*) ;;
From acc9d3e2d794e5dedce51c76fb85d41a77892886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 3 Apr 2023 19:13:57 -0300
Subject: [PATCH 2/4] GraphicsMagick: update to 1.3.40.
---
srcpkgs/GraphicsMagick/template | 8 ++++----
srcpkgs/GraphicsMagick/update | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template
index 1ff695590a78..695efbc55d3b 100644
--- a/srcpkgs/GraphicsMagick/template
+++ b/srcpkgs/GraphicsMagick/template
@@ -1,6 +1,6 @@
# Template file for 'GraphicsMagick'
pkgname=GraphicsMagick
-version=1.3.38
+version=1.3.40
revision=1
build_style=gnu-configure
configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1
@@ -16,10 +16,10 @@ depends="ghostscript"
short_desc="GraphicsMagick Image Processing System"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="https://graphicsmagick.sourceforge.io/index.html"
-changelog="https://graphicsmagick.sourceforge.io/NEWS.html"
+homepage="http://www.graphicsmagick.org/"
+changelog="https://sourceforge.net/p/graphicsmagick/code/ci/default/tree/NEWS.txt?format=raw"
distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
-checksum=35b8661f508337314e46aebcbdca6875cc6033a1cf3edff29aa5e14ef8d2d4e1
+checksum=88ddbf76e1ced2ab6bcd743207ee308865de1afb4b645d460924dcc8bfc0ee85
keep_libtool_archives=yes
post_install() {
diff --git a/srcpkgs/GraphicsMagick/update b/srcpkgs/GraphicsMagick/update
index 9bd1722a15ba..20da63a09528 100644
--- a/srcpkgs/GraphicsMagick/update
+++ b/srcpkgs/GraphicsMagick/update
@@ -1 +1,2 @@
-ignore="1.3.020080729"
+# development snapshots
+ignore="1.?.0????????"
From 80ec834707a1404510e6227350454d373915ce1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 3 Apr 2023 22:10:15 -0300
Subject: [PATCH 3/4] arpack-ng: ignore 3.9.0 as it has a bug affecting igraph
---
srcpkgs/arpack-ng/update | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 srcpkgs/arpack-ng/update
diff --git a/srcpkgs/arpack-ng/update b/srcpkgs/arpack-ng/update
new file mode 100644
index 000000000000..b92bf49ef733
--- /dev/null
+++ b/srcpkgs/arpack-ng/update
@@ -0,0 +1,4 @@
+# Regression causes failures in igraph. See:
+# https://github.com/igraph/igraph/issues/2311
+# https://github.com/opencollab/arpack-ng/issues/401
+ignore="3.9.0"
From 5db989603fb5c2353c09c676b87a21976dc22940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 3 Apr 2023 18:19:38 -0300
Subject: [PATCH 4/4] octave: update to 8.1.0.
---
srcpkgs/octave/patches/aaffac4fbe30.patch | 52 -----------------------
srcpkgs/octave/template | 12 +++---
2 files changed, 6 insertions(+), 58 deletions(-)
delete mode 100644 srcpkgs/octave/patches/aaffac4fbe30.patch
diff --git a/srcpkgs/octave/patches/aaffac4fbe30.patch b/srcpkgs/octave/patches/aaffac4fbe30.patch
deleted file mode 100644
index e4c0e5cd72b6..000000000000
--- a/srcpkgs/octave/patches/aaffac4fbe30.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Source: https://hg.octave.org/octave/raw-rev/aaffac4fbe30
-See: https://savannah.gnu.org/bugs/index.php?63684
-
-# HG changeset patch
-# User Markus Mützel <markus.muetzel@gmx.de>
-# Date 1674223637 -3600
-# Node ID aaffac4fbe30833c07ac7e267da19c2ff569085f
-# Parent 084bbdabb969d502c964b046129b82adec2caeba
-Adapt for API changes in SuiteSparse 7.0.0 or newer (bug #63684).
-
-* liboctave/util/oct-sparse.h (SUITESPARSE_ASSIGN_FPTR,
-SUITESPARSE_ASSIGN_FPTR2): Adapt macro for changes in API of SuiteSparse 7.0.0
-or newer.
-
-diff -r 084bbdabb969 -r aaffac4fbe30 liboctave/util/oct-sparse.h
---- a/liboctave/util/oct-sparse.h Sun Jan 08 15:12:27 2023 +0100
-+++ b/liboctave/util/oct-sparse.h Fri Jan 20 15:07:17 2023 +0100
-@@ -89,16 +89,27 @@
- # include <SuiteSparseQR.hpp>
- #endif
-
--// Cope with new SuiteSparse versions
-+// Cope with API differences between SuiteSparse versions
-
- #if defined (SUITESPARSE_VERSION)
--# if (SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3))
-+# if (SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (7, 0))
-+# define SUITESPARSE_NAME(name) SuiteSparse_ ## name
-+# define SUITESPARSE_SET_FCN(name) SuiteSparse_config_ ## name ## _set
-+# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) \
-+ SUITESPARSE_SET_FCN(f_name) (f_assign)
-+# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) \
-+ SUITESPARSE_SET_FCN(f_name) (SUITESPARSE_NAME (f_assign))
-+# elif (SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3))
- # define SUITESPARSE_NAME(name) SuiteSparse_ ## name
--# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (SuiteSparse_config.f_name = f_assign)
--# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (SuiteSparse_config.f_name = SUITESPARSE_NAME (f_assign))
-+# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) \
-+ (SuiteSparse_config.f_name = f_assign)
-+# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) \
-+ (SuiteSparse_config.f_name = SUITESPARSE_NAME (f_assign))
- # else
--# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (f_var = f_assign)
--# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (f_var = CHOLMOD_NAME (f_assign))
-+# define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) \
-+ (f_var = f_assign)
-+# define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) \
-+ (f_var = CHOLMOD_NAME (f_assign))
- # endif
- #endif
-
-
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 471190a8fcb2..7a54418baa42 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,21 +1,21 @@
# Template file for 'octave'
pkgname=octave
-version=7.3.0
-revision=2
+version=8.1.0
+revision=1
build_style=gnu-configure
configure_args="--disable-docs"
hostmakedepends="perl gcc-fortran pkg-config"
-makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+makedepends="pcre2-devel readline-devel libSM-devel libltdl-devel lcms2-devel
glpk-devel SuiteSparse-devel rapidjson"
depends="$(vopt_if gui qt5-plugin-sqlite)"
checkdepends="zip unzip ghostscript gnuplot tar texinfo"
short_desc="High-level language, primarily intended for numerical computations"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="https://gnu.org/software/octave/"
-changelog="https://www.gnu.org/software/octave/NEWS-7.html"
+homepage="https://octave.org/"
+changelog="http://hg.savannah.gnu.org/hgweb/octave/raw-file/default/etc/NEWS.${version%%.*}.md"
distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=6e14a4649d70af45ab660f8cbbf645aaf1ec33f25f88bfda4697cb17e440c4f5
+checksum=8052074d17b0ef643d037de8ab389672c752bb201ee9cea4dfa69858fb6a213f
# avoid warnings due to egrep deprecation
export EGREP="grep -E"
next reply other threads:[~2023-04-04 1:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-04 1:18 tornaria [this message]
2023-04-05 11:21 ` szhorvat
2023-04-10 19:11 ` [PR PATCH] [Updated] " tornaria
2023-04-18 21:37 ` tornaria
2023-04-18 21:38 ` tornaria
2023-04-21 2:30 ` [PR PATCH] [Updated] " tornaria
2023-04-23 22:32 ` [PR PATCH] [Merged]: octave: update to 8.2.0 Duncaen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43252@inbox.vuxu.org \
--to=tornaria@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).