Merge branch 'DEVEL-2.13'

diff --git a/Math-Pari-escape-left-braces-in-regex.patch b/Math-Pari-escape-left-braces-in-regex.patch
deleted file mode 100644 (file)
index 8471f44..0000000
--- a/Math-Pari-escape-left-braces-in-regex.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libPARI/gphelp
-+++ libPARI/gphelp
-@@ -328,7 +328,7 @@ sub apropos
-   @sentence_list = @list = "";
-   while (<DOC>)
-   {
--    if (/^\\(subsubsec[a-z]*|subsec[a-z]*|section|chapter){/)
-+    if (/^\\(subsubsec[a-z]*|subsec[a-z]*|section|chapter)\{/)
-     {
-       $new = &get_match($_,'{','}');
-       &apropos_check();
-@@ -1025,8 +1025,8 @@ sub TeXprint_topod {
-   s/\$\$(.*?)\$\$\s*/\n\nS<  >$tr{startcode}$1$tr{endcode}\n\n/gs;
-   s/\$([^\$]+)\$/$tr{startcode}$1$tr{endcode}/g;
- 
--  s/\\s(?:ref|idx){\s*([^{}]*)}/$tr{startindex} . for_index($1) . $tr{endindex}/ge;
--  s/\\(?:ref|idx){\s*([^{}]*)}/$tr{startindex} . for_index($1) . "$tr{endindex}$1"/ge;
-+  s/\\s(?:ref|idx)\{\s*([^{}]*)}/$tr{startindex} . for_index($1) . $tr{endindex}/ge;
-+  s/\\(?:ref|idx)\{\s*([^{}]*)}/$tr{startindex} . for_index($1) . "$tr{endindex}$1"/ge;
- 
- # Conflict between different versions of PARI and refcard:
- # s/\\(?:key|li)\s*{(.*)}\s*{(.+)}[ \t]*\n/\n\n=item C<$2>\n\n$1\n\n/msg;

diff --git a/gmp-version.patch b/gmp-version.patch
index 445c3457ce02c342c0bf9f4ed174e2313cf02d06..db94943e26489397b27c590bc8d95a3cb9058abe 100644 (file)
--- a/gmp-version.patch
+++ b/gmp-version.patch
@@ -1,5 +1,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
+--- pari-2.13.1/config/gmp_version.c.orig      2021-06-24 16:59:33.222993655 +0200
++++ pari-2.13.1/config/gmp_version.c   2021-06-24 17:08:35.866720568 +0200
 @@ -3,9 +3,5 @@
  void f(void) { mpn_gcdext(NULL,NULL, NULL, NULL, 0, NULL, 0); }
  int main()

diff --git a/parigp.spec b/parigp.spec
index 608b8bdfa79bb8b13fc822dfab416ec39185338b..dea03bd269ae30a94b7eb8cfc3fe682a9b36ce8a 100644 (file)
--- a/parigp.spec
+++ b/parigp.spec
@@ -2,29 +2,26 @@
 # Conditional build:
 %bcond_without tex     # TeX documentation
 #
-# latest perl Math::Pari (2.030518) doesn't know of pari >= 2.12
-# see DEVEL-2.13 branch for 2.13.x packaging try
-%define                pari_version            2.11.4
-%define                gp2c_version            0.0.12
+%define                pari_version            2.13.4
+%define                gp2c_version            0.0.12pl1
 # 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
+%define                math_pari_version       2.03052300
+%define                math_pari_fversion      2.030523
 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:       20
+Release:       1
 License:       GPL v2+
 Group:         Applications/Math
-#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
+Source0:       http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-%{pari_version}.tar.gz
+# Source0-md5: b624752c00b4b87b940fd98c910d8c09
 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_fversion}.zip
-# Source3-md5: f0d1d9f803c92abff0d6349869a82699
+# Source2-md5: 07e5959df2a08e519532a03ff5b8111f
+Source3:       http://www.cpan.org/modules/by-module/Math/Math-Pari-%{math_pari_fversion}.tar.gz
+# Source3-md5: e5489cb047989bf6ef3f1fdc590ca736
 Source4:       %{name}.desktop
 Source5:       %{name}.png
 Patch0:                %{name}-target_arch.patch
@@ -33,7 +30,6 @@ Patch3:               perl-Math-Pari-crash-workaround.patch
 Patch4:                perl-Math-Pari-noproccpuinfo.patch
 Patch5:                %{name}-noproccpuinfo.patch
 Patch6:                gmp-version.patch
-Patch7:                Math-Pari-escape-left-braces-in-regex.patch
 URL:           http://pari.math.u-bordeaux.fr/
 BuildRequires: autoconf
 BuildRequires: ctags
@@ -180,7 +176,7 @@ 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
+patch -p1 < Math-Pari-%{math_pari_fversion}/patches/diff-2.13.3-all
 %patch0 -p1
 %patch2 -p1
 %patch5 -p1
@@ -188,7 +184,6 @@ patch -p1 < Math-Pari-%{math_pari_fversion}/patches/diff-2.11.0-all
 cd Math-Pari-%{math_pari_fversion}
 %patch3 -p1
 %patch4 -p1
-%patch7 -p0
 
 %build
 # pari & parigp
@@ -230,7 +225,7 @@ ln -sf .. pari
        --datadir=%{_datadir}/parigp
 
 %{__make}
-%{?with_tex:%{__make} -j1 -C doc docall}
+%{?with_tex:%{__make} -j1 -C doc}
 
 cd ..
 
@@ -296,7 +291,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %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-2.13
 %attr(755,root,root) %{_bindir}/gp
 %attr(755,root,root) %{_bindir}/gphelp
 %attr(755,root,root) %{_bindir}/tex2mail
@@ -315,7 +310,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n pari
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpari-gmp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpari-gmp.so.6
+%attr(755,root,root) %ghost %{_libdir}/libpari-gmp.so.7
 %{_libdir}/parigp
 
 %files -n pari-devel

diff --git a/perl-Math-Pari-crash-workaround.patch b/perl-Math-Pari-crash-workaround.patch
index e0d507a2277a82cfc2877e23ec25f5c958055f8d..0918030545783a052acc03cb52ed4e0d3c66daa4 100644 (file)
--- a/perl-Math-Pari-crash-workaround.patch
+++ b/perl-Math-Pari-crash-workaround.patch
@@ -8,9 +8,9 @@ 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!).
 
---- Math-Pari-2.030518/Pari.xs.orig    2019-04-20 05:02:34.000000000 +0200
-+++ Math-Pari-2.030518/Pari.xs 2021-06-26 09:51:04.478020090 +0200
-@@ -1377,6 +1377,13 @@ moveoffstack_newer_than(SV* sv)
+--- Math-Pari-2.030523/Pari.xs.orig    2022-04-12 11:03:02.000000000 +0200
++++ Math-Pari-2.030523/Pari.xs 2022-05-30 21:20:23.166166331 +0200
+@@ -1437,6 +1437,13 @@ moveoffstack_newer_than(SV* sv)
    SV* nextsv;
    long ret=0;
    
@@ -20,11 +20,11 @@ object (which may be destroyed later!).
 +    if((char*)nextsv == GENfirstOnStack)
 +      return -1; /* not on stack! */
 +  }
-+  
++
    for (sv1 = PariStack; sv1 != sv; sv1 = nextsv) {
      ret++;
-     SV_OAVMA_switch(nextsv, sv1, GENmovedOffStack); /* Mark as moved off stack. */
-@@ -4285,7 +4292,7 @@ DESTROY(rv)
+     SV_OAVMA_switch(nextsv, sv1, GENmovedOffStack);   /* Mark as moved off stack. */
+@@ -4570,7 +4577,7 @@ DESTROY(rv)
         long oldavma;                   /* The value of avma on the entry
                                          * to function having the SV as
                                          * argument. */
@@ -33,7 +33,7 @@ object (which may be destroyed later!).
         SV_OAVMA_PARISTACK_get(sv, oldavma, ostack);
         oldavma += myPARI_bot;
  #if 1
-@@ -4318,6 +4325,7 @@ DESTROY(rv)
+@@ -4603,6 +4610,7 @@ DESTROY(rv)
             /* Now fall through: */
  /* case (IV)GENfirstOnStack: */
             /* Now sv is the newest one on stack. */
@@ -41,7 +41,7 @@ object (which may be destroyed later!).
             onStack_dec;
             perlavma = oldavma;
             if (oldavma > sentinel) {
-@@ -4326,7 +4334,9 @@ DESTROY(rv)
+@@ -4611,7 +4619,9 @@ DESTROY(rv)
                 avma = oldavma;        /* Mark the space on stack as free. */
             }
             PariStack = (SV*)ostack; /* The same on the Perl/PARI side. */