diff --git a/pari-2.13.0-clobbered.patch b/pari-2.13.0-clobbered.patch index 177344b..e4e7598 100644 --- a/pari-2.13.0-clobbered.patch +++ b/pari-2.13.0-clobbered.patch @@ -1,6 +1,6 @@ ---- src/basemath/bibli1.c.orig 2020-10-15 02:36:36.000000000 -0600 -+++ src/basemath/bibli1.c 2020-10-19 15:10:33.130950212 -0600 -@@ -1902,7 +1902,7 @@ END: +--- src/basemath/bibli1.c.orig 2022-09-16 11:16:27.000000000 -0600 ++++ src/basemath/bibli1.c 2022-09-19 16:27:28.250543096 -0600 +@@ -1944,7 +1944,7 @@ END: GEN fincke_pohst(GEN a, GEN B0, long stockmax, long PREC, FP_chk_fun *CHECK) { @@ -9,9 +9,9 @@ VOLATILE long i,j,l; VOLATILE GEN r,rinv,rinvtrans,u,v,res,z,vnorm,rperm,perm,uperm, bound = B0; ---- src/gp/gp.c.orig 2020-10-15 02:36:36.000000000 -0600 -+++ src/gp/gp.c 2020-10-19 15:10:33.131950211 -0600 -@@ -433,7 +433,8 @@ break_loop(int numerr) +--- src/gp/gp.c.orig 2022-09-16 11:16:27.000000000 -0600 ++++ src/gp/gp.c 2022-09-19 16:27:28.251543098 -0600 +@@ -438,7 +438,8 @@ break_loop(int numerr) { filtre_t F; Buffer *b; @@ -21,9 +21,9 @@ struct gp_context rec1, rec2; const char *prompt, *msg; long nenv, oldframe_level = frame_level; ---- src/language/gplib.c.orig 2020-10-15 02:36:36.000000000 -0600 -+++ src/language/gplib.c 2020-10-19 15:10:33.132950211 -0600 -@@ -938,7 +938,7 @@ parse_key_val(char *src, char **ps, char +--- src/language/gplib.c.orig 2022-09-16 11:16:27.000000000 -0600 ++++ src/language/gplib.c 2022-09-19 16:27:28.251543098 -0600 +@@ -963,7 +963,7 @@ parse_key_val_paren(char *src, char **ps void gp_initrc(pari_stack *p_A) { @@ -32,17 +32,16 @@ Buffer *b; filtre_t F; VOLATILE long c = 0; ---- src/modules/stark.c.orig 2020-10-15 02:36:36.000000000 -0600 -+++ src/modules/stark.c 2020-10-19 16:19:30.113213038 -0600 -@@ -2548,10 +2548,11 @@ quadray_init(GEN *pD, GEN f, GEN *pbnf, +--- src/modules/stark.c.orig 2022-09-19 16:27:28.252543100 -0600 ++++ src/modules/stark.c 2022-09-19 16:28:20.241662010 -0600 +@@ -2554,9 +2554,10 @@ quadray_init(GEN *pD, GEN *pbnf, long pr /* compute the polynomial over Q of the Hilbert class field of Q(sqrt(D)) where D is a positive fundamental discriminant */ static GEN -quadhilbertreal(GEN D, long prec) +quadhilbertreal(GEN D, long baseprec) { - pari_sp av = avma; - GEN bnf, pol, bnr, dtQ, data, M; + GEN bnf, bnr, dtQ, data, M; + VOLATILE long prec = baseprec; long newprec; pari_timer T; diff --git a/pari-2.13.0-declaration-not-prototype.patch b/pari-2.13.0-declaration-not-prototype.patch index 6b477cf..c921e8a 100644 --- a/pari-2.13.0-declaration-not-prototype.patch +++ b/pari-2.13.0-declaration-not-prototype.patch @@ -1,5 +1,5 @@ ---- src/basemath/buch2.c.orig 2020-10-15 08:30:54.000000000 -0600 -+++ src/basemath/buch2.c 2020-10-19 16:08:02.707935874 -0600 +--- src/basemath/buch2.c.orig 2022-09-16 11:16:27.000000000 -0600 ++++ src/basemath/buch2.c 2022-09-19 16:25:24.530260133 -0600 @@ -1140,7 +1140,7 @@ getfu(GEN nf, GEN *ptA, GEN *ptU, long p } @@ -9,9 +9,9 @@ /* bound for log2 |sigma(u)|, sigma complex embedding, u fundamental unit * attached to bnf_get_logfu */ ---- src/basemath/mftrace.c.orig 2020-10-15 02:36:36.000000000 -0600 -+++ src/basemath/mftrace.c 2020-10-19 16:07:40.945917453 -0600 -@@ -625,7 +625,7 @@ mfcharGL(GEN G, GEN L) +--- src/basemath/mftrace.c.orig 2022-09-16 11:16:27.000000000 -0600 ++++ src/basemath/mftrace.c 2022-09-19 16:25:24.532260138 -0600 +@@ -631,7 +631,7 @@ mfcharGL(GEN G, GEN L) return mkvec4(G, L, o, polcyclo(ord,vt)); } static GEN @@ -20,7 +20,7 @@ { return mfcharGL(znstar0(gen_1,1), cgetg(1,t_COL)); } /* convert a generic character into an 'mfchar' */ static GEN -@@ -1712,7 +1712,7 @@ mfcoef(GEN F, long n) +@@ -1725,7 +1725,7 @@ mfcoef(GEN F, long n) } static GEN @@ -29,9 +29,9 @@ static GEN mftrivial(void) { retmkvec2(paramconst(), cgetg(1,t_VEC)); } static GEN ---- src/basemath/modsym.c.orig 2020-10-15 02:36:36.000000000 -0600 -+++ src/basemath/modsym.c 2020-10-19 16:07:40.947917455 -0600 -@@ -1404,11 +1404,11 @@ indices_backward(GEN W, GEN C) +--- src/basemath/modsym.c.orig 2022-09-16 11:16:27.000000000 -0600 ++++ src/basemath/modsym.c 2022-09-19 16:25:24.533260140 -0600 +@@ -1406,11 +1406,11 @@ indices_backward(GEN W, GEN C) /*[0,-1;1,-1]*/ static GEN @@ -45,89 +45,9 @@ { return mkmat22(gen_0,gen_1, gen_m1,gen_0); } /* N = integer > 1. Returns data describing Delta_0 = Z[P^1(Q)]_0 seen as * a Gamma_0(N) - module. */ ---- src/language/eval.c.orig 2020-10-15 02:36:36.000000000 -0600 -+++ src/language/eval.c 2020-10-19 16:07:40.948917456 -0600 -@@ -1345,11 +1345,11 @@ closure_eval(GEN C) - break; - } - --#define EVAL_f(f) \ -+#define EVAL_f0(f) f() -+#define EVAL_f1(f) sp--; f(st[sp]) -+#define EVAL_fn(f) \ - switch (ep->arity) \ - { \ -- case 0: f(); break; \ -- case 1: sp--; f(st[sp]); break; \ - case 2: sp-=2; f(st[sp],st[sp+1]); break; \ - case 3: sp-=3; f(st[sp],st[sp+1],st[sp+2]); break; \ - case 4: sp-=4; f(st[sp],st[sp+1],st[sp+2],st[sp+3]); break; \ -@@ -1380,7 +1380,12 @@ closure_eval(GEN C) - GEN res; - /* Macro Madness : evaluate function ep->value on arguments - * st[sp-ep->arity .. sp]. Set res = result. */ -- EVAL_f(res = ((GEN (*)(ANYARG))ep->value)); -+ switch (ep->arity) -+ { -+ case 0: EVAL_f0(res = ((GEN (*)(void))ep->value)); break; -+ case 1: EVAL_f1(res = ((GEN (*)(long))ep->value)); break; -+ default: EVAL_fn(res = ((GEN (*)(long, ...))ep->value)); -+ } - if (br_status) goto endeval; - gel(st,sp++)=res; - break; -@@ -1399,7 +1404,12 @@ closure_eval(GEN C) - { - entree *ep = (entree *)operand; - long res; -- EVAL_f(res = ((long (*)(ANYARG))ep->value)); -+ switch (ep->arity) -+ { -+ case 0: EVAL_f0(res = ((long (*)(void))ep->value)); break; -+ case 1: EVAL_f1(res = ((long (*)(long))ep->value)); break; -+ default: EVAL_fn(res = ((long (*)(long, ...))ep->value)); -+ } - if (br_status) goto endeval; - st[sp++] = res; - break; -@@ -1408,7 +1418,12 @@ closure_eval(GEN C) - { - entree *ep = (entree *)operand; - long res; -- EVAL_f(res = ((int (*)(ANYARG))ep->value)); -+ switch (ep->arity) -+ { -+ case 0: EVAL_f0(res = ((int (*)(void))ep->value)); break; -+ case 1: EVAL_f1(res = ((int (*)(long))ep->value)); break; -+ default: EVAL_fn(res = ((int (*)(long, ...))ep->value)); -+ } - if (br_status) goto endeval; - st[sp++] = res; - break; -@@ -1416,11 +1431,18 @@ closure_eval(GEN C) - case OCcallvoid: - { - entree *ep = (entree *)operand; -- EVAL_f(((void (*)(ANYARG))ep->value)); -+ switch (ep->arity) -+ { -+ case 0: EVAL_f0(((void (*)(void))ep->value)); break; -+ case 1: EVAL_f1(((void (*)(long))ep->value)); break; -+ default: EVAL_fn(((void (*)(long, ...))ep->value)); -+ } - if (br_status) goto endeval; - break; - } --#undef EVAL_f -+#undef EVAL_f0 -+#undef EVAL_f1 -+#undef EVAL_fn - - case OCcalluser: - { ---- src/language/init.c.orig 2020-10-15 02:36:36.000000000 -0600 -+++ src/language/init.c 2020-10-19 16:07:40.950917458 -0600 -@@ -121,7 +121,7 @@ void (*cb_pari_pre_recover)(long); +--- src/language/init.c.orig 2022-09-16 11:16:27.000000000 -0600 ++++ src/language/init.c 2022-09-19 16:25:24.534260143 -0600 +@@ -122,7 +122,7 @@ void (*cb_pari_pre_recover)(long); void (*cb_pari_err_recover)(long); int (*cb_pari_break_loop)(int); int (*cb_pari_is_interactive)(void); @@ -136,9 +56,9 @@ const char * pari_library_path = NULL; ---- src/modules/mpqs.c.orig 2020-10-19 11:13:10.000000000 -0600 -+++ src/modules/mpqs.c 2020-10-19 16:08:21.266951580 -0600 -@@ -1495,7 +1495,7 @@ mpqs_solve_linear_system(mpqs_handle_t * +--- src/modules/mpqs.c.orig 2022-09-16 11:16:27.000000000 -0600 ++++ src/modules/mpqs.c 2022-09-19 16:25:24.534260143 -0600 +@@ -1501,7 +1501,7 @@ mpqs_solve_linear_system(mpqs_handle_t * /** MAIN ENTRY POINT AND DRIVER ROUTINE **/ /*********************************************************************/ static void diff --git a/pari-2.13.0-optflags.patch b/pari-2.13.0-optflags.patch deleted file mode 100644 index e6bd3ef..0000000 --- a/pari-2.13.0-optflags.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- config/get_cc.orig 2020-09-21 00:29:25.000000000 -0600 -+++ config/get_cc 2020-10-19 15:07:44.937970813 -0600 -@@ -93,7 +93,7 @@ if test -n "$__gnuc__"; then - cmd="$CC $CFLAGS $extraflag -fno-strict-aliasing -o $exe gnu.c" - . log_cmd - if test -s $exe; then -- OPTFLAGS="$OPTFLAGS -fno-strict-aliasing" -+ OPTFLAGS="@OPTFLAGS@ -fno-strict-aliasing" - fi - . cleanup_exe - case "$optimization" in -@@ -118,12 +118,6 @@ if test -n "$__gnuc__"; then - # omit-frame-pointer incompatible with -pg - PRFFLAGS="-pg $OPTFLAGS" - GCOVFLAGS="-fprofile-arcs -ftest-coverage" -- case "$optimization" in -- full) case "$osname" in -- mingw) ;; -- *) OPTFLAGS="$OPTFLAGS -fomit-frame-pointer";; -- esac;; -- esac - else - DBGFLAGS=${DBGFLAGS:-'-g'} - PRFFLAGS='-pg' diff --git a/pari-2.15.0-ploth-doc.patch b/pari-2.15.0-ploth-doc.patch new file mode 100644 index 0000000..dce122b --- /dev/null +++ b/pari-2.15.0-ploth-doc.patch @@ -0,0 +1,10 @@ +--- src/functions/graphic/ploth.orig 2022-09-16 11:16:27.000000000 -0600 ++++ src/functions/graphic/ploth 2022-09-19 20:37:40.628974671 -0600 +@@ -115,6 +115,6 @@ Doc: high precision plot of the function + @eprog\noindent will draw respectively a circle and a circle cut by the line + $y=x$. + +-\item $8192 = \kbd{no_MinMax}$: do not print the boundary numbers (in both directions). ++ \item $8192 = \kbd{no_MinMax}$: do not print the boundary numbers (in both directions). + + \synt{ploth}{void *E, GEN (*eval)(void*, GEN), GEN a, GEN b, long flag, long n, long prec}, diff --git a/pari.spec b/pari.spec index 47b964f..bd1cdab 100644 --- a/pari.spec +++ b/pari.spec @@ -1,8 +1,11 @@ Name: pari -Version: 2.13.4 -Release: 2%{?dist} +Version: 2.15.0 +Release: 1%{?dist} Summary: Number Theory-oriented Computer Algebra System -License: GPLv2+ + +%global majver %(cut -d. -f1-2 <<< %{version}) + +License: GPL-2.0-or-later URL: http://pari.math.u-bordeaux.fr/ Source0: http://pari.math.u-bordeaux.fr/pub/pari/unix/%{name}-%{version}.tar.gz Source1: http://pari.math.u-bordeaux.fr/pub/pari/unix/%{name}-%{version}.tar.gz.asc @@ -13,14 +16,15 @@ Source4: pari-gp.xpm Source5: pari.abignore # Use xdg-open rather than xdvi to display DVI files (#530565) Patch0: pari-2.13.0-xdgopen.patch -# Use our optflags, not upstream's -Patch1: pari-2.13.0-optflags.patch +# Fix misindented help text +Patch1: pari-2.15.0-ploth-doc.patch # Fix compiler warnings # http://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=1316 Patch10: pari-2.9.0-missing-field-init.patch Patch11: pari-2.13.0-declaration-not-prototype.patch Patch12: pari-2.13.0-clobbered.patch Patch13: pari-2.13.0-signed-unsigned-comparison.patch + BuildRequires: coreutils BuildRequires: desktop-file-utils BuildRequires: findutils @@ -33,6 +37,7 @@ BuildRequires: perl-generators BuildRequires: pkgconfig(readline) BuildRequires: sed BuildRequires: tex(latex) + # Test suite requirements BuildRequires: pari-elldata BuildRequires: pari-galdata @@ -86,10 +91,6 @@ cp -p %{SOURCE5} . sed -i "s|runpathprefix='.*'|runpathprefix=''|" config/get_ld %build -# Use our optflags, not upstream's. This cannot be done in %%prep. See -# https://bugzilla.redhat.com/show_bug.cgi?id=2044028 -sed -i -e 's|@OPTFLAGS@|%{build_cxxflags} -Wextra -Wstrict-prototypes -Wno-implicit-fallthrough %{build_ldflags}|' config/get_cc - # For as yet unknown reasons, 32-bit pari becomes extremely slow if built with # pthread support. Enable it for 64-bit only until we can diagnose the issue. ./Configure \ @@ -147,12 +148,12 @@ make test-all %doc AUTHORS CHANGES* COMPAT NEW README %doc pari.abignore %{_libdir}/libpari-gmp-tls.so.%{version} -%{_libdir}/libpari-gmp-tls.so.7 +%{_libdir}/libpari-gmp-tls.so.8 %{_libdir}/pari/ %files gp %{_bindir}/gp -%{_bindir}/gp-2.13 +%{_bindir}/gp-%{majver} %{_bindir}/gphelp %{_bindir}/tex2mail %config(noreplace) %{_sysconfdir}/gprc @@ -164,7 +165,7 @@ make test-all %{_datadir}/pari/pari.desc %{_datadir}/applications/gp.desktop %{_datadir}/pixmaps/pari-gp.xpm -%{_mandir}/man1/gp-2.13.1* +%{_mandir}/man1/gp-%{majver}.1* %{_mandir}/man1/gp.1* %{_mandir}/man1/gphelp.1* %{_mandir}/man1/pari.1* @@ -175,6 +176,11 @@ make test-all %{_libdir}/libpari.so %changelog +* Mon Sep 26 2022 Jerry James - 2.15.0-1 +- Version 2.15.0 +- Drop upstreamed optflags patch +- Convert License tag to SPDX + * Fri Jul 22 2022 Fedora Release Engineering - 2.13.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index cad6992..ab7df4b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pari-2.13.4.tar.gz) = 0eb8c0100d76fb8f29fd29e6a49e9534b9a4d90e1869820dbfddd57fe444f0e83909947331823157a67be31f71a5d26fa1224f72ce3f9e5197db0194c417b9b9 -SHA512 (pari-2.13.4.tar.gz.asc) = 17957aaf8be0c757c454e4034e308d306b112eccc5b8a84f5ffe94d3ef04bf3f7b8a6039b99f9729bc910218acf10b44e692c5aeb7c62db2db6468b442b2bdb3 +SHA512 (pari-2.15.0.tar.gz) = 6366734f7746a3982c464646e42b67382d5e5473709b192a359791621be14bb0e7521481a42c35f9a28ac6428485307472eb3fc8bd877bf3466f3610368a9f09 +SHA512 (pari-2.15.0.tar.gz.asc) = ced59ecd7aebffecd2c69bcfde0e0488d20be12d17abd049d817f8281857848ba753176aba16469a9052ed2a3b468718393e45a96caac3d820016e96e3034660