[packages/parigp] - fix build issues with perl 5.26
baggins
baggins at pld-linux.org
Sun Jul 2 15:15:37 CEST 2017
commit 71b8978e64d4d40c2f6d556a002dcfd4899ec5a2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jul 2 15:15:10 2017 +0200
- fix build issues with perl 5.26
Math-Pari-escape-left-braces-in-regex.patch | 22 ++++++++++++++++++++++
escape-left-braces-in-regex.patch | 11 +++++++++++
parigp.spec | 7 +++++++
perl-no-dot-in-inc.patch | 24 ++++++++++++++++++++++++
4 files changed, 64 insertions(+)
---
diff --git a/parigp.spec b/parigp.spec
index a12402b..bf2f1b4 100644
--- a/parigp.spec
+++ b/parigp.spec
@@ -30,6 +30,9 @@ Patch3: perl-Math-Pari-crash-workaround.patch
Patch4: perl-Math-Pari-update.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
@@ -181,6 +184,10 @@ Interfejs Perla do biblioteki PARI.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch8 -p1
+%patch9 -p1
+cd Math-Pari-%{math_pari_version}
+%patch7 -p0
%build
# pari & parigp
diff --git a/Math-Pari-escape-left-braces-in-regex.patch b/Math-Pari-escape-left-braces-in-regex.patch
new file mode 100644
index 0000000..8471f44
--- /dev/null
+++ b/Math-Pari-escape-left-braces-in-regex.patch
@@ -0,0 +1,22 @@
+--- 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/escape-left-braces-in-regex.patch b/escape-left-braces-in-regex.patch
new file mode 100644
index 0000000..24afc78
--- /dev/null
+++ b/escape-left-braces-in-regex.patch
@@ -0,0 +1,11 @@
+--- 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/perl-no-dot-in-inc.patch b/perl-no-dot-in-inc.patch
new file mode 100644
index 0000000..a3b8f77
--- /dev/null
+++ b/perl-no-dot-in-inc.patch
@@ -0,0 +1,24 @@
+--- 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/0ec0d8a5f3cc907618033b2370f4d8a6faf6bbe1
More information about the pld-cvs-commit
mailing list