Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 18 Jan 2020 18:24:19 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r523443 - in head/devel/pecl-protobuf: . files
Message-ID:  <202001181824.00IIOJXe082531@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: sunpoet
Date: Sat Jan 18 18:24:18 2020
New Revision: 523443
URL: https://svnweb.freebsd.org/changeset/ports/523443

Log:
  Fix build with PHP 7.4

Added:
  head/devel/pecl-protobuf/files/
  head/devel/pecl-protobuf/files/patch-protobuf.h   (contents, props changed)
Modified:
  head/devel/pecl-protobuf/Makefile

Modified: head/devel/pecl-protobuf/Makefile
==============================================================================
--- head/devel/pecl-protobuf/Makefile	Sat Jan 18 18:24:13 2020	(r523442)
+++ head/devel/pecl-protobuf/Makefile	Sat Jan 18 18:24:18 2020	(r523443)
@@ -12,6 +12,5 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		localbase php:pecl
-IGNORE_WITH_PHP=	74
 
 .include <bsd.port.mk>

Added: head/devel/pecl-protobuf/files/patch-protobuf.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/pecl-protobuf/files/patch-protobuf.h	Sat Jan 18 18:24:18 2020	(r523443)
@@ -0,0 +1,38 @@
+--- protobuf.h.orig	2019-12-14 00:46:15 UTC
++++ protobuf.h
+@@ -292,7 +292,7 @@
+ 
+ #define PHP_PROTO_HASH_OF(array) Z_ARRVAL_P(&array)
+ 
+-static inline int php_proto_zend_hash_index_update_zval(HashTable* ht, ulong h,
++static inline int php_proto_zend_hash_index_update_zval(HashTable* ht, zend_ulong h,
+                                                         zval* pData) {
+   void* result = NULL;
+   result = zend_hash_index_update(ht, h, pData);
+@@ -308,7 +308,7 @@ static inline int php_proto_zend_hash_update(HashTable
+   return result != NULL ? SUCCESS : FAILURE;
+ }
+ 
+-static inline int php_proto_zend_hash_index_update_mem(HashTable* ht, ulong h,
++static inline int php_proto_zend_hash_index_update_mem(HashTable* ht, zend_ulong h,
+                                                    void* pData, uint nDataSize,
+                                                    void** pDest) {
+   void* result = NULL;
+@@ -337,7 +337,7 @@ static inline int php_proto_zend_hash_update_mem(HashT
+ }
+ 
+ static inline int php_proto_zend_hash_index_find_zval(const HashTable* ht,
+-                                                      ulong h, void** pDest) {
++                                                      zend_ulong h, void** pDest) {
+   zval* result = zend_hash_index_find(ht, h);
+   if (pDest != NULL) *pDest = result;
+   return result != NULL ? SUCCESS : FAILURE;
+@@ -351,7 +351,7 @@ static inline int php_proto_zend_hash_find(const HashT
+ }
+ 
+ static inline int php_proto_zend_hash_index_find_mem(const HashTable* ht,
+-                                                     ulong h, void** pDest) {
++                                                     zend_ulong h, void** pDest) {
+   void* result = NULL;
+   result = zend_hash_index_find_ptr(ht, h);
+   if (pDest != NULL) *pDest = result;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001181824.00IIOJXe082531>