- fix building with gsl 2.x

- rel 4

diff --git a/asymptote.spec b/asymptote.spec
index b5dde4d5914de694f44aa2ea7f25c258a5f1a725..97fb4a882034837f3d0a3d4fa179223aa67f7a56 100644 (file)
--- a/asymptote.spec
+++ b/asymptote.spec
@@ -3,12 +3,13 @@ Summary(hu.UTF-8):    Asymptote egy leíró vektorgrafikus nyelv technikai rajzokho
 Summary(pl.UTF-8):     Język opisu grafiki wektorowej do rysunków technicznych
 Name:          asymptote
 Version:       2.35
-Release:       3
+Release:       4
 License:       GPL v3
 Group:         Applications/Science
 Source0:       http://downloads.sourceforge.net/asymptote/%{name}-%{version}.src.tgz
 # Source0-md5: 199e971792072527bd0cb1583d8ef3fb
 Patch0:                %{name}-memrchr.patch
+Patch1:                gsl2.patch
 URL:           http://asymptote.sourceforge.net/
 #BuildRequires:        Mesa-libglapi-devel
 BuildRequires: autoconf
@@ -144,6 +145,7 @@ Vim syntax fájl asy fájlokhoz.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__autoheader}

diff --git a/gsl2.patch b/gsl2.patch
new file mode 100644 (file)
index 0000000..4e7ca46
--- /dev/null
+++ b/gsl2.patch
@@ -0,0 +1,27 @@
+Patch from upstream John Bowman to support gsl 2.0
+---
+ gsl.cc |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- asymptote.orig/gsl.cc
++++ asymptote/gsl.cc
+@@ -27,6 +27,7 @@
+ #include <gsl/gsl_rng.h>
+ #include <gsl/gsl_randist.h>
+ #include <gsl/gsl_cdf.h>
++#include <gsl/gsl_version.h>
+ 
+ #include "opsymbols.h"
+ 
+@@ -1088,7 +1089,11 @@
+   addGSLDOUBLE2Func<gsl_sf_ellint_F>(SYM(F));
+   addGSLDOUBLE2Func<gsl_sf_ellint_E>(SYM(E));
+   addGSLDOUBLE3Func<gsl_sf_ellint_P>(SYM(P),SYM(phi),SYM(k),SYM(n));
++#if GSL_MAJOR_VERSION >= 2
++  addGSLDOUBLE2Func<gsl_sf_ellint_D>(SYM(D),SYM(phi),SYM(k));
++#else
+   addGSLDOUBLE3Func<gsl_sf_ellint_D>(SYM(D),SYM(phi),SYM(k),SYM(n));
++#endif 
+   addGSLDOUBLE2Func<gsl_sf_ellint_RC>(SYM(RC),SYM(x),SYM(y));
+   addGSLDOUBLE3Func<gsl_sf_ellint_RD>(SYM(RD),SYM(x),SYM(y),SYM(z));
+   addGSLDOUBLE3Func<gsl_sf_ellint_RF>(SYM(RF),SYM(x),SYM(y),SYM(z));