svn commit: r402675 - in head/databases/pecl-drizzle: . files
Martin Wilke
miwi at FreeBSD.org
Mon Nov 30 14:58:20 UTC 2015
Author: miwi
Date: Mon Nov 30 14:58:18 2015
New Revision: 402675
URL: https://svnweb.freebsd.org/changeset/ports/402675
Log:
- Unbreak build for php 5.X
Approved by: mat (mentor)
Differential Revision: https://reviews.freebsd.org/D4320
Added:
head/databases/pecl-drizzle/files/
head/databases/pecl-drizzle/files/patch-php_drizzle.c (contents, props changed)
Modified:
head/databases/pecl-drizzle/Makefile
Modified: head/databases/pecl-drizzle/Makefile
==============================================================================
--- head/databases/pecl-drizzle/Makefile Mon Nov 30 14:54:08 2015 (r402674)
+++ head/databases/pecl-drizzle/Makefile Mon Nov 30 14:58:18 2015 (r402675)
@@ -18,7 +18,6 @@ LIB_DEPENDS= libdrizzle.so:${PORTSDIR}/d
USES= tar:tgz
USE_PHP= yes
USE_PHPEXT= yes
-IGNORE_WITH_PHP=5 56
OPTIONS_DEFINE= DOCS EXAMPLES
Added: head/databases/pecl-drizzle/files/patch-php_drizzle.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/pecl-drizzle/files/patch-php_drizzle.c Mon Nov 30 14:58:18 2015 (r402675)
@@ -0,0 +1,72 @@
+--- php_drizzle.c.orig 1970-01-01 17:13:08.000000000 +0800
++++ php_drizzle.c 2015-11-30 22:02:21.309689000 +0800
+@@ -1314,9 +1314,13 @@
+ }
+
+ zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ zend_hash_copy(obj->std.properties, &(class_type->default_properties),
+ (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ sizeof(zval *));
++#else
++ object_properties_init((zend_object*) &(obj->std), class_type);
++#endif
+
+ value.handle= zend_objects_store_put(obj,
+ (zend_objects_store_dtor_t)zend_objects_destroy_object,
+@@ -1582,9 +1586,13 @@
+ }
+
+ zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ zend_hash_copy(obj->std.properties, &(class_type->default_properties),
+ (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ sizeof(zval *));
++#else
++ object_properties_init((zend_object*) &(obj->std), class_type);
++#endif
+
+ obj->value.handle= zend_objects_store_put(obj,
+ (zend_objects_store_dtor_t)zend_objects_destroy_object,
+@@ -2505,9 +2513,13 @@
+ }
+
+ zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ zend_hash_copy(obj->std.properties, &(class_type->default_properties),
+ (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ sizeof(zval *));
++#else
++ object_properties_init((zend_object*) &(obj->std), class_type);
++#endif
+
+ obj->value.handle= zend_objects_store_put(obj,
+ (zend_objects_store_dtor_t)zend_objects_destroy_object,
+@@ -3017,9 +3029,13 @@
+ }
+
+ zend_object_std_init(&(result->std), class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ zend_hash_copy(result->std.properties, &(class_type->default_properties),
+ (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ sizeof(zval *));
++#else
++ object_properties_init((zend_object*) &(result->std), class_type);
++#endif
+
+ value.handle= zend_objects_store_put(result,
+ (zend_objects_store_dtor_t)zend_objects_destroy_object,
+@@ -3382,9 +3398,13 @@
+ }
+
+ zend_object_std_init(&(obj->std), class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ zend_hash_copy(obj->std.properties, &(class_type->default_properties),
+ (copy_ctor_func_t)zval_add_ref, (void *)(&tmp),
+ sizeof(zval *));
++#else
++ object_properties_init((zend_object*) &(obj->std), class_type);
++#endif
+
+ value.handle= zend_objects_store_put(obj,
+ (zend_objects_store_dtor_t)zend_objects_destroy_object,
More information about the svn-ports-all
mailing list