summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--8.patch23
-rw-r--r--php-pecl-eio.spec24
2 files changed, 34 insertions, 13 deletions
diff --git a/8.patch b/8.patch
new file mode 100644
index 0000000..20cd623
--- /dev/null
+++ b/8.patch
@@ -0,0 +1,23 @@
+From 5fba157143601ac723bba4a39fd92789550c375b Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 26 Jun 2018 08:26:14 +0200
+Subject: [PATCH] fix for PHP 7.3
+
+---
+ php7/php_eio.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/php7/php_eio.c b/php7/php_eio.c
+index 991ed49..1197898 100644
+--- a/php7/php_eio.c
++++ b/php7/php_eio.c
+@@ -161,7 +161,9 @@ static zval * php_eio_call_method(zval *object, zend_class_entry *obj_ce, zend_f
+ } else {
+ zend_fcall_info_cache fcic;
+
++#if PHP_VERSION_ID < 70300
+ fcic.initialized = 1;
++#endif
+ if (!obj_ce) {
+ obj_ce = object ? Z_OBJCE_P(object) : NULL;
+ }
diff --git a/php-pecl-eio.spec b/php-pecl-eio.spec
index 32a3fc8..3be95f3 100644
--- a/php-pecl-eio.spec
+++ b/php-pecl-eio.spec
@@ -1,6 +1,6 @@
# remirepo spec file for php-pecl-eio
#
-# Copyright (c) 2013-2017 Remi Collet
+# Copyright (c) 2013-2018 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -21,7 +21,6 @@
%endif
#global prever RC3
-
#
# NOTE: bundled libeio (which is retired from Fedora)
#
@@ -29,12 +28,14 @@
Summary: Provides interface to the libeio library
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: 2.0.2
-Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP
-Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+Patch0: https://patch-diff.githubusercontent.com/raw/rosmanov/pecl-eio/pull/8.patch
+
+BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel > 5.3
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: %{?scl_prefix}php-sockets
@@ -63,14 +64,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{relea
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
# Other third party repo stuff
-Obsoletes: php53-pecl-%{pecl_name} <= %{version}
-Obsoletes: php53u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php54-pecl-%{pecl_name} <= %{version}
-Obsoletes: php54w-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "5.5"
-Obsoletes: php55u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php55w-pecl-%{pecl_name} <= %{version}
-%endif
%if "%{php_version}" > "5.6"
Obsoletes: php56u-pecl-%{pecl_name} <= %{version}
Obsoletes: php56w-pecl-%{pecl_name} <= %{version}
@@ -119,6 +112,7 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
+%patch0 -p1 -b .pr8
# Sanity check, really often broken
extver=$(sed -n '/define PHP_EIO_VERSION/{s/.* "//;s/".*$//;p}' php%(%{__php} -r 'echo PHP_MAJOR_VERSION;')/php_eio.h)
@@ -186,7 +180,7 @@ do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
done
-%if 0%{?fedora} < 24
+%if 0%{?fedora} < 24 && 0%{?rhel} < 8
# when pear installed alone, after us
%triggerin -- %{?scl_prefix}php-pear
if [ -x %{__pecl} ] ; then
@@ -264,6 +258,10 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Tue Jun 26 2018 Remi Collet <remi@remirepo.net> - 2.0.2-4
+- add patch for PHP 7.3 from
+ https://github.com/rosmanov/pecl-eio/pull/8
+
* Tue Jul 18 2017 Remi Collet <remi@remirepo.net> - 2.0.2-3
- rebuild for PHP 7.2.0beta1 new API