[packages/parigp] - updated to 2.11.4, Math-Pari 2.030518[00] (Math-Pari not ready for pari 2.13.x) - updated gmp-vers
qboosh
qboosh at pld-linux.org
Sat Jun 26 09:29:12 CEST 2021
commit 7e8bf48a1b025dfaa1a23a837d7896a05b231afb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jun 26 09:31:51 2021 +0200
- updated to 2.11.4, Math-Pari 2.030518[00] (Math-Pari not ready for pari 2.13.x)
- updated gmp-version patch, noproccpuinfo patch split into pari and Math-Pari parts
- removed obsolete termcap,escape-left-braces-in-regex.patch,perl-no-dot-in-inc and Math-Pari update patches
escape-left-braces-in-regex.patch | 11 ---
gmp-version.patch | 15 ++--
parigp-noproccpuinfo.patch | 11 ---
parigp-termcap.patch | 16 -----
parigp.spec | 49 +++++++-------
perl-Math-Pari-crash-workaround.patch | 4 +-
perl-Math-Pari-noproccpuinfo.patch | 11 +++
perl-Math-Pari-update.patch | 124 ----------------------------------
perl-no-dot-in-inc.patch | 24 -------
9 files changed, 45 insertions(+), 220 deletions(-)
---
diff --git a/parigp.spec b/parigp.spec
index 8a4210e..59279ab 100644
--- a/parigp.spec
+++ b/parigp.spec
@@ -1,37 +1,38 @@
#
# Conditional build:
-%bcond_without tex # don't build tex documentation
+%bcond_without tex # TeX documentation
#
-%define pari_version 2.5.5
+# latest perl Math::Pari (2.030518) doesn't know of pari >= 2.12
+%define pari_version 2.11.4
%define gp2c_version 0.0.12
-%define math_pari_version 2.01080605
+# because of previous 2.x versions with 8 minor digits, keep trailing zeros in package Version
+%define math_pari_version 2.03051800
+%define math_pari_fversion 2.030518
Summary: Number Theory-oriented Computer Algebra System
Summary(pl.UTF-8): Komputerowy system obliczeń algebraicznych zorientowany na metody teorii liczb
Name: parigp
Version: %{pari_version}
-Release: 18
+Release: 19
License: GPL v2+
Group: Applications/Math
-Source0: http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%{pari_version}.tar.gz
-# Source0-md5: fbd6402f8d3d3213b0633ab9ef4a63d0
+#Source0: http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%{pari_version}.tar.gz
+Source0: http://pari.math.u-bordeaux.fr/pub/pari/OLD/2.11/pari-%{pari_version}.tar.gz
+# Source0-md5: fb2968d7805424518fe44a59a2024afd
Source1: http://pari.math.u-bordeaux.fr/pub/pari/packages/galdata.tgz
# Source1-md5: f9f61b2930757a785b568e5d307a7d75
Source2: http://pari.math.u-bordeaux.fr/pub/pari/GP2C/gp2c-%{gp2c_version}.tar.gz
# Source2-md5: ab29c383985d1b7d339189ecff31d40a
-Source3: http://www.cpan.org/modules/by-module/Math/Math-Pari-%{math_pari_version}.tar.gz
-# Source3-md5: ccb3da2bdce184a5df3f52cfa8b43a85
+Source3: http://www.cpan.org/modules/by-module/Math/Math-Pari-%{math_pari_fversion}.zip
+# Source3-md5: f0d1d9f803c92abff0d6349869a82699
Source4: %{name}.desktop
Source5: %{name}.png
Patch0: %{name}-target_arch.patch
-Patch1: %{name}-termcap.patch
Patch2: %{name}-arch.patch
Patch3: perl-Math-Pari-crash-workaround.patch
-Patch4: perl-Math-Pari-update.patch
+Patch4: perl-Math-Pari-noproccpuinfo.patch
Patch5: %{name}-noproccpuinfo.patch
Patch6: gmp-version.patch
Patch7: Math-Pari-escape-left-braces-in-regex.patch
-Patch8: escape-left-braces-in-regex.patch
-Patch9: perl-no-dot-in-inc.patch
URL: http://pari.math.u-bordeaux.fr/
BuildRequires: autoconf
BuildRequires: ctags
@@ -177,16 +178,14 @@ Interfejs Perla do biblioteki PARI.
%prep
%setup -q -n pari-%{pari_version} -a 2 -a 3
+patch -p1 < Math-Pari-%{math_pari_fversion}/patches/diff-2.11.0-all
%patch0 -p1
-%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch8 -p1
-%patch9 -p1
-cd Math-Pari-%{math_pari_version}
+cd Math-Pari-%{math_pari_fversion}
+%patch3 -p1
+%patch4 -p1
%patch7 -p0
%build
@@ -202,7 +201,6 @@ cd Math-Pari-%{math_pari_version}
--with-ncurses-lib=%{_libdir} \
--with-gmp-lib=%{_libdir}
-
%{__make} -C Olinux-%{_target_cpu} all \
CC="%{__cc}" \
CFLAGS="%{rpmcflags} -fno-strict-aliasing -fomit-frame-pointer -fPIC"
@@ -235,7 +233,7 @@ ln -sf .. pari
cd ..
# math-pari
-cd Math-Pari-%{math_pari_version}
+cd Math-Pari-%{math_pari_fversion}
cp -f ../Olinux-%{_target_cpu}/paricfg.h libPARI/paricfg.h
echo '#define DL_DFLT_NAME NULL' >>libPARI/paricfg.h
@@ -274,13 +272,14 @@ tar zxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/parigp/galdata
DESTDIR=$RPM_BUILD_ROOT
# math-pari
-%{__make} install -C Math-Pari-%{math_pari_version} \
+%{__make} install -C Math-Pari-%{math_pari_fversion} \
DESTDIR=$RPM_BUILD_ROOT
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/pari.1
echo ".so gp.1" > $RPM_BUILD_ROOT%{_mandir}/man1/pari.1
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/parigp/{examples,doc}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/gp2c
%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Math/libPARI*.pod
%clean
@@ -291,8 +290,8 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS CHANGES* COMPAT MACHINES NEW README examples/Inputrc %{?with_tex:doc/*.pdf}
-%attr(755,root,root) %{_bindir}/gp-2.5
+%doc AUTHORS CHANGES* COMPAT NEW README examples/Inputrc %{?with_tex:doc/*.pdf}
+%attr(755,root,root) %{_bindir}/gp-2.11
%attr(755,root,root) %{_bindir}/gp
%attr(755,root,root) %{_bindir}/gphelp
%attr(755,root,root) %{_bindir}/tex2mail
@@ -311,7 +310,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n pari
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libpari-gmp.so.*.*.*
-%ghost %attr(755,root,root) %{_libdir}/libpari-gmp.so.3
+%attr(755,root,root) %ghost %{_libdir}/libpari-gmp.so.6
%{_libdir}/parigp
%files -n pari-devel
@@ -342,7 +341,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n perl-Math-Pari
%defattr(644,root,root,755)
-%doc Math-Pari-%{math_pari_version}/{Changes,README,TODO}
+%doc Math-Pari-%{math_pari_fversion}/{Changes,README,TODO}
%{perl_vendorarch}/Math/Pari.pm
%{perl_vendorarch}/Math/PariInit.pm
%dir %{perl_vendorarch}/auto/Math/Pari
diff --git a/escape-left-braces-in-regex.patch b/escape-left-braces-in-regex.patch
deleted file mode 100644
index 24afc78..0000000
--- a/escape-left-braces-in-regex.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pari-2.5.5/src/desc/doc_make~ 2017-07-02 15:05:00.000000000 +0200
-+++ pari-2.5.5/src/desc/doc_make 2017-07-02 15:09:47.283000083 +0200
-@@ -28,7 +28,7 @@
- $v =~ s/\[\]/[\\,]/g;
- $v =~ s/(\w\w+)/\\var{$1}/g;
- $v =~ s/\^([a-z])/\\hbox{\\kbd{\\pow}}$1/g;
-- $v =~ s/\\var{flag}/\\fl/g;
-+ $v =~ s/\\var\{flag}/\\fl/g;
-
- $v = "\$($v)\$";
- }
diff --git a/gmp-version.patch b/gmp-version.patch
index 2de6d0c..445c345 100644
--- a/gmp-version.patch
+++ b/gmp-version.patch
@@ -1,11 +1,12 @@
---- pari-2.5.5/config/gmp_version.c~ 2015-05-10 16:26:39.000000000 +0200
-+++ pari-2.5.5/config/gmp_version.c 2015-05-10 16:27:07.950401133 +0200
-@@ -3,8 +3,5 @@
+--- pari-2.11.4/config/gmp_version.c.orig 2021-06-25 21:33:14.999293627 +0200
++++ pari-2.11.4/config/gmp_version.c 2021-06-25 21:33:52.912421567 +0200
+@@ -3,9 +3,5 @@
void f(void) { mpn_gcdext(NULL,NULL, NULL, NULL, 0, NULL, 0); }
- main()
+ int main()
{
-- if (sizeof(mp_limb_t) == sizeof(long))
- printf("%s", gmp_version);
+- if (sizeof(mp_limb_t) == sizeof(long *))
+ printf("%s\n", gmp_version);
- else
-- printf("unsupported");
+- printf("unsupported\n");
+- return 0;
}
diff --git a/parigp-noproccpuinfo.patch b/parigp-noproccpuinfo.patch
index c4438ef..d0e60a1 100644
--- a/parigp-noproccpuinfo.patch
+++ b/parigp-noproccpuinfo.patch
@@ -9,14 +9,3 @@
*SuperSparc*) arch=sparcv8_super;;
*TMS390Z5[05]*) arch=sparcv8_super;; # SuperSparc I or II
*TMS390S1[05]*) arch=sparcv8_micro;; # MicroSparc I
---- pari-2.1.7/Math-Pari-2.01080605/utils/Math/PariBuild.pm.orig 2005-01-20 03:04:46.000000000 +0100
-+++ pari-2.1.7/Math-Pari-2.01080605/utils/Math/PariBuild.pm 2005-01-22 00:01:08.135658528 +0100
-@@ -801,7 +801,7 @@
- chomp($machine = `uname -m`);
- $machine = 'sparcv9' if $machine eq 'sparc64';
- $machine = 'hppa' if $machine =~ /^parisc/;
-- if ($machine eq 'sparc' and -e '/proc/cpuinfo' && -R '/proc/cpuinfo') {
-+ if ($machine eq 'sparc' and 0 && -e '/proc/cpuinfo' && -R '/proc/cpuinfo') {
- open IN, '/proc/cpuinfo' or die "open /proc/cpuinfo: $!";
- local $/ = undef; # Needed?
- my $info = <IN>;
diff --git a/parigp-termcap.patch b/parigp-termcap.patch
deleted file mode 100644
index e145346..0000000
--- a/parigp-termcap.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- pari-2.5.5/config/get_readline.orig 2013-11-13 12:12:47.148846810 +0000
-+++ pari-2.5.5/config/get_readline 2013-11-13 12:14:11.926846829 +0000
-@@ -98,13 +98,6 @@
- if test -n "$try"; then
- rl_ncurses=$ncurses
- need_tgetent=
-- else # give termcap a try
-- pth="$with_readline_lib $libpth"
-- lib=termcap; . ./locatelib
-- if test -n "$try"; then
-- rl_termcap=$termcap
-- need_tgetent=
-- fi
- fi
- pth=$opth
- fi
diff --git a/perl-Math-Pari-crash-workaround.patch b/perl-Math-Pari-crash-workaround.patch
index fa50700..6e4d1b5 100644
--- a/perl-Math-Pari-crash-workaround.patch
+++ b/perl-Math-Pari-crash-workaround.patch
@@ -8,8 +8,8 @@ bless( do{\(my $o = POINTER_VAL)}, 'Math::Pari' );
where POINTER_VAL is just value of pointer to already existing Pari
object (which may be destroyed later!).
---- pari-2.3.5/Math-Pari-2.01080605/Pari.xs.orig 2004-01-31 10:06:08.000000000 +0100
-+++ pari-2.3.5/Math-Pari-2.01080605/Pari.xs 2004-05-15 21:11:38.894463600 +0200
+--- Math-Pari-2.01080605/Pari.xs.orig 2004-01-31 10:06:08.000000000 +0100
++++ Math-Pari-2.01080605/Pari.xs 2004-05-15 21:11:38.894463600 +0200
@@ -1285,6 +1285,13 @@
SV* nextsv;
long ret=0;
diff --git a/perl-Math-Pari-noproccpuinfo.patch b/perl-Math-Pari-noproccpuinfo.patch
new file mode 100644
index 0000000..a55a3cf
--- /dev/null
+++ b/perl-Math-Pari-noproccpuinfo.patch
@@ -0,0 +1,11 @@
+--- Math-Pari-2.01080605/utils/Math/PariBuild.pm.orig 2005-01-20 03:04:46.000000000 +0100
++++ Math-Pari-2.01080605/utils/Math/PariBuild.pm 2005-01-22 00:01:08.135658528 +0100
+@@ -801,7 +801,7 @@
+ chomp($machine = `uname -m`);
+ $machine = 'sparcv9' if $machine eq 'sparc64';
+ $machine = 'hppa' if $machine =~ /^parisc/;
+- if ($machine eq 'sparc' and -e '/proc/cpuinfo' && -R '/proc/cpuinfo') {
++ if ($machine eq 'sparc' and 0 && -e '/proc/cpuinfo' && -R '/proc/cpuinfo') {
+ open IN, '/proc/cpuinfo' or die "open /proc/cpuinfo: $!";
+ local $/ = undef; # Needed?
+ my $info = <IN>;
diff --git a/perl-Math-Pari-update.patch b/perl-Math-Pari-update.patch
deleted file mode 100644
index a3ea342..0000000
--- a/perl-Math-Pari-update.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- pari-2.5.4/Math-Pari-2.01080605/Pari.xs.orig 2013-06-27 16:39:02.034699886 +0200
-+++ pari-2.5.4/Math-Pari-2.01080605/Pari.xs 2013-06-27 16:44:40.888019141 +0200
-@@ -547,7 +547,7 @@
- && lgef(x)==4 /* 2 terms */
- && (gcmp0((GEN)x[2])) /* Free */
- && (gcmp1((GEN)x[3]))) { /* Leading */
-- s = varentries[ordvar[varn(x)]]->name;
-+ s = varentries[varn(x)]->name;
- goto repeat;
- }
- goto ignore;
-@@ -765,8 +765,8 @@
- }
-
-
--PariOUT perlOut={svputc, svputs, svOutflush, NULL};
--PariOUT perlErr={svErrputc, svErrputs, svErrflush, svErrdie};
-+PariOUT perlOut={svputc, svputs, svOutflush};
-+PariOUT perlErr={svErrputc, svErrputs, svErrflush};
-
- static GEN
- my_ulongtoi(ulong uv)
-@@ -934,7 +934,7 @@
- || ((2 * sizeof(long) == sizeof(IV)) && !HAVE_UVs && in[2] < 0) )
- goto do_nv;
- uv = in[2];
-- uv = (uv << TWOPOTBYTES_IN_LONG) + in[3];
-+ uv = (uv << (TWOPOTBITS_IN_LONG-3)) + in[3];
- break;
- default:
- goto do_nv;
-@@ -1010,7 +1010,7 @@
- PariOUT *oldOut = pariOut;
- pariOut = &perlOut;
- worksv = newSVpv("",0);
-- mybruteall(in,'g',-1,0); /* 0: compact pari-readable form */
-+ brute(in,'g',-1); /* 0: compact pari-readable form */
- pariOut = oldOut;
- return worksv;
- }
-@@ -1025,7 +1025,7 @@
- #endif
-
- #ifndef pariK1
--# define pariK1 (0.103810253/(BYTES_IN_LONG/4)) /* log(10)/(SL*log(2)) */
-+# define pariK1 (0.103810253/(sizeof(long)/4)) /* log(10)/(SL*log(2)) */
- #endif
-
- long
-@@ -1083,7 +1083,7 @@
- PariOUT *oldOut = pariOut;
- pariOut = &perlOut;
- worksv = newSVpv("",0);
-- sor(in, 'g'/*fmt.format*/, fmt_nb, 0/*fmt.field*/);
-+ matbrute(in, 'g'/*fmt.format*/, fmt_nb);
- pariOut = oldOut;
- return worksv;
- }
-@@ -1324,17 +1324,6 @@
- moveoffstack_newer_than((SV *) GENfirstOnStack);
- }
-
--UV
--allocatemem(UV newsize)
--{
-- if (newsize) {
-- detach_stack();
-- parisize = allocatemoremem(newsize);
-- perlavma = sentinel = avma;
-- }
-- return parisize;
--}
--
-
- GEN
- callPerlFunction(entree *ep, ...)
-@@ -3466,8 +3455,8 @@
- else
- warn("`%s' is an obsolete Pari function name", name);
- }
-- if (ep && (EpVALENCE(ep) < EpUSER
-- /* && ep>=fonctions && ep < fonctions+NUMFUNC) */)) {
-+ if (ep /* && (EpVALENCE(ep) < EpUSER
-+ && ep>=fonctions && ep < fonctions+NUMFUNC)) */) {
- /* Builtin */
- IV table_valence = 99;
-
-@@ -4009,18 +3998,6 @@
- # and it needs to convert *all* the branches.
- #/* #if defined(PERL_VERSION) && (PERL_VERSION >= 6)*//* 5.6.0 has UV in the typemap */
-
--#if 0
--#UV
--#allocatemem(newsize = 0)
--#UV newsize
--
--#else /* !( HAVE_UVs ) */
--
--unsigned long
--allocatemem(newsize = 0)
-- unsigned long newsize
--
--#endif /* !( HAVE_UVs ) */
-
- long
- lgef(x)
---- pari-2.5.1/Math-Pari-2.01080605/func_codes.h.orig 2004-02-01 10:27:30.000000000 +0100
-+++ pari-2.5.1/Math-Pari-2.01080605/func_codes.h 2012-02-19 21:26:18.835564839 +0100
-@@ -587,3 +587,4 @@
- return PERL_constant_NOTFOUND;
- }
-
-+extern entree functions_basic[];
---- pari-2.5.4/Math-Pari-2.01080605/libPARI/Makefile.PL.orig 2009-11-07 04:21:40.000000000 +0100
-+++ pari-2.5.4/Math-Pari-2.01080605/libPARI/Makefile.PL 2013-06-27 17:41:52.774541644 +0200
-@@ -249,7 +249,7 @@
- $mp = 'mp.c';
- my $kern = "$kernel_dir/none";
- my @dep # Copied from src/kernel/none/MakeLVL1.SH 2.2.10
-- = "$kern/mp.c $kern/cmp.c $kern/gcdll.c $kern/ratlift.c $kern/gcd.c $kern/invmod.c $kern/mp_indep.c $kern/add.c";
-+ = "$kern/mp.c $kern/cmp.c $kern/gcdll.c $kern/ratlift.c $kern/gcd.c $kern/gcdext.c $kern/invmod.c $kern/mp_indep.c $kern/add.c";
- $create_mp = <<EOS;
- mp.c: @dep
- \$(PERL) -pe1 @dep > \$@
diff --git a/perl-no-dot-in-inc.patch b/perl-no-dot-in-inc.patch
deleted file mode 100644
index a3b8f77..0000000
--- a/perl-no-dot-in-inc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- pari-2.5.5/src/desc/doc_make~ 2013-05-22 14:55:02.000000000 +0200
-+++ pari-2.5.5/src/desc/doc_make 2017-07-02 15:03:10.239915473 +0200
-@@ -1,4 +1,5 @@
- #!/usr/bin/perl
-+use lib '.';
- use PARI::822;
-
- PARI::822::read(\%funcs, "pari.desc");
---- pari-2.5.5/src/desc/gen_proto~ 2011-09-22 22:02:11.000000000 +0200
-+++ pari-2.5.5/src/desc/gen_proto 2017-07-02 15:03:13.726667631 +0200
-@@ -1,4 +1,5 @@
- #!/usr/bin/perl -w
-+use lib '.';
- use PARI::822;
-
- $class=$ARGV[0];
---- pari-2.5.5/src/desc/merge_822~ 2011-09-22 22:02:11.000000000 +0200
-+++ pari-2.5.5/src/desc/merge_822 2017-07-02 15:03:16.813409984 +0200
-@@ -1,4 +1,5 @@
- #!/usr/bin/perl -w
-+use lib '.';
- use PARI::822;
-
- open(IN, $ARGV[0]) || die "cannot find $ARGV[0]";
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/parigp.git/commitdiff/7e8bf48a1b025dfaa1a23a837d7896a05b231afb
More information about the pld-cvs-commit
mailing list