[packages/php/dev-7.3] up to 7.3.0beta3
glen
glen at pld-linux.org
Wed Sep 5 18:32:51 CEST 2018
commit 848c281a1b608463dcc1e1c171426a6ffb28e28b
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Wed Sep 5 18:38:34 2018 +0300
up to 7.3.0beta3
php-link-libs.patch | 8 ++++----
php-pear.patch | 33 ++++++++++++++++++---------------
php.spec | 15 +++++++--------
spl-shared.patch | 12 ++++++------
4 files changed, 35 insertions(+), 33 deletions(-)
---
diff --git a/php.spec b/php.spec
index 8c61f61..01d698d 100644
--- a/php.spec
+++ b/php.spec
@@ -144,7 +144,7 @@
%undefine with_filter
%endif
-%define subver alpha3
+%define subver beta3
%define orgname php
%define ver_suffix 73
%define php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -164,8 +164,8 @@ Epoch: 4
License: PHP 3.01 and Zend and BSD
Group: Libraries
#Source0: https://php.net/distributions/%{orgname}-%{version}.tar.xz
-Source0: https://downloads.php.net/~cmb/php-%{version}alpha3.tar.xz
-# Source0-md5: 7abe998a27daf8507b79086b542317f0
+Source0: https://downloads.php.net/~cmb/php-%{version}%{subver}.tar.xz
+# Source0-md5: fe3e3ac34ba995c56b9f71b458abe248
Source1: opcache.ini
Source2: %{orgname}-mod_php.conf
Source3: %{orgname}-cgi-fcgi.ini
@@ -307,9 +307,9 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir %{php_sysconfdir}
# must be in sync with source. extra check ensuring that it is so is done in %%build
-%define php_api_version 20180606
-%define zend_module_api 20180606
-%define zend_extension_api 320180606
+%define php_api_version 20180731
+%define zend_module_api 20180731
+%define zend_extension_api 320180731
%define php_pdo_api_version 20170320
# Extension versions
@@ -3523,8 +3523,7 @@ fi
%files xmlwriter
%defattr(644,root,root,755)
-%doc ext/xmlwriter/{CREDITS,TODO}
-%doc ext/xmlwriter/examples
+%doc ext/xmlwriter/CREDITS
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/xmlwriter.ini
%attr(755,root,root) %{php_extensiondir}/xmlwriter.so
diff --git a/php-link-libs.patch b/php-link-libs.patch
index c20149e..9a37701 100644
--- a/php-link-libs.patch
+++ b/php-link-libs.patch
@@ -8,16 +8,16 @@
PHP_CHECK_FUNC(dlopen, dl)
if test "$ac_cv_func_dlopen" = "yes"; then
---- php-5.2.0/acinclude.m4.orig 2006-12-22 21:52:13.766461055 +0100
-+++ php-5.2.0/acinclude.m4 2006-12-22 21:52:37.159794165 +0100
-@@ -1740,18 +1740,18 @@
+--- php-7.3.0beta3/acinclude.m4~ 2018-08-28 13:26:36.000000000 +0300
++++ php-7.3.0beta3/acinclude.m4 2018-09-05 18:56:49.744106256 +0300
+@@ -1829,18 +1829,18 @@
dnl Wrapper for AC_CHECK_LIB
dnl
AC_DEFUN([PHP_CHECK_LIBRARY], [
- save_old_LDFLAGS=$LDFLAGS
+ save_old_LIBS=$LIBS
ac_stuff="$5"
-
+
save_ext_shared=$ext_shared
ext_shared=yes
- PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS)
diff --git a/php-pear.patch b/php-pear.patch
index 74a03d6..2772cd1 100644
--- a/php-pear.patch
+++ b/php-pear.patch
@@ -1,5 +1,5 @@
---- php-5.3.1/configure.ac~ 2010-02-19 23:26:13.000000000 +0200
-+++ php-5.3.1/configure.ac 2010-02-19 23:27:58.273207305 +0200
+--- php-7.3.0beta3/configure.ac~ 2018-09-05 19:02:49.000000000 +0300
++++ php-7.3.0beta3/configure.ac 2018-09-05 19:04:13.237533903 +0300
@@ -934,11 +934,6 @@
with_pear=no
fi
@@ -12,23 +12,26 @@
PHP_ARG_WITH(pear, [whether to install PEAR],
[ --with-pear=DIR Install PEAR in DIR [PREFIX/lib/php]
--without-pear Do not install PEAR], DEFAULT, yes)
-@@ -1023,11 +1023,11 @@
- dnl
- dnl PEAR dependancies
- dnl
+@@ -1137,19 +1137,6 @@
+ --without-pear Do not install PEAR], DEFAULT, yes)
+
+ if test "$PHP_PEAR" != "no"; then
+-
+- dnl
+- dnl PEAR dependencies
+- dnl
- if test "$PHP_XML" = "no"; then
-- pear_error_msg="$pear_error_msg
+- pear_error_msg="$pear_error_msg
- PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)"
- fi
-
-+dnl if test "$PHP_XML" = "no"; then
-+dnl pear_error_msg="$pear_error_msg
-+dnl PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)"
-+dnl fi
-+dnl
- dnl
- dnl if test "$PHP_XMLRPC" = "no"; then
- dnl pear_error_msg="$pear_error_msg
+- if test "$pear_error_msg"; then
+- AC_MSG_ERROR([$pear_error_msg])
+- fi
+-
+ install_pear="install-pear"
+ PEAR_INSTALLDIR=$PHP_PEAR
+
--- php-5.2.6/sapi/cli/config.m4~ 2008-11-16 18:35:31.000000000 +0200
+++ php-5.2.6/sapi/cli/config.m4 2008-11-20 19:04:12.585061299 +0200
@@ -4,7 +4,7 @@
diff --git a/spl-shared.patch b/spl-shared.patch
index a928d0c..d51ca9b 100644
--- a/spl-shared.patch
+++ b/spl-shared.patch
@@ -1,9 +1,9 @@
---- php-7.0/ext/spl/config.m4~ 2015-05-21 17:57:06.000000000 +0300
-+++ php-7.0/ext/spl/config.m4 2015-05-23 11:25:19.609715006 +0300
-@@ -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-7.3.0beta3/ext/spl/config.m4~ 2018-08-28 13:26:31.000000000 +0300
++++ php-7.3.0beta3/ext/spl/config.m4 2018-09-05 19:06:13.737232662 +0300
+@@ -1,6 +1,6 @@
+ dnl config.m4 for extension SPL
+
+ 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_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+ 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,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
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])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/848c281a1b608463dcc1e1c171426a6ffb28e28b
More information about the pld-cvs-commit
mailing list