[pari-sage] 02/03: Update patches, remove old ones, and add new ones from Sage 7.1
Ximin Luo
infinity0 at debian.org
Tue Jul 5 23:17:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository pari-sage.
commit 91ede8b8224f9776c9bee2b7cc6a21ecf63f6c47
Author: Ximin Luo <infinity0 at debian.org>
Date: Wed Jul 6 01:06:38 2016 +0200
Update patches, remove old ones, and add new ones from Sage 7.1
---
debian/patches/enable_build_envvar | 8 +-
debian/patches/gphelp-avoid-deprecation-spam.patch | 88 ----------------------
debian/patches/public_memory_functions.patch | 57 --------------
debian/patches/series | 3 +-
debian/patches/stackwarn.patch | 49 ++++++++++++
5 files changed, 53 insertions(+), 152 deletions(-)
diff --git a/debian/patches/enable_build_envvar b/debian/patches/enable_build_envvar
index 5c2fb39..026d6f5 100644
--- a/debian/patches/enable_build_envvar
+++ b/debian/patches/enable_build_envvar
@@ -4,11 +4,9 @@ Description: Change Configure to honor CFLAGS.
Author: Bill Allombert <ballombe at debian.org>
Last-Update: 2011-06-21
-Index: pari-2.7.0/config/get_cc
-===================================================================
---- pari-2.7.0.orig/config/get_cc 2014-03-20 09:59:28.000000000 +0100
-+++ pari-2.7.0/config/get_cc 2014-03-26 23:43:58.561525695 +0100
-@@ -147,7 +147,9 @@
+--- a/config/get_cc
++++ b/config/get_cc
+@@ -148,7 +148,9 @@
gcov) suffix=.gcov; cflags="$GCOVFLAGS $cflags";;
esac
diff --git a/debian/patches/gphelp-avoid-deprecation-spam.patch b/debian/patches/gphelp-avoid-deprecation-spam.patch
deleted file mode 100644
index 6e3998b..0000000
--- a/debian/patches/gphelp-avoid-deprecation-spam.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- a/doc/gphelp.in
-+++ b/doc/gphelp.in
-@@ -380,7 +380,7 @@
- return if ($line !~ /$help/i);
-
- local($_) = $current;
-- s/\\b{(.)}/\\$1/;
-+ s/\\b\{(.)}/\\$1/;
- s/\{\}//g;
- s/\\pow/^/;
- s/\\%/%/;
-@@ -748,7 +748,7 @@
- s/\\fun\s*\{([^{}]*)\}\s*\{((?:[^{}]|\{[^{}]*\})*)\}\s*\{((?:[^{}]|\{[^{}]*\})*)\}/\\kbd{$1 \\key{$2}($3)}\\sidx{$2}/g;
-
- s/\\\\(?=[a-zA-Z])/\\bs /g;
-- s/\\b{}\\b{}/\\bs\\bs /g;
-+ s/\\b\{}\\b\{}/\\bs\\bs /g;
- s/\\\\/\\bs/g;
- s/(\'\'|\`\`)/"/g unless $to_pod; # (english) double quotes
- # asymptotic or isomorphic (~) [beware of ties]
-@@ -760,16 +760,16 @@
- s/\\(~|tilde)/~/g;
-
- s/\\(equiv)(?![a-zA-Z])/ = /g;
-- s/\\`a/$tr{agrave}/; s/\\`{a}/$tr{agrave}/;
-- s/\\"o/$tr{ouml}/; s/\\"{o}/$tr{ouml}/;
-- s/\\"u/$tr{uuml}/; s/\\"{u}/$tr{uuml}/;
-- s/\\'e/$tr{eacute}/; s/\\'{e}/$tr{eacute}/;
-+ s/\\`a/$tr{agrave}/; s/\\`\{a}/$tr{agrave}/;
-+ s/\\"o/$tr{ouml}/; s/\\"\{o}/$tr{ouml}/;
-+ s/\\"u/$tr{uuml}/; s/\\"\{u}/$tr{uuml}/;
-+ s/\\'e/$tr{eacute}/; s/\\'\{e}/$tr{eacute}/;
-
- s/(^|[^\\])%.*/$1/g; # comments
- s/\\vadjust\s*\{\s*\\penalty\s*\d+\s*\}//g;
-
- # We do not strip %\n, thus:
-- s/\\kbd{\n\s*/\\kbd{/g;
-+ s/\\kbd\{\n\s*/\\kbd{/g;
- s/\$\\bf(\b|(?=[\d_]))\s*([^\$]+)\$/\$$tr{startbcode}$1$tr{endbcode}\$/g;
- s/\$/$tr{dollar}/g; # math mode
- s/\t/ /g; s/\\,//g; s/\\[ ;]/ /g; # various spaces
-@@ -779,7 +779,7 @@
- s/\\TeX\{\}/TeX/g;
- s/\\TeX(\W)/TeX$1/g;
- s/ *\\circ\b */ o /g;
-- s/\\d?frac{\s*((?:[^{}]|\{[^{}]*\})*)}{\s*((?:[^{}]|\{[^{}]*\})*)}/($1)\/($2)/g;
-+ s/\\d?frac\{\s*((?:[^{}]|\{[^{}]*\})*)}\{\s*((?:[^{}]|\{[^{}]*\})*)}/($1)\/($2)/g;
- s(\\d?frac\s*(\d)\s*(\d))(($1/$2))g;
- s[{\s*(\w)\s*\\over(?![a-zA-Z])\s*(\w)\s*}]{($1/$2)}g;
- s[{\s*((?:[^{}]|\{[^{}]*\})*)\\over(?![a-zA-Z])\s*((?:[^{}]|\{[^{}]*\})*)}][($1)/($2)]g;
-@@ -896,21 +896,21 @@
- s/\\(floor|ceil|round|binom)\{/$1\{/g;
- s/\\(var|emph)\{([^\}]*)\}/$tr{startit}$2$tr{endit}/g;
- s/\\fl(?![a-zA-Z])/$tr{startit}flag$tr{endit}/g;
-- s/\\b{([^}]*)}/$tr{startcode}\\$1$tr{endcode}/g;
-+ s/\\b\{([^}]*)}/$tr{startcode}\\$1$tr{endcode}/g;
- s/\\kbdsidx/\\sidx/g;
- s/\\sidx\{[^\}]*\}//g unless $to_pod;
- s/\\[a-zA-Z]*idx\{([^\}]*)\}/$1/g unless $to_pod;
-- s/{\\text{(st|nd|th)}}/\\text{$1}/g;
-- s/\^\\text{th}/-th/g;
-- s/1\^\\text{st}/1st/g;
-- s/2\^\\text{nd}/2nd/g;
-+ s/{\\text\{(st|nd|th)}}/\\text{$1}/g;
-+ s/\^\\text\{th}/-th/g;
-+ s/1\^\\text\{st}/1st/g;
-+ s/2\^\\text\{nd}/2nd/g;
-
- s/\\(text|hbox|Big)//g;
- s/^([ \t]+)\{ *\\(it|sl|bf|tt)\b/S<$1>{\\$2/gm;
- s/\{ *\\(it|sl) *(([^{}]+(?=[{}])|\{[^{}]*\})*)\}/$tr{startit}$2$tr{endit}/g;
- s/\{ *\\bf *(([^{}]+(?=[{}])|\{[^{}]*\})*)\}/$tr{startbold}$1$tr{endbold}/g;
- s/\{ *\\tt *(([^{}]+(?=[{}])|\{[^{}]*\})*)\}/$tr{startpodcode}$1$tr{endpodcode}/g;
-- $seek=1 if (s/\\emph{ */$tr{startit}/g);
-+ $seek=1 if (s/\\emph\{ */$tr{startit}/g);
- if ($seek) { $seek=0 if (s/\}/$tr{endit}/) }
- s/\\(backslash|bs)\{(\w)\}/\\$2/g;
- s/\\(backslash|bs)(?![a-zA-Z]) */\\/g;
-@@ -1105,7 +1105,7 @@
- # s/\\(?:key|li)\s*{(.*)}\s*{}[ \t]*\n/\n\n=back\n\n$1\n\n=over\n\n/mgs;
- # s/\\(key|var)(?![a-zA-Z])\s*{(\w+)}/C<$2>/mg;
- s/\\var\s*{X<(\w+)>(\w+)}/X<$1>$tr{startcode}$2$tr{endcode}/mg;
-- s/\\var\s*{f{}lag}/$tr{startcode}flag$tr{endcode}/mg;
-+ s/\\var\s*{f\{}lag}/$tr{startcode}flag$tr{endcode}/mg;
-
- s/\\metax(?![a-zA-Z])\s*{(.*)}\s*{\s*(\w+)(?=C\<)(.*)}[ \t]*\n/\n\n=item C<L<$2>$3>\n\n$1\n\n/mg;
- s/\\metax(?![a-zA-Z])\s*{(.*)}\s*{(.*)}[ \t]*\n/\n\n=item C<$2>\n\n$1\n\n/mg;
diff --git a/debian/patches/public_memory_functions.patch b/debian/patches/public_memory_functions.patch
deleted file mode 100644
index 85a792c..0000000
--- a/debian/patches/public_memory_functions.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/headers/paridecl.h
-+++ b/src/headers/paridecl.h
-@@ -3112,6 +3112,9 @@
- void pari_thread_valloc(struct pari_thread *t, size_t s, size_t v, GEN arg);
- GEN pari_version(void);
- void pari_warn(int numerr, ...);
-+void * pari_mainstack_malloc(size_t size);
-+void pari_mainstack_mfree(void *s, size_t size);
-+void pari_mainstack_free(struct pari_mainstack *st);
- void paristack_alloc(size_t rsize, size_t vsize);
- void paristack_newrsize(ulong newsize);
- void paristack_resize(ulong newsize);
---- a/src/language/init.c
-+++ b/src/language/init.c
-@@ -608,7 +608,7 @@
- #ifndef MAP_NORESERVE
- #define MAP_NORESERVE 0
- #endif
--static void *
-+void *
- pari_mainstack_malloc(size_t size)
- {
- void *b = mmap(NULL, size, PROT_READ|PROT_WRITE,
-@@ -616,7 +616,7 @@
- return (b == MAP_FAILED) ? NULL: b;
- }
-
--static void
-+void
- pari_mainstack_mfree(void *s, size_t size)
- {
- munmap(s, size);
-@@ -630,13 +630,13 @@
-
- #else
- #define PARI_STACK_ALIGN (0x40UL)
--static void *
-+void *
- pari_mainstack_malloc(size_t s)
- {
- return malloc(s); /* NOT pari_malloc, e_MEM would be deadly */
- }
-
--static void
-+void
- pari_mainstack_mfree(void *s, size_t size) { (void) size; free(s); }
-
- static void
-@@ -674,7 +674,7 @@
- st->memused = 0;
- }
-
--static void
-+void
- pari_mainstack_free(struct pari_mainstack *st)
- {
- pari_mainstack_mfree((void*)st->vbot, st->vsize ? st->vsize : fix_size(st->rsize));
diff --git a/debian/patches/series b/debian/patches/series
index 8b36ae0..7ed031b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
enable_build_envvar
-public_memory_functions.patch
perl-warning-non-fatal
-gphelp-avoid-deprecation-spam.patch
+stackwarn.patch
diff --git a/debian/patches/stackwarn.patch b/debian/patches/stackwarn.patch
new file mode 100644
index 0000000..a051c24
--- /dev/null
+++ b/debian/patches/stackwarn.patch
@@ -0,0 +1,49 @@
+commit 7cf2260b69d3711f9292a3abab4d3a35d0c74059
+Author: Jeroen Demeyer <jdemeyer at cage.ugent.be>
+Date: Thu Jan 14 10:13:39 2016 +0100
+
+ Use DEBUGMEM for stack size warnings
+
+--- a/src/language/init.c
++++ b/src/language/init.c
+@@ -741,7 +741,8 @@
+ evalstate_reset();
+ paristack_setsize(pari_mainstack->rsize, newsize);
+ s = pari_mainstack->vsize ? pari_mainstack->vsize : pari_mainstack->rsize;
+- pari_warn(warner,"new maximum stack size = %lu (%.3f Mbytes)", s, s/1048576.);
++ if (DEBUGMEM > 0)
++ pari_warn(warner,"new maximum stack size = %lu (%.3f Mbytes)", s, s/1048576.);
+ pari_init_errcatch();
+ cb_pari_err_recover(-1);
+ }
+@@ -755,7 +756,8 @@
+ pari_mainstack_resize(pari_mainstack, newsize, vsize);
+ evalstate_reset();
+ s = pari_mainstack->rsize;
+- pari_warn(warner,"new stack size = %lu (%.3f Mbytes)", s, s/1048576.);
++ if (DEBUGMEM > 0)
++ pari_warn(warner,"new stack size = %lu (%.3f Mbytes)", s, s/1048576.);
+ pari_init_errcatch();
+ cb_pari_err_recover(-1);
+ }
+@@ -769,7 +771,8 @@
+ newsize = maxuu(minuu(newsize, vsize), pari_mainstack->size);
+ pari_mainstack->size = newsize;
+ pari_mainstack->bot = pari_mainstack->top - pari_mainstack->size;
+- pari_warn(warner,"increasing stack size to %lu",newsize);
++ if (DEBUGMEM > 0)
++ pari_warn(warner,"increasing stack size to %lu",newsize);
+ }
+
+ void
+--- a/src/test/dotest
++++ b/src/test/dotest
+@@ -86,7 +86,7 @@
+ for suf in $SUF; do
+ file_diff=$testname-$suf.dif
+ gp=$execdir/gp-$suf
+- (echo 'gettime();0;'; cat $file_in; \
++ (echo 'gettime();default(debugmem,1);'; cat $file_in; \
+ echo 'print("Total time spent: ",gettime);') \
+ | $RUNTEST $gp -q --test > $file_test 2>&1
+ if test -n "$crlf"; then
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pari-sage.git
More information about the debian-science-commits
mailing list