Date: Friday, April 1, 2016 @ 13:57:03 Author: mtorromeo Revision: 169179
upgpkg: hhvm 3.13.0-1 Updated to 3.13.0 Modified: hhvm/trunk/PKGBUILD hhvm/trunk/namespaces.patch ------------------+ PKGBUILD | 34 +++++++++++++++++----------------- namespaces.patch | 33 ++++++++++++++++----------------- 2 files changed, 33 insertions(+), 34 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-04-01 10:50:57 UTC (rev 169178) +++ PKGBUILD 2016-04-01 11:57:03 UTC (rev 169179) @@ -3,16 +3,16 @@ # Contributor: James Miller <[email protected]> pkgname=hhvm -pkgver=3.12.1 +pkgver=3.13.0 pkgrel=1 -_thirdparty_commit=ae031dcc9594163f5b0c35e7026563f1c8372595 -_folly_commit=0dbbe8568985ac7966c4354dd89fe0a1771f1dc4 -_mcrouter_commit=cb05bfa78209fb5f49b1af7e04553d8429ae3d7a -_proxygen_commit=6c54f58dc09e974aa807c0358021eea18e598735 -_squangle_commit=82e54515599aeb09790713784b54f5a9bc554ce1 -_thrift_commit=e4ef3334f770303b021d78a19083ef2c5877e981 -_wangle_commit=05b7c1d1b1fdf66be70dac54b615edcc20f4f9f1 +_thirdparty_commit=57ddc7942877befb97ecc3df2581a4de119049aa +_folly_commit=add5a7aeacacb050c4b0bad84aac1475fa2658c9 +_mcrouter_commit=fa3892ced1a5525b947828c9860861f8d97c8ae0 +_proxygen_commit=61e339de02b1537c943506fa1a0570c4f8fa3cc0 +_squangle_commit=e0fc74959076c552efb56b4c62aa373364640421 +_thrift_commit=f6da2972faf97639f96e2d879b4649ab3b5b6d17 +_wangle_commit=ec31c0496f606a3c8e6f90f7d5441db9f2a74618 _webscalesql_commit=a9e580b5a0baa768210ef10544c8fab52003ec0b pkgdesc="Virtual Machine, Runtime, and JIT for PHP" @@ -134,18 +134,18 @@ install -Dm644 server.ini "$pkgdir"/etc/hhvm/server.ini } -sha256sums=('6227c1b24418a0c1bc0e1b09990afda1dddeace492becba210f183087a01cd26' - 'bdf6c71fc023cc7093672a54418e62d058361b4d0fd016c497e9083d93786590' - 'd9a68d98bb9ad263c671b48a5f7f5b8db90b5bffe438922c1b285700f01e824c' - '7e36c2c10a13a416e5384615e93f55d3742e0d96559d611877b746252e672ed7' - 'f67c4993f633565f6f2f97aca56eff779d8e7dfc15263e0835ccaff61209f43c' +sha256sums=('d0636b27816461aa67c0841e39b1045b010e545373f66893f11749d88a177903' + '58c1ff59791c7e9aca6f4225a006f7dffa824f3b37a1aa07246698dda32c6c50' + '9f93911918c911d15752871a4f8149749bb5e510054e90d45821d7b2e763d489' + 'e489bcd7318bdcd9f96f5ed9b561a071e288cc4e4a4665442ef7e383ab103059' + '255197d59ee50b0c5f3fabf8959c1fb4497080b6dd041a301750a4e362e4de8b' '06983fb95386626dc1a2fdfda2d2632d8f8851b7ad03ec3bef2046f5736af3ab' - 'f9d16dab7775298a1673e5cc68b2f9c9a1a1f94e34f27930dbb7205c5c9240e9' - '7a80ce5e25d512fe27b44a3d9bbc44fcafcc0d8c35e70df2650b4772e46e4977' - '075b9a5c6cceb27e5c6d869929708abb02f8e25f5aba828c4ec643722cb2052a' + '90e0bc1e438f6d9768dfa49dd90ae3dea9b9fac5d2818cd1dffe014d691ab3ff' + 'bacb1913487c19faf7bf45cc8b3942bfd76233ebe0f3884081fa932da7cd1dd3' + '0430de8aaf658cabd90ab1cb04b09778a7d6ff2eaa6b73bfbd6415371b3459aa' 'c356010a6d6b976f387bb205a75ea07d5f40593a8010483f2ed0f66f112331bc' '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df' '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c' '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f' '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0' - '4b83a34d76e9a20001d55bf828e6db3272e5f12a7b02a87e902642236ad2ad7c') + '49aa0e42f416493b318ff54e780e5282683a806efa4f9ce42b6eac2da4115c4f') Modified: namespaces.patch =================================================================== --- namespaces.patch 2016-04-01 10:50:57 UTC (rev 169178) +++ namespaces.patch 2016-04-01 11:57:03 UTC (rev 169179) @@ -5,11 +5,11 @@ @@ -14,6 +14,8 @@ +----------------------------------------------------------------------+ */ - + +#include <cmath> + #include "hphp/runtime/base/tv-helpers.h" - + #include "hphp/runtime/base/dummy-resource.h" @@ -673,7 +675,7 @@ bool tvCoerceParamToInt64InPlace(TypedValue* tv) { if (RuntimeOption::PHP7_ScalarTypes && tv->m_type == KindOfDouble) { @@ -26,16 +26,16 @@ +++ b/hphp/runtime/base/zend-printf.cpp @@ -18,6 +18,7 @@ #include "hphp/runtime/base/zend-printf.h" - + #include <math.h> +#include <cmath> - + #include "hphp/runtime/base/array-iterator.h" #include "hphp/runtime/base/builtin-functions.h" @@ -693,14 +694,14 @@ inline static void appenddouble(StringBuffer *buffer, precision = MAX_FLOAT_PRECISION; } - + - if (isnan(number)) { + if (std::isnan(number)) { is_negative = (number<0); @@ -43,7 +43,7 @@ alignment, 3, is_negative, 0, always_sign); return; } - + - if (isinf(number)) { + if (std::isinf(number)) { is_negative = (number<0); @@ -52,7 +52,7 @@ @@ -1407,10 +1408,10 @@ static int xbuf_format_converter(char **outbuf, const char *fmt, va_list ap) goto fmt_error; } - + - if (isnan(fp_num)) { + if (std::isnan(fp_num)) { s = const_cast<char*>("nan"); @@ -65,7 +65,7 @@ @@ -1448,11 +1449,11 @@ static int xbuf_format_converter(char **outbuf, const char *fmt, va_list ap) goto fmt_error; } - + - if (isnan(fp_num)) { + if (std::isnan(fp_num)) { s = const_cast<char*>("NAN"); @@ -83,23 +83,22 @@ @@ -24,6 +24,8 @@ #include "hphp/runtime/ext/std/ext_std.h" #include "hphp/system/constants.h" - + +#include <cmath> + namespace HPHP { /////////////////////////////////////////////////////////////////////////////// - + @@ -187,9 +189,9 @@ Variant HHVM_FUNCTION(abs, const Variant& number) { } } - --bool HHVM_FUNCTION(is_finite, double val) { return finite(val);} + + bool HHVM_FUNCTION(is_finite, double val) { return std::isfinite(val);} -bool HHVM_FUNCTION(is_infinite, double val) { return isinf(val);} -bool HHVM_FUNCTION(is_nan, double val) { return isnan(val);} -+bool HHVM_FUNCTION(is_finite, double val) { return std::isfinite(val);} +bool HHVM_FUNCTION(is_infinite, double val) { return std::isinf(val);} +bool HHVM_FUNCTION(is_nan, double val) { return std::isnan(val);} - + Variant HHVM_FUNCTION(ceil, const Variant& number) { int64_t ival; diff --git a/hphp/runtime/ext_zend_compat/php-src/main/snprintf.cpp b/hphp/runtime/ext_zend_compat/php-src/main/snprintf.cpp @@ -109,7 +108,7 @@ @@ -29,6 +29,8 @@ #include <stdlib.h> #include <math.h> - + +#include <cmath> + #ifdef HAVE_INTTYPES_H @@ -118,7 +117,7 @@ @@ -989,10 +991,10 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) / goto fmt_error; } - + - if (zend_isnan(fp_num)) { + if (std::isnan(fp_num)) { s = "NAN"; @@ -131,7 +130,7 @@ @@ -1030,11 +1032,11 @@ static int format_converter(register buffy * odp, const char *fmt, va_list ap) / goto fmt_error; } - + - if (zend_isnan(fp_num)) { + if (std::isnan(fp_num)) { s = "NAN";
