[arch-commits] Commit in lcalc/trunk (PKGBUILD gcc-5.patch)

[Antonio Rojas]

    Date: Monday, May 18, 2015 @ 11:48:34
  Author: arojas
Revision: 133707

Rebuild against new pari-sage snapshot, fix build with GCC 5

Added:
  lcalc/trunk/gcc-5.patch
Modified:
  lcalc/trunk/PKGBUILD

-------------+
 PKGBUILD    |    9 ++++++---
 gcc-5.patch |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-18 09:42:11 UTC (rev 133706)
+++ PKGBUILD	2015-05-18 09:48:34 UTC (rev 133707)
@@ -3,7 +3,7 @@
 
 pkgname=lcalc
 pkgver=1.23
-pkgrel=6
+pkgrel=7
 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"
@@ -10,16 +10,19 @@
 license=('GPL2')
 depends=('pari-sage')
 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')
+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' 'gcc-5.patch')
 md5sums=('8262d4495e0bbe0283e5341ef8694c23'
          '8af1dd6d3118bb785f193283a31305a2'
          '436dd35b06766dffad0941bcfb511e89'
-         '187024b6d6f259209645af68ca8787f2')
+         '187024b6d6f259209645af68ca8787f2'
+         '88d8a28a75e0bc143d0898f2797d1c54')
 
 prepare() {
   cd L-$pkgver
   patch -p1 -i "$srcdir"/Lcommon.h.patch  
   patch -p1 -i "$srcdir"/gcc-4.9.patch
+  patch -p1 -i "$srcdir"/gcc-5.patch
 # port to PARI 2.7 API
   patch -p1 -i "$srcdir"/pari-2.7.patch
 }

Added: gcc-5.patch
===================================================================
--- gcc-5.patch	                        (rev 0)
+++ gcc-5.patch	2015-05-18 09:48:34 UTC (rev 133707)
@@ -0,0 +1,56 @@
+--- lcalc-1.23/include/Lgamma.h	2012-08-08 23:21:55.000000000 +0200
++++ lcalc-1.23/include/Lgamma.h	2014-05-18 21:15:27.786889718 +0200
+@@ -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;
+