]> git.pld-linux.org Git - packages/php.git/commitdiff
update spl-shared.patch
authorElan Ruusamäe <glen@delfi.ee>
Mon, 4 Jul 2016 16:15:17 +0000 (19:15 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Mon, 4 Jul 2016 16:15:17 +0000 (19:15 +0300)
it patched totally wrong chunk

php.spec
spl-shared.patch

index b64bae3fea2508110655502069ac30f9ed32e963..f2295472bb896a7031baf72d35174e645c905843 100644 (file)
--- a/php.spec
+++ b/php.spec
 %undefine      with_filter
 %endif
 
-%define                rel             0.1
+%define                rel             0.4
 %define                subver  alpha2
 %define                orgname php
 %define                ver_suffix 71
index 4696e4e91d03a7dcd3533b7b5327dd8f458f99a1..cf0fc4ed436bb2e539d6ffded83048d00534063c 100644 (file)
  extern PHPAPI zend_class_entry *spl_ce_CallbackFilterIterator;
  extern PHPAPI zend_class_entry *spl_ce_RecursiveCallbackFilterIterator;
  
---- 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
+--- php-7.1.0alpha2/ext/standard/array.c~      2016-07-04 17:52:16.000000000 +0300
++++ php-7.1.0alpha2/ext/standard/array.c       2016-07-04 18:54:43.937173429 +0300
+@@ -48,6 +48,10 @@
+ #include "zend_smart_str.h"
  #include "ext/spl/spl_array.h"
- #endif
 +#if COMPILE_DL_SPL
 +PHPAPI zend_class_entry *spl_ce_Countable_p = NULL; // external one
 +#endif
++
  /* {{{ defines */
  #define EXTR_OVERWRITE                        0
+ #define EXTR_SKIP                             1
 --- php-7.1.0alpha1/ext/pdo/pdo.c~     2016-06-07 23:56:47.000000000 +0300
 +++ php-7.1.0alpha1/ext/pdo/pdo.c      2016-06-13 23:24:51.238259131 +0300
 @@ -117,7 +117,9 @@
This page took 0.061623 seconds and 4 git commands to generate.