[lcalc] 01/01: Fix FTBFS with gcc-4.9.

Tobias Hansen thansen at moszumanska.debian.org
Wed Jul 9 21:29:54 UTC 2014


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

thansen pushed a commit to annotated tag debian/1.23+dfsg-3
in repository lcalc.

commit 4a1d6e912f9d89ee0f9bd50f5c91a6fe288083ab
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Wed Jul 9 20:09:07 2014 +0200

    Fix FTBFS with gcc-4.9.
---
 debian/changelog                                   |  1 +
 .../patches/lcalc-1.23_default_parameters_1.patch  | 32 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6c8a9f0..4b41a93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 lcalc (1.23+dfsg-3) UNRELEASED; urgency=medium
 
+  * Fix FTBFS with gcc-4.9. (Closes: #746867)
   * With pari_2.7.patch the package build-depends now on pari >= 2.7
     instead of >= 2.5. (Closes: #746048)
 
diff --git a/debian/patches/lcalc-1.23_default_parameters_1.patch b/debian/patches/lcalc-1.23_default_parameters_1.patch
new file mode 100644
index 0000000..e50d16d
--- /dev/null
+++ b/debian/patches/lcalc-1.23_default_parameters_1.patch
@@ -0,0 +1,32 @@
+Description: Make Lcalc (1.23) build with GCC 4.9 (move default parameter from definition to declaration)
+ This patch just fixes the single instance GCC 4.9 currently complains
+ about. Clang is more picky, and will need further fixes (including
+ moving a few more invalid default parameters in function *definitions*
+ into *declarations* instead).
+Author: Leif Leonhardy <not.really at online.de>
+Origin: http://git.sagemath.org/sage.git/commit/build/pkgs/lcalc/patches/lcalc-1.23_default_parameters_1.patch?h=develop&id=4d49914efab5a0a91f03542fb5848af7d10a1e5e
+Bug: http://trac.sagemath.org/ticket/16208
+Bug-Debian: http://bugs.debian.org/746867
+
+--- a/include/Ldirichlet_series.h
++++ b/include/Ldirichlet_series.h
+@@ -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;
+--- a/include/L.h
++++ b/include/L.h
+@@ -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);
diff --git a/debian/patches/series b/debian/patches/series
index aa2e27a..498e451 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ gcc.patch
 pari_2.7.patch
 Makefile.patch
 fix_pari_include.patch
+lcalc-1.23_default_parameters_1.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