mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 11:45:56 -04:00
Version 9.7
Drop upstreamed patches: -infinite-recursion, -use-after-free, -sphinx
This commit is contained in:
Jerry James
parent
fed038c815
commit
bf7a318833
17 changed files with 532 additions and 1033 deletions
|
|
@ -1,15 +1,15 @@
|
|||
diff -up src/bin/sage.orig src/bin/sage
|
||||
--- src/bin/sage.orig 2022-05-15 16:11:11.000000000 -0600
|
||||
+++ src/bin/sage 2022-06-01 10:49:26.133371574 -0600
|
||||
@@ -109,7 +109,6 @@ usage() {
|
||||
--- src/bin/sage.orig 2022-09-19 16:38:18.000000000 -0600
|
||||
+++ src/bin/sage 2023-01-15 17:02:57.680034236 -0700
|
||||
@@ -131,7 +131,6 @@ usage() {
|
||||
echo " --gap [...] -- run Sage's Gap with given arguments"
|
||||
command -v gp &>/dev/null && \
|
||||
echo " --gp [...] -- run Sage's PARI/GP calculator with given arguments"
|
||||
echo " -h -- print this help message"
|
||||
- echo " --pip [...] -- invoke pip, the Python package manager"
|
||||
command -v maxima &>/dev/null && \
|
||||
echo " --maxima [...] -- run Sage's Maxima with given arguments"
|
||||
echo " --mwrank [...] -- run Sage's mwrank with given arguments"
|
||||
echo " --notebook=[...] -- start the Sage notebook (valid options are"
|
||||
@@ -160,60 +159,6 @@ if [ -f "${SELF}-env-config" ]; then
|
||||
command -v mwrank &>/dev/null && \
|
||||
@@ -178,60 +177,6 @@ if [ -f "${SELF}-env-config" ]; then
|
||||
fi
|
||||
|
||||
#####################################################################
|
||||
|
|
@ -61,7 +61,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
- exec "$SAGE_ROOT/build/bin/sage-site" "$@"
|
||||
- # fallthrough if there is no sage-site script
|
||||
- fi
|
||||
- echo "Error: unknown option: $1"
|
||||
- echo >&2 "Error: unknown option: $1"
|
||||
- exit 1
|
||||
- ;;
|
||||
-esac
|
||||
|
|
@ -70,7 +70,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
# Report information about the Sage environment
|
||||
#####################################################################
|
||||
|
||||
@@ -264,18 +209,6 @@ fi
|
||||
@@ -282,18 +227,6 @@ fi
|
||||
|
||||
# Prepare for running Sage, either interactively or non-interactively.
|
||||
sage_setup() {
|
||||
|
|
@ -89,16 +89,16 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ ! -d "$IPYTHONDIR" ]; then
|
||||
# make sure that $DOT_SAGE exists so that ipython will happily
|
||||
# create its config directories there. If DOT_SAGE doesn't
|
||||
@@ -323,8 +256,6 @@ usage_advanced() {
|
||||
echo " --nodotsage -- run Sage without using the user's"
|
||||
echo " .sage directory: create and use a temporary"
|
||||
echo " .sage directory instead."
|
||||
- echo " --gthread, --qthread, --q4thread, --wthread, --pylab"
|
||||
- echo " -- pass the option through to IPython"
|
||||
echo " --simple-prompt -- pass the option through to IPython: use"
|
||||
echo " this option with sage-shell mode in emacs"
|
||||
if [ -n "$SAGE_SRC" -a -d "$SAGE_SRC" ]; then
|
||||
@@ -358,18 +289,9 @@ usage_advanced() {
|
||||
@@ -338,8 +271,6 @@ usage_advanced() {
|
||||
echo " --nodotsage -- run Sage without using the user's"
|
||||
echo " .sage directory: create and use a temporary"
|
||||
echo " .sage directory instead."
|
||||
- echo " --gthread, --qthread, --q4thread, --wthread, --pylab"
|
||||
- echo " -- pass the option through to IPython"
|
||||
echo " --simple-prompt -- pass the option through to IPython: use"
|
||||
echo " this option with sage-shell mode in emacs"
|
||||
echo " --gdb -- run Sage under the control of gdb"
|
||||
@@ -369,18 +300,9 @@ usage_advanced() {
|
||||
echo " environment (not Sage), passing additional"
|
||||
echo " additional options to IPython"
|
||||
echo " --jupyter [...] -- run Sage's Jupyter with given arguments"
|
||||
|
|
@ -117,7 +117,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
echo " --python [...], --python3 [...]"
|
||||
echo " -- run the Python 3 interpreter"
|
||||
echo " -R [...] -- run Sage's R with the given arguments"
|
||||
@@ -620,11 +542,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
|
||||
@@ -656,11 +578,6 @@ if [ "$1" = '-lisp' -o "$1" = '--lisp' ]
|
||||
exec ecl "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -129,7 +129,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-maxima' -o "$1" = '--maxima' ]; then
|
||||
shift
|
||||
maxima_cmd=$(sage-config MAXIMA 2>/dev/null)
|
||||
@@ -649,11 +566,6 @@ if [ "$1" = '-R' -o "$1" = '--R' ]; then
|
||||
@@ -685,11 +602,6 @@ if [ "$1" = '-R' -o "$1" = '--R' ]; then
|
||||
exec R "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -141,7 +141,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
#####################################################################
|
||||
# sage --sh and sage --buildsh
|
||||
#####################################################################
|
||||
@@ -820,10 +732,6 @@ fi
|
||||
@@ -856,10 +768,6 @@ fi
|
||||
# build_sage, sage -b, sage -br, etc. could be moved to
|
||||
# build/bin/sage-site. See #29111.
|
||||
|
||||
|
|
@ -152,7 +152,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [[ "$1" =~ ^--notebook=.* || "$1" =~ ^-n=.* || "$1" =~ ^-notebook=.* ]] ; then
|
||||
sage-cleaner &>/dev/null &
|
||||
exec sage-notebook "$@"
|
||||
@@ -834,13 +742,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
|
||||
@@ -870,13 +778,6 @@ if [ "$1" = "-notebook" -o "$1" = '--not
|
||||
exec sage-notebook "$@"
|
||||
fi
|
||||
|
||||
|
|
@ -166,7 +166,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ -n "$SAGE_SRC" -a -d "$SAGE_SRC" ]; then
|
||||
# Source inspection facilities, supported on sage-the-distribution and on distributions
|
||||
# that package the Sage sources.
|
||||
@@ -857,46 +758,18 @@ if [ -n "$SAGE_SRC" -a -d "$SAGE_SRC" ];
|
||||
@@ -893,46 +794,18 @@ if [ -n "$SAGE_SRC" -a -d "$SAGE_SRC" ];
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -214,7 +214,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-tp' -o "$1" = '-btp' ]; then
|
||||
shift
|
||||
exec-runtests -p "$@"
|
||||
@@ -906,34 +779,11 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
|
||||
@@ -942,34 +815,11 @@ if [ "$1" = '-t' -o "$1" = '-bt' -o "$1"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -249,7 +249,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
if [ "$1" = '-startuptime' -o "$1" = '--startuptime' ]; then
|
||||
exec sage-startuptime.py "$@"
|
||||
fi
|
||||
@@ -989,11 +839,6 @@ if [ "$1" = '-installed' -o "$1" = "--in
|
||||
@@ -1056,11 +906,6 @@ if [ "$1" = '-installed' -o "$1" = "--in
|
||||
exec sage-list-packages all --installed-only $@
|
||||
fi
|
||||
|
||||
|
|
@ -261,7 +261,7 @@ diff -up src/bin/sage.orig src/bin/sage
|
|||
#####################################################################
|
||||
# Debugging tools
|
||||
#####################################################################
|
||||
@@ -1037,12 +882,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
|
||||
@@ -1110,12 +955,6 @@ if [ "$1" = '-callgrind' -o "$1" = "--ca
|
||||
exec sage-callgrind "$@"
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue