[arch-commits] Commit in lcalc/repos (14 files)
Antonio Rojas
arojas at archlinux.org
Sat Jan 3 23:56:18 UTC 2015
Date: Sunday, January 4, 2015 @ 00:56:18
Author: arojas
Revision: 125267
archrelease: copy trunk to community-i686, community-x86_64
Added:
lcalc/repos/community-i686/Lcommon.h.patch
(from rev 125266, lcalc/trunk/Lcommon.h.patch)
lcalc/repos/community-i686/PKGBUILD
(from rev 125266, lcalc/trunk/PKGBUILD)
lcalc/repos/community-i686/gcc-4.9.patch
(from rev 125266, lcalc/trunk/gcc-4.9.patch)
lcalc/repos/community-i686/pari-2.7.patch
(from rev 125266, lcalc/trunk/pari-2.7.patch)
lcalc/repos/community-x86_64/Lcommon.h.patch
(from rev 125266, lcalc/trunk/Lcommon.h.patch)
lcalc/repos/community-x86_64/PKGBUILD
(from rev 125266, lcalc/trunk/PKGBUILD)
lcalc/repos/community-x86_64/gcc-4.9.patch
(from rev 125266, lcalc/trunk/gcc-4.9.patch)
lcalc/repos/community-x86_64/pari-2.7.patch
(from rev 125266, lcalc/trunk/pari-2.7.patch)
Deleted:
lcalc/repos/community-i686/Lcommon.h.patch
lcalc/repos/community-i686/PKGBUILD
lcalc/repos/community-i686/gcc-4.9.patch
lcalc/repos/community-x86_64/Lcommon.h.patch
lcalc/repos/community-x86_64/PKGBUILD
lcalc/repos/community-x86_64/gcc-4.9.patch
----------------------------------+
/Lcommon.h.patch | 22 ++++++++
/PKGBUILD | 92 +++++++++++++++++++++++++++++++++++++
/gcc-4.9.patch | 48 +++++++++++++++++++
community-i686/Lcommon.h.patch | 11 ----
community-i686/PKGBUILD | 40 ----------------
community-i686/gcc-4.9.patch | 24 ---------
community-i686/pari-2.7.patch | 45 ++++++++++++++++++
community-x86_64/Lcommon.h.patch | 11 ----
community-x86_64/PKGBUILD | 40 ----------------
community-x86_64/gcc-4.9.patch | 24 ---------
community-x86_64/pari-2.7.patch | 45 ++++++++++++++++++
11 files changed, 252 insertions(+), 150 deletions(-)
Deleted: community-i686/Lcommon.h.patch
===================================================================
--- community-i686/Lcommon.h.patch 2015-01-03 23:55:20 UTC (rev 125266)
+++ community-i686/Lcommon.h.patch 2015-01-03 23:56:18 UTC (rev 125267)
@@ -1,11 +0,0 @@
---- src/include/Lcommon.h 2010-01-31 15:16:45.000000000 +0000
-+++ src/include/Lcommon.h 2011-03-08 21:19:11.849443238 +0000
-@@ -25,7 +25,7 @@
- #ifdef USE_MPFR
- inline double lcalc_to_double(const double& x) { return x; }
- #endif
--//inline double lcalc_to_double(const long double& x) { return x; }
-+inline double lcalc_to_double(const long double& x) { return x; }
- inline double lcalc_to_double(const int& x) { return x; }
- inline double lcalc_to_double(const long long& x) { return x; }
- inline double lcalc_to_double(const short& x) { return x; }
Copied: lcalc/repos/community-i686/Lcommon.h.patch (from rev 125266, lcalc/trunk/Lcommon.h.patch)
===================================================================
--- community-i686/Lcommon.h.patch (rev 0)
+++ community-i686/Lcommon.h.patch 2015-01-03 23:56:18 UTC (rev 125267)
@@ -0,0 +1,11 @@
+--- src/include/Lcommon.h 2010-01-31 15:16:45.000000000 +0000
++++ src/include/Lcommon.h 2011-03-08 21:19:11.849443238 +0000
+@@ -25,7 +25,7 @@
+ #ifdef USE_MPFR
+ inline double lcalc_to_double(const double& x) { return x; }
+ #endif
+-//inline double lcalc_to_double(const long double& x) { return x; }
++inline double lcalc_to_double(const long double& x) { return x; }
+ inline double lcalc_to_double(const int& x) { return x; }
+ inline double lcalc_to_double(const long long& x) { return x; }
+ inline double lcalc_to_double(const short& x) { return x; }
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-01-03 23:55:20 UTC (rev 125266)
+++ community-i686/PKGBUILD 2015-01-03 23:56:18 UTC (rev 125267)
@@ -1,40 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=lcalc
-pkgver=1.23
-pkgrel=2
-pkgdesc="C++ L-function class library and command line interface"
-arch=('i686' 'x86_64')
-url="http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html"
-license=('GPL2')
-depends=('gcc-libs')
-makedepends=('chrpath')
-source=("http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-$pkgver.tar.gz" 'Lcommon.h.patch' 'gcc-4.9.patch')
-md5sums=('8262d4495e0bbe0283e5341ef8694c23'
- '717f630a387fb1a4569e843a421f30cc'
- '436dd35b06766dffad0941bcfb511e89')
-
-prepare() {
- cd L-$pkgver
- patch -p1 -i $srcdir/Lcommon.h.patch
- patch -p1 -i $srcdir/gcc-4.9.patch
-}
-
-build() {
- cd L-$pkgver/src
- make
-}
-
-package() {
- cd L-$pkgver/src
- mkdir -p "$pkgdir"/usr/{bin,include,lib}
- make INSTALL_DIR="$pkgdir"/usr install
-
-# remove leftover files
- rm "$pkgdir"/usr/include/Lfunction/{Lexplicit_formula.h.swap.crap,.Lexplicit_formula.h.swp}
-# fix wrong permissions
- chmod 644 "$pkgdir"/usr/include/Lfunction/Ldokchitser.h
-# fix insecure rpath
- chrpath -d "$pkgdir"/usr/bin/lcalc
-}
-
Copied: lcalc/repos/community-i686/PKGBUILD (from rev 125266, lcalc/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-01-03 23:56:18 UTC (rev 125267)
@@ -0,0 +1,46 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=lcalc
+pkgver=1.23
+pkgrel=3
+pkgdesc="C++ L-function class library and command line interface"
+arch=('i686' 'x86_64')
+url="http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html"
+license=('GPL2')
+depends=('pari')
+makedepends=('chrpath')
+source=("http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-$pkgver.tar.gz" 'Lcommon.h.patch' 'gcc-4.9.patch' 'pari-2.7.patch')
+md5sums=('8262d4495e0bbe0283e5341ef8694c23'
+ '717f630a387fb1a4569e843a421f30cc'
+ '436dd35b06766dffad0941bcfb511e89'
+ '5b1937955ca9ceb5d635e57af2364ed2')
+
+prepare() {
+ cd L-$pkgver
+ patch -p1 -i "$srcdir"/Lcommon.h.patch
+ patch -p1 -i "$srcdir"/gcc-4.9.patch
+# port to PARI 2.7 API
+ patch -p1 -i "$srcdir"/pari-2.7.patch
+# link to PARI
+ sed -e 's|#PARI_DEFINE = -DINCLUDE_PARI|PARI_DEFINE = -DINCLUDE_PARI|' -i src/Makefile
+ sed -e 's|#include "pari.h"|#include "pari/pari.h"|' -i include/Lcommandline.h -i include/Lcommandline_elliptic.h
+}
+
+build() {
+ cd L-$pkgver/src
+ make
+}
+
+package() {
+ cd L-$pkgver/src
+ mkdir -p "$pkgdir"/usr/{bin,include,lib}
+ make INSTALL_DIR="$pkgdir"/usr install
+
+# remove leftover files
+ rm "$pkgdir"/usr/include/Lfunction/{Lexplicit_formula.h.swap.crap,.Lexplicit_formula.h.swp}
+# fix wrong permissions
+ chmod 644 "$pkgdir"/usr/include/Lfunction/Ldokchitser.h
+# fix insecure rpath
+ chrpath -d "$pkgdir"/usr/bin/lcalc
+}
+
Deleted: community-i686/gcc-4.9.patch
===================================================================
--- community-i686/gcc-4.9.patch 2015-01-03 23:55:20 UTC (rev 125266)
+++ community-i686/gcc-4.9.patch 2015-01-03 23:56:18 UTC (rev 125267)
@@ -1,24 +0,0 @@
-diff -Naur lcalc-1.23-vanilla/include/Ldirichlet_series.h lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h
---- lcalc-1.23-vanilla/include/Ldirichlet_series.h 2012-08-08 23:21:55.000000000 +0200
-+++ lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h 2014-04-21 14:37:59.027464849 +0200
-@@ -43,7 +43,7 @@
- //XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- template <class ttype>
- Complex L_function <ttype>::
--dirichlet_series(Complex s, long long N=-1)
-+dirichlet_series(Complex s, long long N)
- {
- Complex z=0.;
- long long m,n;
-diff -Naur lcalc-1.23-vanilla/include/L.h lcalc-1.23-fixed-gcc.4.9/include/L.h
---- lcalc-1.23-vanilla/include/L.h 2012-08-08 23:21:55.000000000 +0200
-+++ lcalc-1.23-fixed-gcc.4.9/include/L.h 2014-04-21 14:32:04.003467348 +0200
-@@ -491,7 +491,7 @@
-
- //#include "Ldirichlet_series.h" //for computing Dirichlet series
- Complex partial_dirichlet_series(Complex s, long long N1, long long N2);
-- Complex dirichlet_series(Complex s, long long N);
-+ Complex dirichlet_series(Complex s, long long N=-1LL);
-
- //#include "Ltaylor_series.h" //for computing taylor series for Dirichlet series
- //void compute_taylor_series(int N, int K, Complex s_0, Complex *series);
Copied: lcalc/repos/community-i686/gcc-4.9.patch (from rev 125266, lcalc/trunk/gcc-4.9.patch)
===================================================================
--- community-i686/gcc-4.9.patch (rev 0)
+++ community-i686/gcc-4.9.patch 2015-01-03 23:56:18 UTC (rev 125267)
@@ -0,0 +1,24 @@
+diff -Naur lcalc-1.23-vanilla/include/Ldirichlet_series.h lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h
+--- lcalc-1.23-vanilla/include/Ldirichlet_series.h 2012-08-08 23:21:55.000000000 +0200
++++ lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h 2014-04-21 14:37:59.027464849 +0200
+@@ -43,7 +43,7 @@
+ //XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ template <class ttype>
+ Complex L_function <ttype>::
+-dirichlet_series(Complex s, long long N=-1)
++dirichlet_series(Complex s, long long N)
+ {
+ Complex z=0.;
+ long long m,n;
+diff -Naur lcalc-1.23-vanilla/include/L.h lcalc-1.23-fixed-gcc.4.9/include/L.h
+--- lcalc-1.23-vanilla/include/L.h 2012-08-08 23:21:55.000000000 +0200
++++ lcalc-1.23-fixed-gcc.4.9/include/L.h 2014-04-21 14:32:04.003467348 +0200
+@@ -491,7 +491,7 @@
+
+ //#include "Ldirichlet_series.h" //for computing Dirichlet series
+ Complex partial_dirichlet_series(Complex s, long long N1, long long N2);
+- Complex dirichlet_series(Complex s, long long N);
++ Complex dirichlet_series(Complex s, long long N=-1LL);
+
+ //#include "Ltaylor_series.h" //for computing taylor series for Dirichlet series
+ //void compute_taylor_series(int N, int K, Complex s_0, Complex *series);
Copied: lcalc/repos/community-i686/pari-2.7.patch (from rev 125266, lcalc/trunk/pari-2.7.patch)
===================================================================
--- community-i686/pari-2.7.patch (rev 0)
+++ community-i686/pari-2.7.patch 2015-01-03 23:56:18 UTC (rev 125267)
@@ -0,0 +1,45 @@
+Description: Port to pari 2.7 API
+Author: Luca Falavigna <dktrkranz at debian.org>
+ Tobias Hansen <thansen at debian.org>
+Bug-Debian: http://bugs.debian.org/635506
+ http://bugs.debian.org/743327
+
+--- a/src/Lcommandline.cc
++++ b/src/Lcommandline.cc
+@@ -473,7 +473,7 @@
+
+ #ifdef INCLUDE_PARI
+ if(do_elliptic_curve){
+- allocatemoremem((int) N_terms*16+1000000); //XXXXXXXXX this should depend on whether we're double or long double or mpfr double
++ allocatemem((int) N_terms*16+1000000); //XXXXXXXXX this should depend on whether we're double or long double or mpfr double
+ if (my_verbose>0) cout << "Will precompute " << N_terms << " elliptic L-function dirichlet coefficients..." << endl;
+ initialize_new_L(a1,a2,a3,a4,a6,N_terms);
+ }
+--- a/src/Lcommandline_elliptic.cc
++++ b/src/Lcommandline_elliptic.cc
+@@ -121,11 +121,11 @@
+
+
+ F = cgetg(6, t_VEC);
+- F[1] = lgeti(BIGDEFAULTPREC);
+- F[2] = lgeti(BIGDEFAULTPREC);
+- F[3] = lgeti(BIGDEFAULTPREC);
+- F[4] = lgeti(BIGDEFAULTPREC);
+- F[5] = lgeti(BIGDEFAULTPREC);
++ F[1] = (long)cgeti(BIGDEFAULTPREC);
++ F[2] = (long)cgeti(BIGDEFAULTPREC);
++ F[3] = (long)cgeti(BIGDEFAULTPREC);
++ F[4] = (long)cgeti(BIGDEFAULTPREC);
++ F[5] = (long)cgeti(BIGDEFAULTPREC);
+
+ //gaffsg(a1,(GEN) F[1]);
+ //gaffsg(a2,(GEN) F[2]);
+@@ -139,7 +139,7 @@
+ gaffect(strtoGEN(a4), (GEN) F[4]);
+ gaffect(strtoGEN(a6), (GEN) F[5]);
+
+- E = initell(F,BIGDEFAULTPREC);
++ E = ellinit(F, NULL, BIGDEFAULTPREC);
+
+ C=globalreduction(E);
+
Deleted: community-x86_64/Lcommon.h.patch
===================================================================
--- community-x86_64/Lcommon.h.patch 2015-01-03 23:55:20 UTC (rev 125266)
+++ community-x86_64/Lcommon.h.patch 2015-01-03 23:56:18 UTC (rev 125267)
@@ -1,11 +0,0 @@
---- src/include/Lcommon.h 2010-01-31 15:16:45.000000000 +0000
-+++ src/include/Lcommon.h 2011-03-08 21:19:11.849443238 +0000
-@@ -25,7 +25,7 @@
- #ifdef USE_MPFR
- inline double lcalc_to_double(const double& x) { return x; }
- #endif
--//inline double lcalc_to_double(const long double& x) { return x; }
-+inline double lcalc_to_double(const long double& x) { return x; }
- inline double lcalc_to_double(const int& x) { return x; }
- inline double lcalc_to_double(const long long& x) { return x; }
- inline double lcalc_to_double(const short& x) { return x; }
Copied: lcalc/repos/community-x86_64/Lcommon.h.patch (from rev 125266, lcalc/trunk/Lcommon.h.patch)
===================================================================
--- community-x86_64/Lcommon.h.patch (rev 0)
+++ community-x86_64/Lcommon.h.patch 2015-01-03 23:56:18 UTC (rev 125267)
@@ -0,0 +1,11 @@
+--- src/include/Lcommon.h 2010-01-31 15:16:45.000000000 +0000
++++ src/include/Lcommon.h 2011-03-08 21:19:11.849443238 +0000
+@@ -25,7 +25,7 @@
+ #ifdef USE_MPFR
+ inline double lcalc_to_double(const double& x) { return x; }
+ #endif
+-//inline double lcalc_to_double(const long double& x) { return x; }
++inline double lcalc_to_double(const long double& x) { return x; }
+ inline double lcalc_to_double(const int& x) { return x; }
+ inline double lcalc_to_double(const long long& x) { return x; }
+ inline double lcalc_to_double(const short& x) { return x; }
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-01-03 23:55:20 UTC (rev 125266)
+++ community-x86_64/PKGBUILD 2015-01-03 23:56:18 UTC (rev 125267)
@@ -1,40 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=lcalc
-pkgver=1.23
-pkgrel=2
-pkgdesc="C++ L-function class library and command line interface"
-arch=('i686' 'x86_64')
-url="http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html"
-license=('GPL2')
-depends=('gcc-libs')
-makedepends=('chrpath')
-source=("http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-$pkgver.tar.gz" 'Lcommon.h.patch' 'gcc-4.9.patch')
-md5sums=('8262d4495e0bbe0283e5341ef8694c23'
- '717f630a387fb1a4569e843a421f30cc'
- '436dd35b06766dffad0941bcfb511e89')
-
-prepare() {
- cd L-$pkgver
- patch -p1 -i $srcdir/Lcommon.h.patch
- patch -p1 -i $srcdir/gcc-4.9.patch
-}
-
-build() {
- cd L-$pkgver/src
- make
-}
-
-package() {
- cd L-$pkgver/src
- mkdir -p "$pkgdir"/usr/{bin,include,lib}
- make INSTALL_DIR="$pkgdir"/usr install
-
-# remove leftover files
- rm "$pkgdir"/usr/include/Lfunction/{Lexplicit_formula.h.swap.crap,.Lexplicit_formula.h.swp}
-# fix wrong permissions
- chmod 644 "$pkgdir"/usr/include/Lfunction/Ldokchitser.h
-# fix insecure rpath
- chrpath -d "$pkgdir"/usr/bin/lcalc
-}
-
Copied: lcalc/repos/community-x86_64/PKGBUILD (from rev 125266, lcalc/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-01-03 23:56:18 UTC (rev 125267)
@@ -0,0 +1,46 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=lcalc
+pkgver=1.23
+pkgrel=3
+pkgdesc="C++ L-function class library and command line interface"
+arch=('i686' 'x86_64')
+url="http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html"
+license=('GPL2')
+depends=('pari')
+makedepends=('chrpath')
+source=("http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-$pkgver.tar.gz" 'Lcommon.h.patch' 'gcc-4.9.patch' 'pari-2.7.patch')
+md5sums=('8262d4495e0bbe0283e5341ef8694c23'
+ '717f630a387fb1a4569e843a421f30cc'
+ '436dd35b06766dffad0941bcfb511e89'
+ '5b1937955ca9ceb5d635e57af2364ed2')
+
+prepare() {
+ cd L-$pkgver
+ patch -p1 -i "$srcdir"/Lcommon.h.patch
+ patch -p1 -i "$srcdir"/gcc-4.9.patch
+# port to PARI 2.7 API
+ patch -p1 -i "$srcdir"/pari-2.7.patch
+# link to PARI
+ sed -e 's|#PARI_DEFINE = -DINCLUDE_PARI|PARI_DEFINE = -DINCLUDE_PARI|' -i src/Makefile
+ sed -e 's|#include "pari.h"|#include "pari/pari.h"|' -i include/Lcommandline.h -i include/Lcommandline_elliptic.h
+}
+
+build() {
+ cd L-$pkgver/src
+ make
+}
+
+package() {
+ cd L-$pkgver/src
+ mkdir -p "$pkgdir"/usr/{bin,include,lib}
+ make INSTALL_DIR="$pkgdir"/usr install
+
+# remove leftover files
+ rm "$pkgdir"/usr/include/Lfunction/{Lexplicit_formula.h.swap.crap,.Lexplicit_formula.h.swp}
+# fix wrong permissions
+ chmod 644 "$pkgdir"/usr/include/Lfunction/Ldokchitser.h
+# fix insecure rpath
+ chrpath -d "$pkgdir"/usr/bin/lcalc
+}
+
Deleted: community-x86_64/gcc-4.9.patch
===================================================================
--- community-x86_64/gcc-4.9.patch 2015-01-03 23:55:20 UTC (rev 125266)
+++ community-x86_64/gcc-4.9.patch 2015-01-03 23:56:18 UTC (rev 125267)
@@ -1,24 +0,0 @@
-diff -Naur lcalc-1.23-vanilla/include/Ldirichlet_series.h lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h
---- lcalc-1.23-vanilla/include/Ldirichlet_series.h 2012-08-08 23:21:55.000000000 +0200
-+++ lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h 2014-04-21 14:37:59.027464849 +0200
-@@ -43,7 +43,7 @@
- //XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- template <class ttype>
- Complex L_function <ttype>::
--dirichlet_series(Complex s, long long N=-1)
-+dirichlet_series(Complex s, long long N)
- {
- Complex z=0.;
- long long m,n;
-diff -Naur lcalc-1.23-vanilla/include/L.h lcalc-1.23-fixed-gcc.4.9/include/L.h
---- lcalc-1.23-vanilla/include/L.h 2012-08-08 23:21:55.000000000 +0200
-+++ lcalc-1.23-fixed-gcc.4.9/include/L.h 2014-04-21 14:32:04.003467348 +0200
-@@ -491,7 +491,7 @@
-
- //#include "Ldirichlet_series.h" //for computing Dirichlet series
- Complex partial_dirichlet_series(Complex s, long long N1, long long N2);
-- Complex dirichlet_series(Complex s, long long N);
-+ Complex dirichlet_series(Complex s, long long N=-1LL);
-
- //#include "Ltaylor_series.h" //for computing taylor series for Dirichlet series
- //void compute_taylor_series(int N, int K, Complex s_0, Complex *series);
Copied: lcalc/repos/community-x86_64/gcc-4.9.patch (from rev 125266, lcalc/trunk/gcc-4.9.patch)
===================================================================
--- community-x86_64/gcc-4.9.patch (rev 0)
+++ community-x86_64/gcc-4.9.patch 2015-01-03 23:56:18 UTC (rev 125267)
@@ -0,0 +1,24 @@
+diff -Naur lcalc-1.23-vanilla/include/Ldirichlet_series.h lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h
+--- lcalc-1.23-vanilla/include/Ldirichlet_series.h 2012-08-08 23:21:55.000000000 +0200
++++ lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h 2014-04-21 14:37:59.027464849 +0200
+@@ -43,7 +43,7 @@
+ //XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ template <class ttype>
+ Complex L_function <ttype>::
+-dirichlet_series(Complex s, long long N=-1)
++dirichlet_series(Complex s, long long N)
+ {
+ Complex z=0.;
+ long long m,n;
+diff -Naur lcalc-1.23-vanilla/include/L.h lcalc-1.23-fixed-gcc.4.9/include/L.h
+--- lcalc-1.23-vanilla/include/L.h 2012-08-08 23:21:55.000000000 +0200
++++ lcalc-1.23-fixed-gcc.4.9/include/L.h 2014-04-21 14:32:04.003467348 +0200
+@@ -491,7 +491,7 @@
+
+ //#include "Ldirichlet_series.h" //for computing Dirichlet series
+ Complex partial_dirichlet_series(Complex s, long long N1, long long N2);
+- Complex dirichlet_series(Complex s, long long N);
++ Complex dirichlet_series(Complex s, long long N=-1LL);
+
+ //#include "Ltaylor_series.h" //for computing taylor series for Dirichlet series
+ //void compute_taylor_series(int N, int K, Complex s_0, Complex *series);
Copied: lcalc/repos/community-x86_64/pari-2.7.patch (from rev 125266, lcalc/trunk/pari-2.7.patch)
===================================================================
--- community-x86_64/pari-2.7.patch (rev 0)
+++ community-x86_64/pari-2.7.patch 2015-01-03 23:56:18 UTC (rev 125267)
@@ -0,0 +1,45 @@
+Description: Port to pari 2.7 API
+Author: Luca Falavigna <dktrkranz at debian.org>
+ Tobias Hansen <thansen at debian.org>
+Bug-Debian: http://bugs.debian.org/635506
+ http://bugs.debian.org/743327
+
+--- a/src/Lcommandline.cc
++++ b/src/Lcommandline.cc
+@@ -473,7 +473,7 @@
+
+ #ifdef INCLUDE_PARI
+ if(do_elliptic_curve){
+- allocatemoremem((int) N_terms*16+1000000); //XXXXXXXXX this should depend on whether we're double or long double or mpfr double
++ allocatemem((int) N_terms*16+1000000); //XXXXXXXXX this should depend on whether we're double or long double or mpfr double
+ if (my_verbose>0) cout << "Will precompute " << N_terms << " elliptic L-function dirichlet coefficients..." << endl;
+ initialize_new_L(a1,a2,a3,a4,a6,N_terms);
+ }
+--- a/src/Lcommandline_elliptic.cc
++++ b/src/Lcommandline_elliptic.cc
+@@ -121,11 +121,11 @@
+
+
+ F = cgetg(6, t_VEC);
+- F[1] = lgeti(BIGDEFAULTPREC);
+- F[2] = lgeti(BIGDEFAULTPREC);
+- F[3] = lgeti(BIGDEFAULTPREC);
+- F[4] = lgeti(BIGDEFAULTPREC);
+- F[5] = lgeti(BIGDEFAULTPREC);
++ F[1] = (long)cgeti(BIGDEFAULTPREC);
++ F[2] = (long)cgeti(BIGDEFAULTPREC);
++ F[3] = (long)cgeti(BIGDEFAULTPREC);
++ F[4] = (long)cgeti(BIGDEFAULTPREC);
++ F[5] = (long)cgeti(BIGDEFAULTPREC);
+
+ //gaffsg(a1,(GEN) F[1]);
+ //gaffsg(a2,(GEN) F[2]);
+@@ -139,7 +139,7 @@
+ gaffect(strtoGEN(a4), (GEN) F[4]);
+ gaffect(strtoGEN(a6), (GEN) F[5]);
+
+- E = initell(F,BIGDEFAULTPREC);
++ E = ellinit(F, NULL, BIGDEFAULTPREC);
+
+ C=globalreduction(E);
+
More information about the arch-commits
mailing list