aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2015-11-30 22:58:18 +0800
committermiwi <miwi@FreeBSD.org>2015-11-30 22:58:18 +0800
commitb35b2db7b77a92f6a47ba4695d409ae1074b7746 (patch)
treee652d824b9d6154f13ef7d4184ebee41474244c3 /databases
parenta6923e95c3240d841910504f8e940c44d5edbb43 (diff)
downloadfreebsd-ports-gnome-b35b2db7b77a92f6a47ba4695d409ae1074b7746.tar.gz
freebsd-ports-gnome-b35b2db7b77a92f6a47ba4695d409ae1074b7746.tar.zst
freebsd-ports-gnome-b35b2db7b77a92f6a47ba4695d409ae1074b7746.zip
- Unbreak build for php 5.X
Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D4320
Diffstat (limited to 'databases')
-rw-r--r--databases/pecl-drizzle/Makefile1
-rw-r--r--databases/pecl-drizzle/files/patch-php_drizzle.c72
2 files changed, 72 insertions, 1 deletions
diff --git a/databases/pecl-drizzle/Makefile b/databases/pecl-drizzle/Makefile
index 7a48f15d02b4..b7325a44b2cc 100644
--- a/databases/pecl-drizzle/Makefile
+++ b/databases/pecl-drizzle/Makefile
@@ -18,7 +18,6 @@ LIB_DEPENDS= libdrizzle.so:${PORTSDIR}/databases/libdrizzle
USES= tar:tgz
USE_PHP= yes
USE_PHPEXT= yes
-IGNORE_WITH_PHP=5 56
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/databases/pecl-drizzle/files/patch-php_drizzle.c b/databases/pecl-drizzle/files/patch-php_drizzle.c
new file mode 100644
index 000000000000..9afdd80cc786
--- /dev/null
+++ b/databases/pecl-drizzle/files/patch-php_drizzle.c
@@ -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,