[packages/perl-Math-GSL] - updated to 0.44; adjusted 2.7.1 patch for gsl 2.8, added swig-only-curversion patch from Debian
qboosh
qboosh at pld-linux.org
Mon Jun 3 21:48:56 CEST 2024
commit e6da957bffae529e1b07fd55411669bd521cf722
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Jun 3 21:41:30 2024 +0200
- updated to 0.44; adjusted 2.7.1 patch for gsl 2.8, added swig-only-curversion patch from Debian
Math-GSL-swig-only-curversion.patch | 18 ++++++++++
gsl-2.7.1.patch | 12 -------
gsl-2.8.patch | 71 +++++++++++++++++++++++++++++++++++++
perl-Math-GSL.spec | 14 ++++----
4 files changed, 97 insertions(+), 18 deletions(-)
---
diff --git a/perl-Math-GSL.spec b/perl-Math-GSL.spec
index 96a1bc8..3615426 100644
--- a/perl-Math-GSL.spec
+++ b/perl-Math-GSL.spec
@@ -1,21 +1,22 @@
#
# Conditional build:
-%bcond_without tests # do not perform "make test"
+%bcond_without tests # unit tests
#
%define pdir Math
%define pnam GSL
Summary: Math::GSL Perl module - resticted interface to GNU Scientific Library
Summary(pl.UTF-8): Moduł Perla Math::GSL - ograniczony interfejs do GNU Scientific Library
Name: perl-Math-GSL
-Version: 0.43
-Release: 4
+Version: 0.44
+Release: 1
# same as perl
License: GPL v1+ or Artistic
Group: Development/Languages/Perl
Source0: https://www.cpan.org/modules/by-module/Math/%{pdir}-%{pnam}-%{version}.tar.gz
-# Source0-md5: 8db782c053ec8417f39f55439a65d3c5
-Patch0: gsl-2.7.1.patch
-URL: https://search.cpan.org/dist/Math-GSL/
+# Source0-md5: c3249e41b1c304a8fb45e6982543c408
+Patch0: gsl-2.8.patch
+Patch1: Math-GSL-swig-only-curversion.patch
+URL: https://metacpan.org/dist/Math-GSL
BuildRequires: gsl-devel >= 1.15
BuildRequires: perl-Alien-GSL
BuildRequires: perl-Module-Build >= 0.38
@@ -51,6 +52,7 @@ udostępnić te funkcje "tkscope" w module Audio::Data.
%prep
%setup -q -n %{pdir}-%{pnam}-%{version}
%patch0 -p1
+%patch1 -p1
# simulate non-release to force swig rebuild
mkdir .git
diff --git a/Math-GSL-swig-only-curversion.patch b/Math-GSL-swig-only-curversion.patch
new file mode 100644
index 0000000..fb02139
--- /dev/null
+++ b/Math-GSL-swig-only-curversion.patch
@@ -0,0 +1,18 @@
+Description: Run the swig rebuild only for the current GSL versions.
+ Rebuilding for older versions is not only a waste of time,
+ it can fail because of changes in GSL headers etc.
+Origin: vendor
+Forwarded: not needed
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2020-06-11
+
+--- a/inc/GSLBuilder.pm
++++ b/inc/GSLBuilder.pm
+@@ -89,6 +89,7 @@
+
+ foreach my $ver ( Ver2Func->versions( $cur_ver ) ) {
+
++ next unless $ver eq $cur_ver; # only rebuild for current GLS version
+ print "Building wrappers for GSL $ver\n";
+
+ my $ver2func = Ver2Func->new( $ver );
diff --git a/gsl-2.7.1.patch b/gsl-2.7.1.patch
deleted file mode 100644
index 571703e..0000000
--- a/gsl-2.7.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Math-GSL-0.43/inc/Ver2Func.pm.orig 2021-07-26 18:28:55.000000000 +0200
-+++ Math-GSL-0.43/inc/Ver2Func.pm 2021-12-04 22:49:11.335387076 +0100
-@@ -526,7 +526,8 @@
-
- /
- ]
-- }
-+ },
-+ "2.7.1" => {}
-
- );
-
diff --git a/gsl-2.8.patch b/gsl-2.8.patch
new file mode 100644
index 0000000..1d7e913
--- /dev/null
+++ b/gsl-2.8.patch
@@ -0,0 +1,71 @@
+--- Math-GSL-0.43/inc/Ver2Func.pm.orig 2021-07-26 18:28:55.000000000 +0200
++++ Math-GSL-0.43/inc/Ver2Func.pm 2021-12-04 22:49:11.335387076 +0100
+@@ -526,7 +526,34 @@
+
+ /
+ ]
+- }
++ },
++ "2.8" => {
++ new => [
++ qw/
++ ^gsl_matrix_complex_conjugate$
++ ^gsl_vector_complex_conj_memcpy$
++ ^gsl_vector_complex_div_real$
++ ^gsl_linalg_QR_lssolvem_r$
++ ^gsl_linalg_complex_QR_lssolvem_r$
++ ^gsl_linalg_complex_QR_QHmat_r$
++ ^gsl_linalg_QR_UR_lssolve$
++ ^gsl_linalg_QR_UR_lssvx$
++ ^gsl_linalg_QR_UR_QTvec$
++ ^gsl_linalg_QR_UU_lssvx$
++ ^gsl_linalg_QR_UD_lssvx$
++ ^gsl_linalg_QR_UD_QTvec$
++ ^gsl_linalg_complex_cholesky_decomp2$
++ ^gsl_linalg_complex_cholesky_svx2$
++ ^gsl_linalg_complex_cholesky_solve2$
++ ^gsl_linalg_complex_cholesky_scale$
++ ^gsl_linalg_complex_cholesky_scale_apply$
++ ^gsl_linalg_SV_solve2$
++ ^gsl_linalg_SV_lssolve$
++ ^gsl_rstat_norm$
++ ^gsl_integration_lebedev$
++ /
++ ]
++ }
+
+ );
+
+--- Math-GSL-0.44/swig/Multilarge.i.orig 2023-12-01 20:18:02.000000000 +0100
++++ Math-GSL-0.44/swig/Multilarge.i 2024-06-03 21:10:08.021652953 +0200
+@@ -25,7 +25,7 @@
+ %include "gsl/gsl_matrix.h"
+ %include "gsl/gsl_permutation.h"
+ %include "gsl/gsl_multifit.h"
+-#if MG_GSL_NUM_VERSION >= 002007
++#if MG_GSL_NUM_VERSION >= 0x002007
+ %include "gsl/gsl_multilarge.h"
+ #else
+ %include "legacy/gsl-2.6/gsl_multilarge.h"
+--- Math-GSL-0.44/swig/SparseMatrix.i.orig 2023-12-01 20:18:02.000000000 +0100
++++ Math-GSL-0.44/swig/SparseMatrix.i 2024-06-03 21:10:17.091603817 +0200
+@@ -9,7 +9,7 @@
+ #include "gsl/gsl_spmatrix.h"
+ %}
+
+-#if MG_GSL_NUM_VERSION >= 002006
++#if MG_GSL_NUM_VERSION >= 0x002006
+ // ignore gsl_spmatrix_uchar_norm1, gsl_spmatrix_char_norm1, ...
+ %rename("%(regex:/^gsl_spmatrix_u.*_norm1$/$ignore/)s") "";
+ %include "gsl/gsl_spmatrix.h"
+--- Math-GSL-0.44/inc/GSLBuilder.pm.orig 2023-12-01 20:18:02.000000000 +0100
++++ Math-GSL-0.44/inc/GSLBuilder.pm 2024-06-03 21:10:47.674771467 +0200
+@@ -210,7 +210,7 @@ sub compile_swig {
+ push @swig_flags, "-DMG_GSL_MAJOR_VERSION=$major",
+ "-DMG_GSL_MINOR_VERSION=$minor",
+ "-DMG_GSL_VERSION=\"$major.$minor\"",
+- "-DMG_GSL_NUM_VERSION=$numerical_ver";
++ "-DMG_GSL_NUM_VERSION=0x$numerical_ver";
+
+ my $blib_lib = catdir(qw/blib lib/);
+ my $gsldir = catdir('pm', qw/Math GSL/);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/perl-Math-GSL.git/commitdiff/e6da957bffae529e1b07fd55411669bd521cf722
More information about the pld-cvs-commit
mailing list