packages: php/spl-shared.patch - up to 5.3.1
glen
glen at pld-linux.org
Fri Nov 27 18:04:19 CET 2009
Author: glen Date: Fri Nov 27 17:04:19 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 5.3.1
---- Files affected:
packages/php:
spl-shared.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/php/spl-shared.patch
diff -u packages/php/spl-shared.patch:1.3 packages/php/spl-shared.patch:1.4
--- packages/php/spl-shared.patch:1.3 Sun Oct 18 19:04:40 2009
+++ packages/php/spl-shared.patch Fri Nov 27 18:04:14 2009
@@ -1,17 +1,16 @@
---- php-5.2.11/ext/spl/config.m4~ 2006-12-04 20:01:53.000000000 +0200
-+++ php-5.2.11/ext/spl/config.m4 2009-09-23 16:07:37.775732678 +0300
-@@ -26,7 +26,7 @@
+--- php-5.3.1/ext/spl/config.m4~ 2009-11-26 23:54:34.000000000 +0000
++++ php-5.3.1/ext/spl/config.m4 2009-11-27 08:04:05.788823797 +0000
+@@ -22,6 +22,6 @@
CPPFLAGS=$old_CPPFLAGS
AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed])
AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support])
-- PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c, no)
-+ PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c, $ext_shared)
- PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_sxe.h])
+- PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no)
++ PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, $ext_shared)
+ PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h])
PHP_ADD_EXTENSION_DEP(spl, pcre, true)
- fi
---- php-5.2.11/ext/spl/spl_iterators.c~ 2009-09-23 17:57:06.000000000 +0300
-+++ php-5.2.11/ext/spl/spl_iterators.c 2009-09-23 17:57:09.025079005 +0300
-@@ -57,7 +57,13 @@
+--- php-5.3.1/ext/spl/spl_iterators.c~ 2009-07-04 20:31:27.000000000 +0000
++++ php-5.3.1/ext/spl/spl_iterators.c 2009-11-27 16:35:33.729087793 +0000
+@@ -58,7 +58,13 @@
PHPAPI zend_class_entry *spl_ce_AppendIterator;
PHPAPI zend_class_entry *spl_ce_RegexIterator;
PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
@@ -22,10 +21,10 @@
+#else
PHPAPI zend_class_entry *spl_ce_Countable;
+#endif
+ PHPAPI zend_class_entry *spl_ce_RecursiveTreeIterator;
- zend_function_entry spl_funcs_RecursiveIterator[] = {
- SPL_ABSTRACT_ME(RecursiveIterator, hasChildren, NULL)
-@@ -2950,6 +2956,10 @@
+ ZEND_BEGIN_ARG_INFO(arginfo_recursive_it_void, 0)
+@@ -3286,6 +3292,10 @@
REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator);
REGISTER_SPL_ITERATOR(EmptyIterator);
@@ -33,12 +32,12 @@
+ spl_ce_Countable_p = spl_ce_Countable;
+#endif
+
- return SUCCESS;
- }
- /* }}} */
---- php-5.2.11/ext/spl/spl_iterators.h 2009-09-23 17:57:59.898412166 +0300
-+++ php-5.2.11/ext/spl/spl_iterators.h 2009-09-23 18:04:45.518458679 +0300
-@@ -50,7 +50,12 @@
+ REGISTER_SPL_SUB_CLASS_EX(RecursiveTreeIterator, RecursiveIteratorIterator, spl_RecursiveTreeIterator_new, spl_funcs_RecursiveTreeIterator);
+ REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_CURRENT", RTIT_BYPASS_CURRENT);
+ REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_KEY", RTIT_BYPASS_KEY);
+--- php-5.3.1/ext/spl/spl_iterators.h~ 2008-12-31 11:15:49.000000000 +0000
++++ php-5.3.1/ext/spl/spl_iterators.h 2009-11-27 16:36:35.215748808 +0000
+@@ -51,7 +51,12 @@
extern PHPAPI zend_class_entry *spl_ce_AppendIterator;
extern PHPAPI zend_class_entry *spl_ce_RegexIterator;
extern PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
@@ -51,24 +50,24 @@
PHP_MINIT_FUNCTION(spl_iterators);
---- php-5.2.11/ext/standard/array.c~ 2009-08-14 09:18:47.000000000 +0300
-+++ php-5.2.11/ext/standard/array.c 2009-09-24 16:40:24.630430291 +0300
-@@ -48,6 +48,9 @@
- #include "php_smart_str.h"
+--- php-5.3.1/ext/standard/array.c~ 2009-08-14 06:20:21.000000000 +0000
++++ php-5.3.1/ext/standard/array.c 2009-11-27 16:37:15.029078323 +0000
+@@ -49,6 +49,9 @@
#ifdef HAVE_SPL
#include "ext/spl/spl_array.h"
+ #endif
+#if COMPILE_DL_SPL
+PHPAPI zend_class_entry *spl_ce_Countable_p = NULL; // external one
+#endif
- #endif
/* {{{ defines */
---- php-5.2.11/ext/pdo/pdo.c~ 2009-07-20 01:46:03.000000000 +0300
-+++ php-5.2.11/ext/pdo/pdo.c 2009-10-14 13:33:30.397508159 +0300
-@@ -127,7 +127,7 @@
+ #define EXTR_OVERWRITE 0
+--- php-5.3.1/ext/pdo/pdo.c~ 2009-07-19 22:46:03.000000000 +0000
++++ php-5.3.1/ext/pdo/pdo.c 2009-11-27 16:37:51.332409104 +0000
+@@ -132,7 +132,7 @@
/* {{{ pdo_functions[] */
#if ZEND_MODULE_API_NO >= 20050922
- static zend_module_dep pdo_deps[] = {
+ static const zend_module_dep pdo_deps[] = {
-#ifdef HAVE_SPL
+#ifdef HAVE_SPL && !COMPILE_DL_SPL
ZEND_MOD_REQUIRED("spl")
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/spl-shared.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list