]> git.pld-linux.org Git - packages/hhvm.git/commitdiff
up to 3.3.2
authorElan Ruusamäe <glen@delfi.ee>
Mon, 29 Dec 2014 11:14:57 +0000 (13:14 +0200)
committerElan Ruusamäe <glen@delfi.ee>
Mon, 29 Dec 2014 11:14:57 +0000 (13:14 +0200)
MAX.patch
hhvm.spec

index 8c03bb7c5900cd2518dd8928f5a06d434b75ab80..3e5f891c8f472647d5775cf2f336755ff5a62635 100644 (file)
--- a/MAX.patch
+++ b/MAX.patch
@@ -56,3 +56,14 @@ index 723f6c8..43f1bc8 100644
  #endif
  
  //////////////////////////////////////////////////////////////////////
+--- hhvm-HHVM-3.3.2/hphp/runtime/base/zend-pack.cpp~   2014-12-20 02:39:46.000000000 +0200
++++ hhvm-HHVM-3.3.2/hphp/runtime/base/zend-pack.cpp    2014-12-29 13:01:04.142356895 +0200
+@@ -294,7 +294,7 @@
+     case 'a':
+     case 'A':
+     case 'Z': {
+-      int arg_cp = (code != 'Z') ? arg : MAX(0, arg - 1);
++      int arg_cp = (code != 'Z') ? arg : std::max(0, arg - 1);
+       memset(&output[outputpos], (code != 'A') ? '\0' : ' ', arg);
+       val = argv[currentarg++].toString();
+       s = val.c_str();
index 518367e63f2dc9605b953da98de343290d5a4f3d..c7a8a10ec4fc81235c405dcfebf1c128ffe3cb58 100644 (file)
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -20,8 +20,8 @@
 # hphp/system/idl/constants.idl.json defines it as 5.6.99-hhvm, but use some saner value
 %define                php_version                     5.6.0
 
-# git show HHVM-3.3.1
-%define                githash e0c98e21167b425dddf1fc9efe78c9f7a36db268
+# git show HHVM-3.3.2
+%define                githash 9046034b8d82b06e9feb75b72e2b0106a2707c2c
 # these hashes are git submodules (be sure to check them on proper branch)
 %define                thirdparty      fdef620
 %define                folly           6e46d46
@@ -29,12 +29,12 @@ Summary:    Virtual Machine, Runtime, and JIT for PHP
 Name:          hhvm
 # we prefer LTS versions
 # see http://hhvm.com/blog/6083/hhvm-long-term-support
-Version:       3.3.1
-Release:       2
+Version:       3.3.2
+Release:       1
 License:       PHP 3.01 and BSD
 Group:         Development/Languages
 Source0:       https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
-# Source0-md5: bab9490837ff4f54f295bbcf428d7a1c
+# Source0-md5: f515560490ece6cbad5d433502c14943
 Source2:       https://github.com/facebook/folly/archive/%{folly}/folly-3.2-%{folly}.tar.gz
 # Source2-md5: c4bdbea4c0ffe0650d12d9ff370b8255
 Source3:       https://github.com/hhvm/hhvm-third-party/archive/%{thirdparty}/third_party-%{thirdparty}.tar.gz
This page took 0.032912 seconds and 4 git commands to generate.