Update to sagemath 5.10.

This commit is contained in:
pcpa 2013-08-05 18:34:44 -03:00
parent 1d2f6c46fe
commit 4c97a63e19
36 changed files with 318 additions and 365 deletions

View file

@ -1,5 +1,6 @@
--- sage-5.9/spkg/build/sage-5.9/c_lib/include/ntl_wrap.h.orig 2010-06-28 10:37:05.000000000 -0600
+++ sage-5.9/spkg/build/sage-5.9/c_lib/include/ntl_wrap.h 2013-05-03 15:42:32.931073654 -0600
diff -up sage-5.10/spkg/build/sage-5.10/c_lib/include/ntl_wrap.h.orig sage-5.10/spkg/build/sage-5.10/c_lib/include/ntl_wrap.h
--- sage-5.10/spkg/build/sage-5.10/c_lib/include/ntl_wrap.h.orig 2013-07-29 19:40:07.189020485 -0300
+++ sage-5.10/spkg/build/sage-5.10/c_lib/include/ntl_wrap.h 2013-07-29 19:40:11.831020662 -0300
@@ -40,91 +40,92 @@ EXTERN void setup_NTL_error_callback(voi
//////// ZZ //////////
@ -450,8 +451,9 @@
-EXTERN void mat_GF2_setitem(struct mat_GF2* x, int i, int j, const struct GF2* z);
+EXTERN void mat_GF2_setitem(mat_GF2* x, int i, int j, const GF2* z);
--- sage-5.9/spkg/build/sage-5.9/c_lib/src/ntl_wrap.cpp.orig 2013-01-21 14:18:15.000000000 -0700
+++ sage-5.9/spkg/build/sage-5.9/c_lib/src/ntl_wrap.cpp 2013-05-03 16:05:09.640847922 -0600
diff -up sage-5.10/spkg/build/sage-5.10/c_lib/src/ntl_wrap.cpp.orig sage-5.10/spkg/build/sage-5.10/c_lib/src/ntl_wrap.cpp
--- sage-5.10/spkg/build/sage-5.10/c_lib/src/ntl_wrap.cpp.orig 2013-07-29 19:40:07.197020485 -0300
+++ sage-5.10/spkg/build/sage-5.10/c_lib/src/ntl_wrap.cpp 2013-07-29 19:40:11.834020662 -0300
@@ -29,7 +29,7 @@ int ZZ_to_int(const ZZ* x)
/* Returns a *new* ZZ object.
@ -1348,9 +1350,10 @@
{
//int j;
cpn.restore();
--- sage-5.9/spkg/build/sage-5.9/sage/libs/ntl/decl.pxi.orig 2010-06-28 10:37:01.000000000 -0600
+++ sage-5.9/spkg/build/sage-5.9/sage/libs/ntl/decl.pxi 2013-05-07 09:38:36.134950663 -0600
@@ -23,7 +23,7 @@ from sage.libs.ntl.ntl_ZZ_pEX_decl cimpo
diff -up sage-5.10/spkg/build/sage-5.10/sage/libs/ntl/decl.pxi.orig sage-5.10/spkg/build/sage-5.10/sage/libs/ntl/decl.pxi
--- sage-5.10/spkg/build/sage-5.10/sage/libs/ntl/decl.pxi.orig 2013-07-29 19:39:08.246018227 -0300
+++ sage-5.10/spkg/build/sage-5.10/sage/libs/ntl/decl.pxi 2013-07-29 19:40:11.836020662 -0300
@@ -22,7 +22,7 @@ from sage.libs.ntl.ntl_ZZ_pEX_decl cimpo
cdef extern from "ntl_wrap.h":
#### mat_ZZ_c
@ -1359,7 +1362,7 @@
pass
# Some boiler-plate
@@ -93,7 +93,7 @@ cdef extern from "ntl_wrap.h":
@@ -92,7 +92,7 @@ cdef extern from "ntl_wrap.h":
cdef long mat_ZZ_G_BKZ_RR_U "G_BKZ_RR"(mat_ZZ_c B, mat_ZZ_c U, double delta, long BlockSize, long prune, int check, long verbose)
#### GF2_c
@ -1368,7 +1371,7 @@
pass
GF2_c* GF2_new "New<GF2>"()
@@ -119,7 +119,7 @@ cdef extern from "ntl_wrap.h":
@@ -118,7 +118,7 @@ cdef extern from "ntl_wrap.h":
#### GF2X_c
@ -1377,7 +1380,7 @@
pass
long *GF2XHexOutput_c "(&GF2X::HexOutput)" # work-around for Cython bug
@@ -176,7 +176,7 @@ cdef extern from "ntl_wrap.h":
@@ -175,7 +175,7 @@ cdef extern from "ntl_wrap.h":
void GF2X_BuildIrred "BuildIrred" (GF2X_c f, long n)
#### GF2XModulus_c
@ -1386,7 +1389,7 @@
pass
GF2X_c GF2XModulus_GF2X "GF2X" (GF2XModulus_c m)
@@ -185,7 +185,7 @@ cdef extern from "ntl_wrap.h":
@@ -184,7 +184,7 @@ cdef extern from "ntl_wrap.h":
#### GF2EContext_c
@ -1395,7 +1398,7 @@
void (*restore)()
GF2EContext_c* GF2EContext_new "New<GF2EContext>"()
@@ -196,7 +196,7 @@ cdef extern from "ntl_wrap.h":
@@ -195,7 +195,7 @@ cdef extern from "ntl_wrap.h":
void GF2EContext_delete "Delete<GF2EContext>"(GF2EContext_c *mem)
#### GF2E_c
@ -1404,7 +1407,7 @@
pass
void GF2E_init "GF2E::init"(GF2X_c x)
@@ -231,7 +231,7 @@ cdef extern from "ntl_wrap.h":
@@ -230,7 +230,7 @@ cdef extern from "ntl_wrap.h":
GF2_c GF2E_trace "trace"(GF2E_c x)
#### GF2EX_c
@ -1413,7 +1416,7 @@
pass
GF2EX_c* GF2EX_new "New<GF2EX>"()
@@ -250,7 +250,7 @@ cdef extern from "ntl_wrap.h":
@@ -249,7 +249,7 @@ cdef extern from "ntl_wrap.h":
int GF2EX_IsZero "IsZero"(GF2EX_c x)
#### vec_GF2E_c
@ -1422,7 +1425,7 @@
pass
vec_GF2E_c* vec_GF2E_new "New<vec_GF2E>"()
@@ -261,7 +261,7 @@ cdef extern from "ntl_wrap.h":
@@ -260,7 +260,7 @@ cdef extern from "ntl_wrap.h":
object vec_GF2E_to_PyString "_to_PyString<vec_GF2E>"(vec_GF2E_c *x)
#### mat_GF2E_c
@ -1431,7 +1434,7 @@
void (*SetDims)(long nrows, long ncols)
long (*NumRows)()
long (*NumCols)()
@@ -300,7 +300,7 @@ cdef extern from "ntl_wrap.h":
@@ -299,7 +299,7 @@ cdef extern from "ntl_wrap.h":
void mat_GF2E_conv_vec_GF2E(mat_GF2E_c out, vec_GF2E_c inp)
#### vec_GF2_c
@ -1440,7 +1443,7 @@
pass
vec_GF2_c* vec_GF2_new "New<vec_GF2>"()
@@ -312,7 +312,7 @@ cdef extern from "ntl_wrap.h":
@@ -311,7 +311,7 @@ cdef extern from "ntl_wrap.h":
#### mat_GF2_c