Update to sagemath 6.1.1

This commit is contained in:
pcpa 2014-02-08 15:23:21 -02:00
parent d0a2caf3af
commit 34b5d7d380
30 changed files with 570 additions and 1598 deletions

View file

@ -1,36 +1,21 @@
diff -up sage-5.13/spkg/build/sage-5.13/sage/interfaces/gp.py.orig sage-5.13/spkg/build/sage-5.13/sage/interfaces/gp.py
--- sage-5.13/spkg/build/sage-5.13/sage/interfaces/gp.py.orig 2014-01-28 16:06:59.279200475 -0200
+++ sage-5.13/spkg/build/sage-5.13/sage/interfaces/gp.py 2014-01-28 16:07:36.218201890 -0200
@@ -977,11 +977,11 @@ def is_GpElement(x):
"""
return isinstance(x, GpElement)
diff -up src/sage/libs/pari/pari_instance.pxd.orig src/sage/libs/pari/pari_instance.pxd
--- src/sage/libs/pari/pari_instance.pxd.orig 2014-02-07 11:58:23.031750944 -0200
+++ src/sage/libs/pari/pari_instance.pxd 2014-02-07 11:58:44.805751778 -0200
@@ -5,6 +5,10 @@ cimport cython
-from sage.env import DOT_SAGE, SAGE_LOCAL
+from sage.env import DOT_SAGE, SAGE_EXTCODE
import os
-# Set GPRC environment variable to $SAGE_LOCAL/etc/gprc.expect
-os.environ["GPRC"] = os.path.join(SAGE_LOCAL, 'etc', 'gprc.expect')
+# Set GPRC environment variable to $SAGE_EXTCODE/pari/gprc.expect
+os.environ["GPRC"] = '%s/pari/gprc.expect'%SAGE_EXTCODE
# An instance
gp = Gp(logfile=os.path.join(DOT_SAGE,'gp-expect.log')) # useful for debugging!
diff -up sage-5.13/spkg/build/sage-5.13/sage/libs/pari/gen.pyx.orig sage-5.13/spkg/build/sage-5.13/sage/libs/pari/gen.pyx
--- sage-5.13/spkg/build/sage-5.13/sage/libs/pari/gen.pyx.orig 2014-01-28 16:07:00.806200534 -0200
+++ sage-5.13/spkg/build/sage-5.13/sage/libs/pari/gen.pyx 2014-01-28 16:08:42.169204415 -0200
@@ -194,6 +194,10 @@ cdef extern from "misc.h":
cdef extern from "mpz_pylong.h":
cdef int mpz_set_pylong(mpz_t dst, src) except -1
from sage.libs.pari.gen cimport gen
+cdef extern from "gmp.h":
+ cdef void mp_get_memory_functions(void**, void**, void**)
+ cdef void mp_set_memory_functions(void*, void*, void*)
+
# Will be imported as needed
Integer = None
cpdef long prec_bits_to_words(unsigned long prec_in_bits)
@@ -9319,7 +9323,12 @@ cdef class PariInstance(sage.structure.p
@cython.final
diff -up src/sage/libs/pari/pari_instance.pyx.orig src/sage/libs/pari/pari_instance.pyx
--- src/sage/libs/pari/pari_instance.pyx.orig 2014-02-07 11:57:54.455749850 -0200
+++ src/sage/libs/pari/pari_instance.pyx 2014-02-07 11:59:13.119752862 -0200
@@ -434,7 +434,12 @@ cdef class PariInstance(sage.structure.p
# The size here doesn't really matter, because we will allocate
# our own stack anyway. We ask PARI not to set up signal and
# error handlers.