wok-next rev 20514
ardour, gdal, icu, js, jsoncpp, libvpx, llvm, mesa, minetest, opencv, qt5, scilab, webkit2gtk, webkitgtk, xalan-c: remove std.patch, use `fix math`.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Wed Mar 21 16:15:19 2018 +0200 (2018-03-21) |
parents | d43bf7aae921 |
children | 593af19ee346 |
files | ardour/receipt ardour/stuff/patches/series ardour/stuff/patches/std.patch gdal/receipt icu/receipt icu/stuff/patches/series icu/stuff/patches/std.patch js/receipt js/stuff/patches/series js/stuff/patches/std.patch jsoncpp/receipt libvpx/receipt libvpx/stuff/patches/series libvpx/stuff/patches/std.patch llvm/receipt llvm/stuff/patches/series llvm/stuff/patches/std.patch mesa/receipt mesa/stuff/patches/series mesa/stuff/patches/std.patch minetest/receipt opencv/receipt qt5/receipt qt5/stuff/patches/series qt5/stuff/patches/std.patch scilab/receipt webkit2gtk/receipt webkitgtk/receipt xalan-c/receipt |
line diff
1.1 --- a/ardour/receipt Wed Mar 21 15:58:17 2018 +0200 1.2 +++ b/ardour/receipt Wed Mar 21 16:15:19 2018 +0200 1.3 @@ -18,6 +18,7 @@ 1.4 sord-dev sratom lilv gtkmm-dev dbus-dev readline-dev gettext" 1.5 1.6 compile_rules() { 1.7 + fix math 1.8 python2 waf configure \ 1.9 --prefix=/usr \ 1.10 --configdir=/etc \
2.1 --- a/ardour/stuff/patches/series Wed Mar 21 15:58:17 2018 +0200 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,1 +0,0 @@ 2.4 -std.patch
3.1 --- a/ardour/stuff/patches/std.patch Wed Mar 21 15:58:17 2018 +0200 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,59 +0,0 @@ 3.4 ---- a/libs/vamp-plugins/SpectralCentroid.cpp 3.5 -+++ b/libs/vamp-plugins/SpectralCentroid.cpp 3.6 -@@ -43,8 +43,8 @@ 3.7 - #define isinf_local(val) !((bool)_finite((double)val)) 3.8 - #define isnan_local(val) (bool)_isnan((double)val) 3.9 - #else 3.10 --#define isinf_local std::isinf 3.11 --#define isnan_local std::isnan 3.12 -+#define isinf_local isinf 3.13 -+#define isnan_local isnan 3.14 - #endif 3.15 - 3.16 - #include "SpectralCentroid.h" 3.17 ---- a/libs/ardour/dsp_filter.cc 3.18 -+++ b/libs/ardour/dsp_filter.cc 3.19 -@@ -28,7 +28,7 @@ 3.20 - #include <float.h> 3.21 - #define isfinite_local(val) (bool)_finite((double)val) 3.22 - #else 3.23 --#define isfinite_local std::isfinite 3.24 -+#define isfinite_local isfinite 3.25 - #endif 3.26 - 3.27 - #ifndef M_PI 3.28 ---- a/libs/ardour/midi_track.cc 3.29 -+++ b/libs/ardour/midi_track.cc 3.30 -@@ -25,8 +25,8 @@ 3.31 - #define isinf_local(val) !((bool)_finite((double)val)) 3.32 - #define isnan_local(val) (bool)_isnan((double)val) 3.33 - #else 3.34 --#define isinf_local std::isinf 3.35 --#define isnan_local std::isnan 3.36 -+#define isinf_local isinf 3.37 -+#define isnan_local isnan 3.38 - #endif 3.39 - 3.40 - #include "pbd/enumwriter.h" 3.41 ---- a/gtk2_ardour/automation_line.cc 3.42 -+++ b/gtk2_ardour/automation_line.cc 3.43 -@@ -25,7 +25,7 @@ 3.44 - // 'std::isnan()' is not available in MSVC. 3.45 - #define isnan_local(val) (bool)_isnan((double)val) 3.46 - #else 3.47 --#define isnan_local std::isnan 3.48 -+#define isnan_local isnan 3.49 - #endif 3.50 - 3.51 - #include <climits> 3.52 ---- a/libs/evoral/src/ControlList.cpp 3.53 -+++ b/libs/evoral/src/ControlList.cpp 3.54 -@@ -24,7 +24,7 @@ 3.55 - // 'std::isnan()' is not available in MSVC. 3.56 - #define isnan_local(val) (bool)_isnan((double)val) 3.57 - #else 3.58 --#define isnan_local std::isnan 3.59 -+#define isnan_local isnan 3.60 - #endif 3.61 - 3.62 - #define GUARD_POINT_DELTA 64
4.1 --- a/gdal/receipt Wed Mar 21 15:58:17 2018 +0200 4.2 +++ b/gdal/receipt Wed Mar 21 16:15:19 2018 +0200 4.3 @@ -16,6 +16,7 @@ 4.4 SPLIT="gdal gdal-dev gdal-bin gdal-datas libgdal" 4.5 4.6 compile_rules() { 4.7 + fix math 4.8 ./configure \ 4.9 --sysconfdir=/etc \ 4.10 --localstatedir=/var \
5.1 --- a/icu/receipt Wed Mar 21 15:58:17 2018 +0200 5.2 +++ b/icu/receipt Wed Mar 21 16:15:19 2018 +0200 5.3 @@ -22,6 +22,7 @@ 5.4 SPLIT="libicu icu icu-dev libicu-full:full icu-full:full icu-full-dev:full" 5.5 5.6 compile_rules() { 5.7 + fix math 5.8 cd $src/icu4c/source 5.9 sed -i.orig 's/xlocale/locale/' i18n/digitlst.cpp 5.10 if [ -z "$SET" ]; then
6.1 --- a/icu/stuff/patches/series Wed Mar 21 15:58:17 2018 +0200 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,1 +0,0 @@ 6.4 -std.patch
7.1 --- a/icu/stuff/patches/std.patch Wed Mar 21 15:58:17 2018 +0200 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,19 +0,0 @@ 7.4 ---- a/icu4c/source/i18n/number_decimalquantity.cpp 7.5 -+++ b/icu4c/source/i18n/number_decimalquantity.cpp 7.6 -@@ -330,13 +330,13 @@ 7.7 - setBcdToZero(); 7.8 - flags = 0; 7.9 - // signbit() from <math.h> handles +0.0 vs -0.0 7.10 -- if (std::signbit(n) != 0) { 7.11 -+ if (signbit(n) != 0) { 7.12 - flags |= NEGATIVE_FLAG; 7.13 - n = -n; 7.14 - } 7.15 -- if (std::isnan(n) != 0) { 7.16 -+ if (isnan(n) != 0) { 7.17 - flags |= NAN_FLAG; 7.18 -- } else if (std::isfinite(n) == 0) { 7.19 -+ } else if (isfinite(n) == 0) { 7.20 - flags |= INFINITY_FLAG; 7.21 - } else if (n != 0) { 7.22 - _setToDoubleFast(n);
8.1 --- a/js/receipt Wed Mar 21 15:58:17 2018 +0200 8.2 +++ b/js/receipt Wed Mar 21 16:15:19 2018 +0200 8.3 @@ -21,6 +21,7 @@ 8.4 SPLIT="js-dev" 8.5 8.6 compile_rules() { 8.7 + fix math 8.8 cd js/src 8.9 8.10 autoconf-2.13 &&
9.1 --- a/js/stuff/patches/series Wed Mar 21 15:58:17 2018 +0200 9.2 +++ b/js/stuff/patches/series Wed Mar 21 16:15:19 2018 +0200 9.3 @@ -1,4 +1,2 @@ 9.4 # http://www.linuxfromscratch.org/patches/blfs/8.1/js38-38.2.1-upstream_fixes-2.patch 9.5 js38-38.2.1-upstream_fixes-2.patch 9.6 - 9.7 -std.patch
10.1 --- a/js/stuff/patches/std.patch Wed Mar 21 15:58:17 2018 +0200 10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 10.3 @@ -1,15 +0,0 @@ 10.4 ---- a/mfbt/decimal/Decimal.cpp 10.5 -+++ b/mfbt/decimal/Decimal.cpp 10.6 -@@ -686,10 +686,10 @@ 10.7 - 10.8 - Decimal Decimal::fromDouble(double doubleValue) 10.9 - { 10.10 -- if (std::isfinite(doubleValue)) 10.11 -+ if (isfinite(doubleValue)) 10.12 - return fromString(mozToString(doubleValue)); 10.13 - 10.14 -- if (std::isinf(doubleValue)) 10.15 -+ if (isinf(doubleValue)) 10.16 - return infinity(doubleValue < 0 ? Negative : Positive); 10.17 - 10.18 - return nan();
11.1 --- a/jsoncpp/receipt Wed Mar 21 15:58:17 2018 +0200 11.2 +++ b/jsoncpp/receipt Wed Mar 21 16:15:19 2018 +0200 11.3 @@ -14,6 +14,7 @@ 11.4 BUILD_DEPENDS="cmake" 11.5 11.6 compile_rules() { 11.7 + fix math 11.8 mkdir build 11.9 cd build 11.10 cmake \
12.1 --- a/libvpx/receipt Wed Mar 21 15:58:17 2018 +0200 12.2 +++ b/libvpx/receipt Wed Mar 21 16:15:19 2018 +0200 12.3 @@ -16,6 +16,7 @@ 12.4 SPLIT="libvpx-dev" 12.5 12.6 compile_rules() { 12.7 + fix math 12.8 sed -i 's/cp -p/cp/' build/make/Makefile 12.9 12.10 mkdir libvpx-build
13.1 --- a/libvpx/stuff/patches/series Wed Mar 21 15:58:17 2018 +0200 13.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 13.3 @@ -1,1 +0,0 @@ 13.4 -std.patch
14.1 --- a/libvpx/stuff/patches/std.patch Wed Mar 21 15:58:17 2018 +0200 14.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 14.3 @@ -1,13 +0,0 @@ 14.4 ---- a/third_party/libwebm/mkvparser/mkvparser.cc 14.5 -+++ b/third_party/libwebm/mkvparser/mkvparser.cc 14.6 -@@ -36,8 +36,8 @@ 14.7 - inline bool isnan(double val) { return !!_isnan(val); } 14.8 - inline bool isinf(double val) { return !_finite(val); } 14.9 - #else 14.10 --inline bool isnan(double val) { return std::isnan(val); } 14.11 --inline bool isinf(double val) { return std::isinf(val); } 14.12 -+inline bool isnan(double val) { return isnan(val); } 14.13 -+inline bool isinf(double val) { return isinf(val); } 14.14 - #endif // MSC_COMPAT 14.15 - 14.16 - IMkvReader::~IMkvReader() {}
15.1 --- a/llvm/receipt Wed Mar 21 15:58:17 2018 +0200 15.2 +++ b/llvm/receipt Wed Mar 21 16:15:19 2018 +0200 15.3 @@ -3,7 +3,8 @@ 15.4 PACKAGE="llvm" 15.5 VERSION="5.0.0" 15.6 CATEGORY="development" 15.7 -SHORT_DESC="LLVM (Low Level Virtual Machine): collection of modular and reusable compiler and toolchain technologies" 15.8 +SHORT_DESC="LLVM (Low Level Virtual Machine): collection of modular and \ 15.9 +reusable compiler and toolchain technologies" 15.10 MAINTAINER="pascal.bellard@slitaz.org" 15.11 LICENSE="MIT" 15.12 WEB_SITE="http://llvm.org/" 15.13 @@ -15,7 +16,10 @@ 15.14 SPLIT="llvm-dev llvm-libs" 15.15 15.16 compile_rules() { 15.17 - mkdir build && cd build && 15.18 + fix math 15.19 + mkdir build 15.20 + cd build 15.21 + 15.22 CC=gcc CXX=g++ \ 15.23 cmake \ 15.24 -DCMAKE_INSTALL_PREFIX=/usr \ 15.25 @@ -23,7 +27,8 @@ 15.26 -DCMAKE_BUILD_TYPE=Release \ 15.27 -DBUILD_SHARED_LIBS=ON \ 15.28 -DLLVM_TARGETS_TO_BUILD="host;AMDGPU" \ 15.29 - -Wno-dev .. && 15.30 + -Wno-dev \ 15.31 + .. && 15.32 make && 15.33 make install 15.34 }
16.1 --- a/llvm/stuff/patches/series Wed Mar 21 15:58:17 2018 +0200 16.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 16.3 @@ -1,1 +0,0 @@ 16.4 -std.patch
17.1 --- a/llvm/stuff/patches/std.patch Wed Mar 21 15:58:17 2018 +0200 17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 17.3 @@ -1,29 +0,0 @@ 17.4 -${src}/lib/Support/NativeFormatting.cpp: In function 'void llvm::write_double(llvm::raw_ostream&, double, llvm::FloatStyle, llvm::Optional<long unsigned int>)': 17.5 -${src}/lib/Support/NativeFormatting.cpp:166:12: error: '__builtin_isnan' is not a member of 'std' 17.6 - if (std::isnan(N)) { 17.7 - ^ 17.8 -${src}/lib/Support/NativeFormatting.cpp:166:12: note: suggested alternative: 17.9 -<built-in>: note: '__builtin_isnan' 17.10 -${src}/lib/Support/NativeFormatting.cpp:169:19: error: '__builtin_isinf_sign' is not a member of 'std' 17.11 - } else if (std::isinf(N)) { 17.12 - ^ 17.13 -${src}/lib/Support/NativeFormatting.cpp:169:19: note: suggested alternative: 17.14 -<built-in>: note: '__builtin_isinf_sign' 17.15 -make[2]: *** [lib/Support/CMakeFiles/LLVMSupport.dir/build.make:1263: lib/Support/CMakeFiles/LLVMSupport.dir/NativeFormatting.cpp.o] Error 1 17.16 -make[1]: *** [CMakeFiles/Makefile2:545: lib/Support/CMakeFiles/LLVMSupport.dir/all] Error 2 17.17 - 17.18 ---- a/lib/Support/NativeFormatting.cpp 17.19 -+++ b/lib/Support/NativeFormatting.cpp 17.20 -@@ -163,10 +163,10 @@ 17.21 - Optional<size_t> Precision) { 17.22 - size_t Prec = Precision.getValueOr(getDefaultPrecision(Style)); 17.23 - 17.24 -- if (std::isnan(N)) { 17.25 -+ if (isnan(N)) { 17.26 - S << "nan"; 17.27 - return; 17.28 -- } else if (std::isinf(N)) { 17.29 -+ } else if (isinf(N)) { 17.30 - S << "INF"; 17.31 - return; 17.32 - }
18.1 --- a/mesa/receipt Wed Mar 21 15:58:17 2018 +0200 18.2 +++ b/mesa/receipt Wed Mar 21 16:15:19 2018 +0200 18.3 @@ -23,6 +23,7 @@ 18.4 mesa-libwayland-egl mesa-libxatracker mesa-vdpau mesa mesa-dev" 18.5 18.6 compile_rules() { 18.7 + fix math 18.8 # Removed from the full list: freedreno,vc4 18.9 # because we haven't appropriate libdrm-* packages (they are only for ARM) 18.10 GLL_DRV="i915,nouveau,r300,r600,radeonsi,svga,swrast,swr,virgl,etnaviv,imx"
19.1 --- a/mesa/stuff/patches/series Wed Mar 21 15:58:17 2018 +0200 19.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 19.3 @@ -1,1 +0,0 @@ 19.4 -std.patch
20.1 --- a/mesa/stuff/patches/std.patch Wed Mar 21 15:58:17 2018 +0200 20.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 20.3 @@ -1,58 +0,0 @@ 20.4 ---- a/include/c99_math.h 20.5 -+++ b/include/c99_math.h 20.6 -@@ -192,19 +192,6 @@ 20.7 - */ 20.8 - #if __cplusplus >= 201103L && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 23)) 20.9 - #include <cmath> 20.10 -- 20.11 --using std::fpclassify; 20.12 --using std::isfinite; 20.13 --using std::isinf; 20.14 --using std::isnan; 20.15 --using std::isnormal; 20.16 --using std::signbit; 20.17 --using std::isgreater; 20.18 --using std::isgreaterequal; 20.19 --using std::isless; 20.20 --using std::islessequal; 20.21 --using std::islessgreater; 20.22 --using std::isunordered; 20.23 - #endif 20.24 - 20.25 - 20.26 ---- a/src/gallium/drivers/swr/rasterizer/memory/Convert.h 20.27 -+++ b/src/gallium/drivers/swr/rasterizer/memory/Convert.h 20.28 -@@ -169,13 +169,13 @@ 20.29 - mant = uf & 0x007FFFFF; 20.30 - 20.31 - // Check for out of range 20.32 -- if (std::isnan(val)) 20.33 -+ if (isnan(val)) 20.34 - { 20.35 - exp = 0x1F; 20.36 - mant = 0x200; 20.37 - sign = 1; // set the sign bit for NANs 20.38 - } 20.39 -- else if (std::isinf(val)) 20.40 -+ else if (isinf(val)) 20.41 - { 20.42 - exp = 0x1f; 20.43 - mant = 0x0; 20.44 ---- a/src/gallium/drivers/swr/rasterizer/jitter/builder_misc.cpp 20.45 -+++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_misc.cpp 20.46 -@@ -54,13 +54,13 @@ 20.47 - mant = uf & 0x007FFFFF; 20.48 - 20.49 - // Check for out of range 20.50 -- if (std::isnan(val)) 20.51 -+ if (isnan(val)) 20.52 - { 20.53 - exp = 0x1F; 20.54 - mant = 0x200; 20.55 - sign = 1; // set the sign bit for NANs 20.56 - } 20.57 -- else if (std::isinf(val)) 20.58 -+ else if (isinf(val)) 20.59 - { 20.60 - exp = 0x1f; 20.61 - mant = 0x0;
21.1 --- a/minetest/receipt Wed Mar 21 15:58:17 2018 +0200 21.2 +++ b/minetest/receipt Wed Mar 21 16:15:19 2018 +0200 21.3 @@ -22,6 +22,7 @@ 21.4 # Rules to configure and make the package. 21.5 compile_rules() 21.6 { 21.7 + fix math 21.8 [ -s "$SRC/$TARBALL2" ] || wget --no-check-certificate \ 21.9 -O "$SRC/$TARBALL2" $WGET_URL2 21.10 cd games/
22.1 --- a/opencv/receipt Wed Mar 21 15:58:17 2018 +0200 22.2 +++ b/opencv/receipt Wed Mar 21 16:15:19 2018 +0200 22.3 @@ -6,37 +6,34 @@ 22.4 SHORT_DESC="Open source computer vision library" 22.5 MAINTAINER="pascal.bellard@slitaz.org" 22.6 LICENSE="BSD" 22.7 +WEB_SITE="http://opencv.org/" 22.8 + 22.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 22.10 -WEB_SITE="http://opencv.org/" 22.11 WGET_URL="https://github.com/Itseez/opencv/archive/$VERSION.tar.gz" 22.12 22.13 -BUILD_DEPENDS="wget cmake gtk+-dev ffmpeg-dev jpeg-dev tiff-dev libpng16-dev" 22.14 +BUILD_DEPENDS="cmake gtk+-dev ffmpeg-dev libjpeg-turbo-dev tiff-dev \ 22.15 +libpng16-dev" 22.16 SPLIT="opencv opencv-dev" 22.17 22.18 -# Rules to configure and make the package. 22.19 -compile_rules() 22.20 -{ 22.21 - mkdir build && cd build && 22.22 - cmake .. -DCMAKE_INSTALL_PREFIX=/usr && 22.23 +compile_rules() { 22.24 + fix math 22.25 + mkdir build 22.26 + cd build 22.27 + cmake \ 22.28 + -DCMAKE_INSTALL_PREFIX=/usr \ 22.29 + .. && 22.30 make && 22.31 make DESTDIR=$DESTDIR install 22.32 } 22.33 22.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 22.35 -genpkg_rules() 22.36 -{ 22.37 - mkdir -p $fs/usr/lib 22.38 +genpkg_rules() { 22.39 case $PACKAGE in 22.40 - opencv) 22.41 - DEPENDS="gtk+ ffmpeg jpeg tiff libpng16" 22.42 - cp -a $install/usr/bin $fs/usr 22.43 - cp -a $install/usr/share $fs/usr 22.44 - cp -a $install/usr/lib/*.so* $fs/usr/lib 22.45 - ;; 22.46 - opencv-dev) 22.47 - #cp -a $install/usr/lib/*a $fs/usr/lib 22.48 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 22.49 - cp -a $install/usr/include $fs/usr 22.50 - ;; 22.51 + opencv) 22.52 + copy @std 22.53 + DEPENDS="gtk+ ffmpeg jpeg tiff libpng16" 22.54 + ;; 22.55 + opencv-dev) 22.56 + copy @dev 22.57 + ;; 22.58 esac 22.59 }
23.1 --- a/qt5/receipt Wed Mar 21 15:58:17 2018 +0200 23.2 +++ b/qt5/receipt Wed Mar 21 16:15:19 2018 +0200 23.3 @@ -45,6 +45,7 @@ 23.4 qt5-doc qt5-dev" 23.5 23.6 compile_rules() { 23.7 + fix math 23.8 export QT5PREFIX=/usr # or /opt/qt5 23.9 if [ "$QT5PREFIX" == '/usr' ]; then 23.10 QT5OPTS="\
24.1 --- a/qt5/stuff/patches/series Wed Mar 21 15:58:17 2018 +0200 24.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 24.3 @@ -1,1 +0,0 @@ 24.4 -std.patch
25.1 --- a/qt5/stuff/patches/std.patch Wed Mar 21 15:58:17 2018 +0200 25.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 25.3 @@ -1,34 +0,0 @@ 25.4 ---- a/qtbase/src/corelib/global/qnumeric_p.h 25.5 -+++ b/qtbase/src/corelib/global/qnumeric_p.h 25.6 -@@ -101,12 +101,12 @@ 25.7 - static inline bool isinf(float f) { return math_h_isinf(f); } 25.8 - static inline bool isfinite(float f) { return math_h_isfinite(f); } 25.9 - #else 25.10 --static inline bool isnan(double d) { return std::isnan(d); } 25.11 --static inline bool isinf(double d) { return std::isinf(d); } 25.12 --static inline bool isfinite(double d) { return std::isfinite(d); } 25.13 --static inline bool isnan(float f) { return std::isnan(f); } 25.14 --static inline bool isinf(float f) { return std::isinf(f); } 25.15 --static inline bool isfinite(float f) { return std::isfinite(f); } 25.16 -+static inline bool isnan(double d) { return isnan(d); } 25.17 -+static inline bool isinf(double d) { return isinf(d); } 25.18 -+static inline bool isfinite(double d) { return isfinite(d); } 25.19 -+static inline bool isnan(float f) { return isnan(f); } 25.20 -+static inline bool isinf(float f) { return isinf(f); } 25.21 -+static inline bool isfinite(float f) { return isfinite(f); } 25.22 - #endif 25.23 - } 25.24 - 25.25 ---- a/qtbase/src/corelib/kernel/qvariant.cpp 25.26 -+++ b/qtbase/src/corelib/kernel/qvariant.cpp 25.27 -@@ -3486,8 +3486,8 @@ 25.28 - return 0; 25.29 - 25.30 - // only do fuzzy comparisons for finite, non-zero numbers 25.31 -- int c1 = std::fpclassify(r1); 25.32 -- int c2 = std::fpclassify(r2); 25.33 -+ int c1 = fpclassify(r1); 25.34 -+ int c2 = fpclassify(r2); 25.35 - if ((c1 == FP_NORMAL || c1 == FP_SUBNORMAL) && (c2 == FP_NORMAL || c2 == FP_SUBNORMAL)) { 25.36 - if (qFuzzyCompare(r1, r2)) 25.37 - return 0;
26.1 --- a/scilab/receipt Wed Mar 21 15:58:17 2018 +0200 26.2 +++ b/scilab/receipt Wed Mar 21 16:15:19 2018 +0200 26.3 @@ -19,6 +19,7 @@ 26.4 # Rules to configure and make the package. 26.5 compile_rules() 26.6 { 26.7 + fix math 26.8 ./configure --prefix=/usr \ 26.9 --without-javasci --without-gui --disable-build-help \ 26.10 --without-umfpack \
27.1 --- a/webkit2gtk/receipt Wed Mar 21 15:58:17 2018 +0200 27.2 +++ b/webkit2gtk/receipt Wed Mar 21 16:15:19 2018 +0200 27.3 @@ -19,8 +19,9 @@ 27.4 SPLIT="webkit2gtk-dev" 27.5 27.6 compile_rules() { 27.7 - mkdir -p build && 27.8 - cd build && 27.9 + fix math 27.10 + mkdir build 27.11 + cd build 27.12 27.13 CFLAGS=-Wno-expansion-to-defined \ 27.14 CXXFLAGS=-Wno-expansion-to-defined \
28.1 --- a/webkitgtk/receipt Wed Mar 21 15:58:17 2018 +0200 28.2 +++ b/webkitgtk/receipt Wed Mar 21 16:15:19 2018 +0200 28.3 @@ -24,11 +24,12 @@ 28.4 harfbuzz-icu-dev libxslt-dev gst1-plugins-base-dev gettext" 28.5 28.6 compile_rules() { 28.7 + fix math 28.8 CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks" 28.9 CFLAGS="$CFLAGS -fno-delete-null-pointer-checks" 28.10 28.11 - mkdir -p build && 28.12 - cd build && 28.13 + mkdir build 28.14 + cd build 28.15 28.16 ../configure \ 28.17 --enable-introspection \
29.1 --- a/xalan-c/receipt Wed Mar 21 15:58:17 2018 +0200 29.2 +++ b/xalan-c/receipt Wed Mar 21 16:15:19 2018 +0200 29.3 @@ -18,6 +18,7 @@ 29.4 SPLIT="xalan-c-dev" 29.5 29.6 compile_rules() { 29.7 + fix math 29.8 mv c/* . && rm -r c 29.9 sed -i 's/isnan/std::&/' src/xalanc/PlatformSupport/DoubleSupport.hpp 29.10 sed -i 's/mutable MemoryManager/MemoryManager/' src/xalanc/*/*.hpp