Control: tags 824264 + pending Dear maintainer,
I've prepared an NMU for wxwidgets3.0 (versioned as 3.0.2+dfsg-1.4) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. diff -Nru wxwidgets3.0-3.0.2+dfsg/debian/changelog wxwidgets3.0-3.0.2+dfsg/debian/changelog --- wxwidgets3.0-3.0.2+dfsg/debian/changelog 2016-02-21 11:26:54.000000000 +0100 +++ wxwidgets3.0-3.0.2+dfsg/debian/changelog 2016-05-14 15:00:30.000000000 +0200 @@ -1,3 +1,11 @@ +wxwidgets3.0 (3.0.2+dfsg-1.4) unstable; urgency=medium + + * Non-maintainer upload. + * Define wxIsNaN() as std::isnan() in C++11 mode. This fixes the build + failure of Audacity (Closes: #824264, LP: #1581807) + + -- Benjamin Drung <bdr...@debian.org> Sat, 14 May 2016 14:41:06 +0200 + wxwidgets3.0 (3.0.2+dfsg-1.3) unstable; urgency=medium * Non-maintainer upload. diff -Nru wxwidgets3.0-3.0.2+dfsg/debian/patches/Define-wxIsNaN-as-std-isnan-in-C-11-mode.patch wxwidgets3.0-3.0.2+dfsg/debian/patches/Define-wxIsNaN-as-std-isnan-in-C-11-mode.patch --- wxwidgets3.0-3.0.2+dfsg/debian/patches/Define-wxIsNaN-as-std-isnan-in-C-11-mode.patch 1970-01-01 01:00:00.000000000 +0100 +++ wxwidgets3.0-3.0.2+dfsg/debian/patches/Define-wxIsNaN-as-std-isnan-in-C-11-mode.patch 2016-05-14 14:40:18.000000000 +0200 @@ -0,0 +1,48 @@ +From bc41cbeb253eac2ba21f6245e869250971b91898 Mon Sep 17 00:00:00 2001 +From: Benjamin Drung <bdr...@debian.org> +Date: Fri, 13 May 2016 23:18:41 +0200 +Subject: [PATCH] Define wxIsNaN() as std::isnan() in C++11 mode + +std::isnan() is always available when using C++11, so just use it. + +Also pout the test for C++11 implementations of both wxIsNaN() and wxFinite() +first, eventually the rest of the checks will become obsolete and will be +removed. + +Closes https://github.com/wxWidgets/wxWidgets/pull/283 +--- + include/wx/math.h | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +--- a/include/wx/math.h ++++ b/include/wx/math.h +@@ -53,11 +53,18 @@ + + #ifdef __cplusplus + +-/* Any C++11 compiler should provide isfinite() */ ++/* ++ Things are simple with C++11: we have everything we need in std. ++ Eventually we will only have this section and not the legacy stuff below. ++ */ + #if __cplusplus >= 201103 + #include <cmath> ++ + #define wxFinite(x) std::isfinite(x) +-#elif defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) ++ #define wxIsNaN(x) std::isnan(x) ++#else /* C++98 */ ++ ++#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) + #include <float.h> + #define wxFinite(x) _finite(x) + #elif defined(__MINGW64_TOOLCHAIN__) || defined(__clang__) +@@ -93,6 +100,8 @@ + #define wxIsNaN(x) ((x) != (x)) + #endif + ++#endif /* C++11/C++98 */ ++ + #ifdef __INTELC__ + + inline bool wxIsSameDouble(double x, double y) diff -Nru wxwidgets3.0-3.0.2+dfsg/debian/patches/series wxwidgets3.0-3.0.2+dfsg/debian/patches/series --- wxwidgets3.0-3.0.2+dfsg/debian/patches/series 2016-02-21 09:53:34.000000000 +0100 +++ wxwidgets3.0-3.0.2+dfsg/debian/patches/series 2016-05-14 14:36:31.000000000 +0200 @@ -2,3 +2,4 @@ reproducible-build.patch warn-for-compiler-abi-mismatch.patch gst1.0.patch +Define-wxIsNaN-as-std-isnan-in-C-11-mode.patch