From 3f7deea21b23742f3ed20d7b77cc1aa8f134860f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 3 Apr 2023 19:13:57 -0300 Subject: [PATCH 1/3] GraphicsMagick: update to 1.3.40. --- srcpkgs/GraphicsMagick/template | 10 +++++----- srcpkgs/GraphicsMagick/update | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template index 69ce42dce2de..695efbc55d3b 100644 --- a/srcpkgs/GraphicsMagick/template +++ b/srcpkgs/GraphicsMagick/template @@ -1,7 +1,7 @@ # Template file for 'GraphicsMagick' pkgname=GraphicsMagick -version=1.3.38 -revision=2 +version=1.3.40 +revision=1 build_style=gnu-configure configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1 --with-modules --with-perl --without-jp2 --enable-shared --disable-static" @@ -16,10 +16,10 @@ depends="ghostscript" short_desc="GraphicsMagick Image Processing System" maintainer="Orphaned " 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 bcc034704c778057a359cd9265d4b3dd16f32d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 3 Apr 2023 22:10:15 -0300 Subject: [PATCH 2/3] 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 065f131d410fc362b01f4d4f425e91015e569398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 3 Apr 2023 18:19:38 -0300 Subject: [PATCH 3/3] 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 -# 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 - #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 " 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"