[packages/php/dev-7.1] update spl-shared.patch
glen
glen at pld-linux.org
Mon Jul 4 18:16:39 CEST 2016
commit a44eaa989edb99d1b658ef50eda4561b57047830
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Jul 4 19:15:17 2016 +0300
update spl-shared.patch
it patched totally wrong chunk
php.spec | 2 +-
spl-shared.patch | 13 +++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/php.spec b/php.spec
index b64bae3..f229547 100644
--- a/php.spec
+++ b/php.spec
@@ -133,7 +133,7 @@
%undefine with_filter
%endif
-%define rel 0.1
+%define rel 0.4
%define subver alpha2
%define orgname php
%define ver_suffix 71
diff --git a/spl-shared.patch b/spl-shared.patch
index 4696e4e..cf0fc4e 100644
--- a/spl-shared.patch
+++ b/spl-shared.patch
@@ -50,18 +50,19 @@
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 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/a44eaa989edb99d1b658ef50eda4561b57047830
More information about the pld-cvs-commit
mailing list