[SCM] mapserver branch, master, updated. upstream/6.0.1-25-g98327ed

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 451f6dc5c36d7baf36824102ee30ce1362c8c2c4
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Mar 5 13:22:29 2012 +0100

    Fixed for working with PHP 5.4.

diff --git a/debian/changelog b/debian/changelog
index 58a839d..32f5798 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mapserver (6.0.1-3) unstable; urgency=low
     (closes: #661914)
   * Added fixgeos patch to use correcly the geos-config script.
   * Minimum version for geos set to 3.3.1.
+  * Added patch php54 to work with PHP 5.4 too, and reflect changes in the API.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 05 Mar 2012 12:43:32 +0100
 
diff --git a/debian/patches/php54 b/debian/patches/php54
new file mode 100644
index 0000000..527e46b
--- /dev/null
+++ b/debian/patches/php54
@@ -0,0 +1,42 @@
+Index: mapserver/mapscript/php/php_mapscript_util.c
+===================================================================
+--- mapserver.orig/mapscript/php/php_mapscript_util.c	2011-12-23 11:16:03.000000000 +0100
++++ mapserver/mapscript/php/php_mapscript_util.c	2012-03-05 13:20:05.000000000 +0100
+@@ -37,12 +37,18 @@
+                                        void (*zend_objects_free_object) TSRMLS_DC)
+ {
+     zend_object_value retval;
++#if PHP_VERSION_ID < 50399
+     zval *temp;
++#endif
+     
+     zobj->ce = ce;
+     ALLOC_HASHTABLE(zobj->properties);
+     zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
++#if PHP_VERSION_ID < 50399
+     zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
++#else
++    object_properties_init(zobj, ce);
++#endif
+     retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
+     retval.handlers = &mapscript_std_object_handlers;
+     return retval;
+@@ -54,12 +60,18 @@
+                                           zend_object_handlers *object_handlers TSRMLS_DC)
+ {
+     zend_object_value retval;
++#if PHP_VERSION_ID < 50399
+     zval *temp;
++#endif
+     
+     zobj->ce = ce;
+     ALLOC_HASHTABLE(zobj->properties);
+     zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
++#if PHP_VERSION_ID < 50399
+     zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
++#else
++    object_properties_init(zobj, ce);
++#endif
+     retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
+     retval.handlers = object_handlers;
+     return retval;
diff --git a/debian/patches/series b/debian/patches/series
index 3900795..c7a7b70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fixgeos
+php54

-- 
Mapserver