sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-28 17:06:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build with PHP 7.4 and unbreak this port

Browse source 
It has merged by upstream.

Reference:	1b66fdaecb
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2019-12-08 16:59:35 +00:00
parent d2923b6ab9
commit 1c7ef70a9b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=519381
3 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
devel/pecl-mustache/Makefile
View file

@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
LIB_DEPENDS= libmustache.so:devel/libmustache LIB_DEPENDS= libmustache.so:devel/libmustache
USES= compiler:c++11-lang php:pecl USES= compiler:c++11-lang php:pecl
IGNORE_WITH_PHP= 74
USE_CXXSTD= c++11 USE_CXXSTD= c++11

29
devel/pecl-mustache/files/patch-mustache_data.cpp Normal file
View file

@ -0,0 +1,29 @@
--- mustache_data.cpp.orig 2019-05-27 21:52:06 UTC
+++ mustache_data.cpp
@@ -136,7 +136,7 @@ static zend_always_inline void mustache_
{
HashTable * data_hash = NULL;
long data_count = 0;
- ulong key_nindex = 0;
+ zend_ulong key_nindex = 0;
zend_string * key;
std::string ckey;
zval * data_entry = NULL;
@@ -228,7 +228,7 @@ static zend_always_inline void mustache_
static zend_always_inline void mustache_data_from_object_properties_zval(mustache::Data * node, zval * current)
{
HashTable * data_hash = NULL;
- ulong key_nindex = 0;
+ zend_ulong key_nindex = 0;
zend_string * key;
std::string ckey;
zval * data_entry = NULL;
@@ -311,7 +311,7 @@ static zend_always_inline void mustache_
static zend_always_inline void mustache_data_from_object_functions_zval(mustache::Data * node, zval * current)
{
HashTable * data_hash = NULL;
- ulong key_nindex = 0;
+ zend_ulong key_nindex = 0;
zend_string * key;
std::string ckey;
zval * data_entry = NULL;

11
devel/pecl-mustache/files/patch-mustache_mustache.cpp Normal file
View file

@ -0,0 +1,11 @@
--- mustache_mustache.cpp.orig 2019-05-27 21:52:06 UTC
+++ mustache_mustache.cpp
@@ -231,7 +231,7 @@ bool mustache_parse_partials_param(zval
mustache::Node::Partials * partials)
{
HashTable * data_hash = NULL;
- ulong key_nindex = 0;
+ zend_ulong key_nindex = 0;
// Ignore if not an array
if( array == NULL || Z_TYPE_P(array) != IS_ARRAY ) {