[arch-commits] Commit in hhvm/trunk (PKGBUILD namespaces.patch)

2016-06-13 Thread Massimiliano Torromeo
Date: Monday, June 13, 2016 @ 13:19:56
  Author: mtorromeo
Revision: 179889

upgpkg: hhvm 3.14.0-1

Updated to 3.14.0

Modified:
  hhvm/trunk/PKGBUILD
Deleted:
  hhvm/trunk/namespaces.patch

--+
 PKGBUILD |   49 +-
 namespaces.patch |  143 -
 2 files changed, 26 insertions(+), 166 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-13 11:17:18 UTC (rev 179888)
+++ PKGBUILD2016-06-13 11:19:56 UTC (rev 179889)
@@ -3,16 +3,17 @@
 # Contributor: James Miller 
 
 pkgname=hhvm
-pkgver=3.13.2
-pkgrel=2
+pkgver=3.14.0
+pkgrel=1
 
-_thirdparty_commit=57ddc7942877befb97ecc3df2581a4de119049aa
-_folly_commit=add5a7aeacacb050c4b0bad84aac1475fa2658c9
-_mcrouter_commit=fa3892ced1a5525b947828c9860861f8d97c8ae0
-_proxygen_commit=61e339de02b1537c943506fa1a0570c4f8fa3cc0
-_squangle_commit=e0fc74959076c552efb56b4c62aa373364640421
-_thrift_commit=f6da2972faf97639f96e2d879b4649ab3b5b6d17
-_wangle_commit=ec31c0496f606a3c8e6f90f7d5441db9f2a74618
+_thirdparty_commit=e1fcf90c07e0af00906f98cde8aa828bec7b2e01
+_brotli_commit=98ed7a23a83d64133b0a36a884e489bffb0eb864
+_folly_commit=05cdf111f5e6a4585a5e9140fda26f4fea070637
+_mcrouter_commit=679c32548ef7d3c8624b15c0c38f584b37177478
+_proxygen_commit=0b0b50c08b2165f4ed4e4f374ddbeabbc8582e44
+_squangle_commit=36a61d13d03e72dc710028d48de5616f9926128a
+_thrift_commit=8672f88b084d2d5242016f2a4df282ee2c6d4023
+_wangle_commit=4903f961a88751e684f703aaf08511cd5c486a84
 _webscalesql_commit=a9e580b5a0baa768210ef10544c8fab52003ec0b
 
 pkgdesc="Virtual Machine, Runtime, and JIT for PHP"
@@ -28,6 +29,7 @@
 source=("https://github.com/facebook/hhvm/archive/HHVM-$pkgver.tar.gz;
 
"https://github.com/hhvm/hhvm-third-party/archive/$_thirdparty_commit/hhvm-third-party-$_thirdparty_commit.tar.gz;
 
"https://github.com/facebook/folly/archive/$_folly_commit/folly-$_folly_commit.tar.gz;
+
"https://github.com/google/brotli/archive/$_brotli_commit/brotli-$_brotli_commit.tar.gz;
 
"https://github.com/facebook/fbthrift/archive/$_thrift_commit/thrift-$_thrift_commit.tar.gz;
 
"https://github.com/facebook/proxygen/archive/$_proxygen_commit/proxygen-$_proxygen_commit.tar.gz;
 
"https://github.com/facebook/mysql-5.6/archive/$_webscalesql_commit/webscalesql-$_webscalesql_commit.tar.gz;
@@ -38,8 +40,7 @@
 'hhvm.service'
 'hhvm@.service'
 'php.ini'
-'server.ini'
-'namespaces.patch')
+'server.ini')
 install=hhvm.install
 backup=(etc/hhvm/{php,server}.ini)
 options+=('!buildflags')
@@ -47,8 +48,6 @@
 prepare() {
 cd "$srcdir"/$pkgname-HHVM-$pkgver
 
-patch -p1 -i "$srcdir"/namespaces.patch
-
 sed 's/TypedValue m_extraArgs\[\];/TypedValue m_extraArgs[0];/' \
 -i hphp/runtime/vm/bytecode.h
 
@@ -66,6 +65,10 @@
 rm -rf src
 ln -s "$srcdir"/folly-$_folly_commit src
 
+cd ../brotli
+rm -rf src
+ln -s "$srcdir"/brotli-$_brotli_commit src
+
 cd ../thrift
 rm -rf src
 ln -s "$srcdir"/fbthrift-$_thrift_commit src
@@ -137,18 +140,18 @@
 install -Dm644 server.ini "$pkgdir"/etc/hhvm/server.ini
 }
 
-sha256sums=('239f08214de3d108b70e9bc70f219d0230fcff4762efd2b0266a0b251fac0b3e'
-'58c1ff59791c7e9aca6f4225a006f7dffa824f3b37a1aa07246698dda32c6c50'
-'9f93911918c911d15752871a4f8149749bb5e510054e90d45821d7b2e763d489'
-'e489bcd7318bdcd9f96f5ed9b561a071e288cc4e4a4665442ef7e383ab103059'
-'255197d59ee50b0c5f3fabf8959c1fb4497080b6dd041a301750a4e362e4de8b'
+sha256sums=('6c99ba49a939b15f298935c0d52f3b2463b5e1b2fbf343df795a11909f5f0aa4'
+'06e4d11a9eb7385a035df4cccf7d5bcd45bedaea28394e2c50b9565b9aaf843b'
+'3c73b24518539ab5ba0d351931124dafddda37a44640528ff53dbd76acbe0089'
+'95f389831f134c203917f5c6802968006767d0c4f2cc20c1ca22ed28cd925700'
+'c7e7d551f8b05e7ab7ff391b9e26ae593fefc07a64ceacc41abf4f8935928d8b'
+'3c13e24e50ad62dbb809087264aa418333c8e0644bf8d727e9f29fcf398f6762'
 '06983fb95386626dc1a2fdfda2d2632d8f8851b7ad03ec3bef2046f5736af3ab'
-'90e0bc1e438f6d9768dfa49dd90ae3dea9b9fac5d2818cd1dffe014d691ab3ff'
-'bacb1913487c19faf7bf45cc8b3942bfd76233ebe0f3884081fa932da7cd1dd3'
-'0430de8aaf658cabd90ab1cb04b09778a7d6ff2eaa6b73bfbd6415371b3459aa'
+'f4df002985bf5a701191fda4dfbe03d322c8c7ee018a38578d9f62721c328cad'
+'8ad07e8a8656f3f88938bf98e71a582d194d0bcab7d474750c1dddaa29201c59'
+'31f0d4368e65740112d9621dc58fae5e076fcf6c77f52ebde3a0648f5e1cebc5'
 'c356010a6d6b976f387bb205a75ea07d5f40593a8010483f2ed0f66f112331bc'
 '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df'
 '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c'
 

[arch-commits] Commit in hhvm/trunk (PKGBUILD namespaces.patch)

2016-04-01 Thread Massimiliano Torromeo
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
===
--- PKGBUILD2016-04-01 10:50:57 UTC (rev 169178)
+++ PKGBUILD2016-04-01 11:57:03 UTC (rev 169179)
@@ -3,16 +3,16 @@
 # Contributor: James Miller 
 
 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.patch2016-04-01 10:50:57 UTC (rev 169178)
+++ namespaces.patch2016-04-01 11:57:03 UTC (rev 169179)
@@ -5,11 +5,11 @@
 @@ -14,6 +14,8 @@
 +--+
  */
- 
+
 +#include 
 +
  #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 
 +#include 
- 
+
  #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, 

[arch-commits] Commit in hhvm/trunk (PKGBUILD namespaces.patch)

2016-03-04 Thread Bartłomiej Piotrowski
Date: Friday, March 4, 2016 @ 21:17:46
  Author: bpiotrowski
Revision: 164834

Update to 3.12.1 with ugly build fix

Added:
  hhvm/trunk/namespaces.patch
Modified:
  hhvm/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 namespaces.patch |  144 +
 2 files changed, 152 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-04 19:41:27 UTC (rev 164833)
+++ PKGBUILD2016-03-04 20:17:46 UTC (rev 164834)
@@ -3,7 +3,7 @@
 # Contributor: James Miller 
 
 pkgname=hhvm
-pkgver=3.12.0
+pkgver=3.12.1
 pkgrel=1
 
 _thirdparty_commit=ae031dcc9594163f5b0c35e7026563f1c8372595
@@ -38,7 +38,8 @@
 'hhvm.service'
 'hhvm@.service'
 'php.ini'
-'server.ini')
+'server.ini'
+'namespaces.patch')
 install=hhvm.install
 backup=(etc/hhvm/{php,server}.ini)
 options+=('!buildflags')
@@ -46,6 +47,8 @@
 prepare() {
 cd "$srcdir"/$pkgname-HHVM-$pkgver
 
+patch -p1 -i "$srcdir"/namespaces.patch
+
 sed -r 's/service hhvm (start|stop|restart)/systemctl \1 hhvm.service/' \
 -i hphp/tools/oss-repo-mode
 
@@ -131,7 +134,7 @@
 install -Dm644 server.ini "$pkgdir"/etc/hhvm/server.ini
 }
 
-sha256sums=('9bbe243f22fd1d3cf6e6fbc2c7d82db383ec88d7742bf4d24584c2af641b0681'
+sha256sums=('6227c1b24418a0c1bc0e1b09990afda1dddeace492becba210f183087a01cd26'
 'bdf6c71fc023cc7093672a54418e62d058361b4d0fd016c497e9083d93786590'
 'd9a68d98bb9ad263c671b48a5f7f5b8db90b5bffe438922c1b285700f01e824c'
 '7e36c2c10a13a416e5384615e93f55d3742e0d96559d611877b746252e672ed7'
@@ -144,4 +147,5 @@
 '8b50d1ef9f5f726e6d8d469a8c84d85ad63f8b507b97d258b4d751a0e3e221df'
 '59c640602929dac0aa34d06c668ed69361eb4b7b47a77f9aa0badb4d0b61571c'
 '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f'
-'5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0')
+'5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0'
+'4b83a34d76e9a20001d55bf828e6db3272e5f12a7b02a87e902642236ad2ad7c')

Added: namespaces.patch
===
--- namespaces.patch(rev 0)
+++ namespaces.patch2016-03-04 20:17:46 UTC (rev 164834)
@@ -0,0 +1,144 @@
+diff --git a/hphp/runtime/base/tv-helpers.cpp 
b/hphp/runtime/base/tv-helpers.cpp
+index 4e01e81..1a872dd 100644
+--- a/hphp/runtime/base/tv-helpers.cpp
 b/hphp/runtime/base/tv-helpers.cpp
+@@ -14,6 +14,8 @@
++--+
+ */
+ 
++#include 
++
+ #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) {
+ if (tv->m_data.dbl < std::numeric_limits::min()) return false;
+ if (tv->m_data.dbl > std::numeric_limits::max()) return false;
+-if (isnan(tv->m_data.dbl)) return false;
++if (std::isnan(tv->m_data.dbl)) return false;
+   }
+   tvCastToInt64InPlace(tv);
+   return true;
+diff --git a/hphp/runtime/base/zend-printf.cpp 
b/hphp/runtime/base/zend-printf.cpp
+index a008f3a..c6f0fa4 100644
+--- a/hphp/runtime/base/zend-printf.cpp
 b/hphp/runtime/base/zend-printf.cpp
+@@ -18,6 +18,7 @@
+ #include "hphp/runtime/base/zend-printf.h"
+ 
+ #include 
++#include 
+ 
+ #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);
+ appendstring(buffer, "NaN", 3, 0, padding,
+  alignment, 3, is_negative, 0, always_sign);
+ return;
+   }
+ 
+-  if (isinf(number)) {
++  if (std::isinf(number)) {
+ is_negative = (number<0);
+ appendstring(buffer, "INF", 3, 0, padding,
+  alignment, 3, is_negative, 0, always_sign);
+@@ -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("nan");
+ s_len = 3;
+-  } else if (isinf(fp_num)) {
++  } else if (std::isinf(fp_num)) {
+ s = const_cast("inf");
+ s_len = 3;
+   } else {
+@@ -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("NAN");
+  s_len = 3;
+