[lcalc] 01/01: Add patch to fix build with gcc-5.

Tobias Hansen thansen at moszumanska.debian.org
Mon May 18 21:44:50 UTC 2015


This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository lcalc.

commit 34f2c98890c32391d31f6c48c70fcf513532b559
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Mon May 18 23:34:04 2015 +0200

    Add patch to fix build with gcc-5.
---
 debian/changelog                                   |  7 +++
 .../patches/lcalc-1.23_default_parameters_2.patch  | 66 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 74 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 43a3605..f8f08dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lcalc (1.23+dfsg-5) unstable; urgency=medium
+
+  * Add patch lcalc-1.23_default_parameters_2.patch from Sage to
+    fix FTBFS with gcc-5 (Closes: #777932).
+
+ -- Tobias Hansen <thansen at debian.org>  Mon, 18 May 2015 22:58:04 +0200
+
 lcalc (1.23+dfsg-4) unstable; urgency=medium
 
   * Added a patch to allocate a bigger PARI stack. (Closes: #776802)
diff --git a/debian/patches/lcalc-1.23_default_parameters_2.patch b/debian/patches/lcalc-1.23_default_parameters_2.patch
new file mode 100644
index 0000000..375f6ae
--- /dev/null
+++ b/debian/patches/lcalc-1.23_default_parameters_2.patch
@@ -0,0 +1,66 @@
+Description: Make Lcalc (1.23) build with GCC 5 (remove default parameters from definitions)
+ GCC 5.1 (i.e., g++) again got stricter with respect to C++ conformance,
+ and hence another piece of the changes necessary to let Lcalc build with
+ Clang (cf. Sage trac #12437) is needed for g++ as well, namely forbidden
+ default parameters in function definitions ("Part II").
+Author: Leif Leonhardy <not.really at online.de>
+Origin: http://git.sagemath.org/sage.git/tree/build/pkgs/lcalc/patches/lcalc-1.23_default_parameters_2.patch
+Bug: http://trac.sagemath.org/ticket/18316
+Bug-Debian: http://bugs.debian.org/777932
+
+--- a/include/Lgamma.h
++++ b/include/Lgamma.h
+@@ -77,7 +77,7 @@
+ //n=0 should just give log_GAMMA(z)... thus making log_GAMMA
+ //code obsolete. But leave log_GAMMA intact anyways.
+ template <class ttype>
+-precise(ttype) log_GAMMA (ttype z,int n=0)
++precise(ttype) log_GAMMA (ttype z,int n)
+ {
+     int M;
+     precise(ttype) log_G,r,r2,y;
+@@ -230,7 +230,7 @@
+ //value exp_w which holds exp(-w)
+ //computes G(z,w), so there's an extra w^(-z) factor.
+ template <class ttype>
+-Complex inc_GAMMA (ttype z,ttype w, const char *method="temme", ttype exp_w = 0, bool recycle=false)
++Complex inc_GAMMA (ttype z,ttype w, const char *method, ttype exp_w, bool recycle)
+ {
+ 
+     Complex G;
+@@ -334,7 +334,7 @@
+ 
+ 
+ template <class ttype>
+-ttype cfrac_GAMMA (ttype z,ttype w, ttype exp_w=0, bool recycle=false)  //computes G(z,w) via continued fraction
++ttype cfrac_GAMMA (ttype z,ttype w, ttype exp_w, bool recycle)  //computes G(z,w) via continued fraction
+ {
+ 
+         ttype G;
+@@ -424,7 +424,7 @@
+ }
+ 
+ template <class ttype>
+-ttype asympt_GAMMA (ttype z,ttype w, ttype exp_w = 0, bool recycle=false)  //computes G(z,w) via asymptotic series
++ttype asympt_GAMMA (ttype z,ttype w, ttype exp_w, bool recycle)  //computes G(z,w) via asymptotic series
+ {
+ 
+         if(my_verbose>3) cout << "called asympt_GAMMA("<<z<<","<<w<<")"<< endl;
+@@ -446,7 +446,7 @@
+ 
+ 
+ template <class ttype>
+-ttype comp_inc_GAMMA (ttype z,ttype w,ttype exp_w = 0, bool recycle=false)  //computes g(z,w)
++ttype comp_inc_GAMMA (ttype z,ttype w,ttype exp_w, bool recycle)  //computes g(z,w)
+ {
+ 
+     ttype g;
+@@ -604,7 +604,7 @@
+ }
+ 
+ template <class ttype>
+-Complex gamma_sum(Complex s, int what_type, ttype *coeff, int N, Double g, Complex l, Double Q, Long Period, Complex delta=1, const char *method="temme")
++Complex gamma_sum(Complex s, int what_type, ttype *coeff, int N, Double g, Complex l, Double Q, Long Period, Complex delta, const char *method)
+ {
+     Complex SUM=0;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 19b8faf..d1e6c09 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ Makefile.patch
 fix_pari_include.patch
 lcalc-1.23_default_parameters_1.patch
 init_stack.patch
+lcalc-1.23_default_parameters_2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/lcalc.git



More information about the debian-science-commits mailing list