[94571] trunk/dports/php/php-gdchart

[ryandesign at macports.org]

Revision: 94571
          https://trac.macports.org/changeset/94571
Author:   ryandesign at macports.org
Date:     2012-06-22 16:42:55 -0700 (Fri, 22 Jun 2012)
Log Message:
-----------
php-gdchart: add php 5.4 support

Modified Paths:
--------------
    trunk/dports/php/php-gdchart/Portfile
    trunk/dports/php/php-gdchart/files/patch-gdchart.c.diff

Modified: trunk/dports/php/php-gdchart/Portfile
===================================================================
--- trunk/dports/php/php-gdchart/Portfile	2012-06-22 23:39:08 UTC (rev 94570)
+++ trunk/dports/php/php-gdchart/Portfile	2012-06-22 23:42:55 UTC (rev 94571)
@@ -11,7 +11,7 @@
 maintainers         nomaintainer
 license             PHP
 
-php.branches        5.3
+php.branches        5.3 5.4
 php.pecl            yes
 php.pecl.name       GDChart
 php.pecl.prerelease yes

Modified: trunk/dports/php/php-gdchart/files/patch-gdchart.c.diff
===================================================================
--- trunk/dports/php/php-gdchart/files/patch-gdchart.c.diff	2012-06-22 23:39:08 UTC (rev 94570)
+++ trunk/dports/php/php-gdchart/files/patch-gdchart.c.diff	2012-06-22 23:42:55 UTC (rev 94571)
@@ -1,6 +1,7 @@
 http://svn.php.net/viewvc?view=revision&revision=297236
---- gdchart.c.orig	(revision 297235)
-+++ gdchart.c	(revision 297236)
+and another patch to fix "error: ‘zend_class_entry’ has no member named ‘default_properties’"
+--- gdchart.c.orig	2006-01-03 15:05:29.000000000 -0600
++++ gdchart.c	2012-06-22 18:35:27.000000000 -0500
 @@ -192,7 +192,7 @@
   *
   * Every user visible function must have an entry in gdchart_functions[].
@@ -10,3 +11,15 @@
  	{NULL, NULL, NULL}	/* Must be the last line in gdchart_functions[] */
  };
  /* }}} */
+@@ -300,7 +300,11 @@
+ 
+ 	ALLOC_HASHTABLE(intern->zo.properties);
+         zend_hash_init(intern->zo.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
++#if PHP_VERSION_ID < 50399
+ 	zend_hash_copy(intern->zo.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
++#else
++	object_properties_init(&(intern->zo), class_type);
++#endif
+ 
+ #if ZEND_MODULE_API_NO >= 20050922
+ 	intern->zo.guards = NULL;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120622/dff5d578/attachment.html>