From c084ec6a84a6622b78da9e75d0cbb93fea1d3154 Mon Sep 17 00:00:00 2001 From: pcpa Date: Jul 10 2012 21:10:50 +0000 Subject: Update to latest upstream release. This version is required by sagemath 5.2 beta. --- diff --git a/.gitignore b/.gitignore index ac6f0a0..9b1f38c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /eclib-20100711.spkg +/eclib-20120428.spkg diff --git a/eclib-warning.patch b/eclib-warning.patch deleted file mode 100644 index 4d0b1d4..0000000 --- a/eclib-warning.patch +++ /dev/null @@ -1,238 +0,0 @@ ---- ./src/g0n/pcprocs.cc.orig 2010-01-25 05:14:19.000000000 -0700 -+++ ./src/g0n/pcprocs.cc 2011-05-23 13:22:51.860355287 -0600 -@@ -34,7 +34,7 @@ - - void ratapprox(bigfloat x, long& a, long& b) - { -- long c, x0, x1, x2, y0, y1, y2; -+ long c, x0, x1, x2 = 0L, y0, y1, y2 = 0L; - bigfloat xx, diff; - bigfloat eps = to_bigfloat(1.0e-6); - xx = x; x0 = 0; x1 = 1; y0 = 1; y1 = 0; ---- ./src/g0n/nfcount.cc.orig 2010-01-25 05:14:19.000000000 -0700 -+++ ./src/g0n/nfcount.cc 2011-05-23 13:22:51.861355399 -0600 -@@ -33,7 +33,7 @@ - else - nf_file = string(nf_dir); - char* filename=new char[20]; -- sprintf(filename,"%s/%c%d",nf_file.c_str(),c,n); -+ sprintf(filename,"%s/%c%ld",nf_file.c_str(),c,n); - return filename; - } - ---- ./src/g0n/periods.cc.orig 2010-01-25 05:14:19.000000000 -0700 -+++ ./src/g0n/periods.cc 2011-05-23 13:29:36.321459927 -0600 -@@ -742,7 +742,6 @@ - // Cannot just use trans_to_curve() as we need to fixc6... - // which DOES use n and i - { -- long n = modulus; // NOT redundant, used in fixc6 - long fac = sqfac; - long fac6=(odd(fac)?fac:2*fac); - // if(fac>1) cout<<"factor = "<1) cout << "Computing W multiplicities." << "\n"; - long m = n/d; -- long k=0, xmult, mult, j, beta, q; -+ long k=0, xmult, mult, j, beta; - vector betalist; // =new long[N->npdivs]; - vector::const_iterator qj=(N->plist).begin(); - while(qj!=(N->plist).end()) ---- ./src/g0n/newforms.cc.orig 2010-07-11 13:57:06.000000000 -0600 -+++ ./src/g0n/newforms.cc 2011-05-23 13:28:20.993049229 -0600 -@@ -165,7 +165,7 @@ - // Hecke eigenvalues - - newform::newform(const vec& vplus, const vec& vminus, const vector& ap, newforms* nfs,long ind) -- :nf(nfs), sign(nfs->sign), bplus(vplus),bminus(vminus),aplist(ap),index(ind) -+ :nf(nfs), sign(nfs->sign), bplus(vplus),bminus(vminus),index(ind),aplist(ap) - { - int verbose=(nf->verbose); - if(verbose) -@@ -193,7 +193,7 @@ - aqlist.resize(nf->npdivs); - vector::iterator api=aplist.begin(), pi=nf->plist.begin(); - vector::iterator aqi=aqlist.begin(); -- primevar pr; long q, i, j; -+ primevar pr; long q, i; - while((api!=aplist.end())&&(aqi!=aqlist.end())) - { - q=pr.value(); pr++; -@@ -287,10 +287,8 @@ - coordsminus[i]=dotmodp(nf->h1->coord_vecs[i],bminus,92681); - } - long denomplus, denomminus; -- if(sign!=+1) -- denomminus=vecgcd(coordsminus); -- if(sign!=-1) -- denomplus=vecgcd(coordsplus); -+ denomminus=(sign==+1) ? 0L : vecgcd(coordsminus); -+ denomplus =(sign==-1) ? 0L : vecgcd(coordsplus); - if(verbose) - { - if(sign!=-1) -@@ -445,7 +443,7 @@ - - void newform::add_more_ap(int nap) - { -- if(aplist.size()>=nap) return; -+ if (nap < 0 || aplist.size() >= (size_t)nap) return; - int verbose=(nf->verbose); - long piv, p, ap; - // Do not make the espace right away, as it is possible that the -@@ -454,7 +452,7 @@ - int have_espace=0; - - primevar pr(nap,aplist.size()+1); -- while(aplist.size()modulus)) -@@ -677,7 +675,7 @@ - - void newforms::display_modular_symbol_map(void) const - { -- long i,j,k,m; -+ long i,j,k; - rational rplus, rminus; - for(i=0; insymb; i++) - { -@@ -760,7 +758,8 @@ - - void newforms::output_to_file(int binflag) const - { -- long i,j; -+ long i; -+ size_t j; - char* name; - if(binflag) - name = nf_filename(modulus,'x'); -@@ -889,7 +888,6 @@ - } - delete[] name; - -- short temp_short; - int temp_int; - datafile.read((char*)&temp_int,sizeof(int)); // = number of newforms - n1ds=temp_int; -@@ -1000,9 +998,8 @@ - // j1ds counts through the newforms as they are found - basisflag=0; j1ds=0; - vector< vector > eigs(ncurves); -- int i,j; - -- for(i=0; i * aq = new vector[n1ds]; - for(i=0; i > eigs(n1ds); -- int i,j; -+ int i; - - for(i=0; i1) -@@ -1226,7 +1224,7 @@ - vec bas, imagej; - long fac; - long p2=(p-1)>>1; // (p-1)/2 -- long sl, sg, x1, x2, x3, y1, y2, y3, a, b, c, q, r; -+ long sg, a, b, c, q, r; - long u1,u2,u3; - long ind; - -@@ -1370,7 +1368,7 @@ - else - nf_file = string(nf_dir); - char* filename=new char[20]; -- sprintf(filename,"%s/%c%d",nf_file.c_str(),c,n); -+ sprintf(filename,"%s/%c%ld",nf_file.c_str(),c,n); - return filename; - } - ---- ./src/qcurves/egr.cc.orig 2010-01-25 05:14:19.000000000 -0700 -+++ ./src/qcurves/egr.cc 2011-05-23 13:22:51.866355953 -0600 -@@ -212,11 +212,12 @@ - bigint d2 = b2+12*x0; - bigint d; sqrt_mod_p_power(d,d2,p,N2); - bigint alpha1 = (d-a1); -- if(odd(alpha1)) -+ if(odd(alpha1)) { - if(p==2) - cout<<"Problem in ComponentGroups::ImageInComponentGroup_Im(): " - <<"quadratic has no roots\n"; - else alpha1+=pN; // saves inverting 2 mod pN -+ } - alpha1/=2; - bigint alpha2 = (-a1-alpha1); - #ifdef DEBUG_EGR_EXTRA ---- ./src/qrank/descent.cc.orig 2010-02-04 03:37:25.000000000 -0700 -+++ ./src/qrank/descent.cc 2011-05-23 13:22:51.867356064 -0600 -@@ -115,7 +115,7 @@ - } - else - { -- if(verbose) -+ if(verbose) { - if(two_torsion_exists) - { - cout << "\nUsed descent via 2-isogeny with isogenous curve E' = "<<(Curve)(getEprime())< - 20120428-1 +- Update to latest upstream release. +- Rework package build that now uses autotools instead of hand made Makefiles. + * Wed Jul 5 2012 pcpa - 20100711-5 - Install mwrank binary as it is required by sagemath. - Install mwrank documentation. diff --git a/sources b/sources index a28dfcc..e9b647b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b507a78d2c469cf532e705d1d9470dec eclib-20100711.spkg +6c162c0a3cd6664855f69db19818a265 eclib-20120428.spkg