diff options
| -rw-r--r-- | 81315368e643c714319b03809d18170adfb46021.patch | 23 | ||||
| -rw-r--r-- | php-pecl-uopz.spec | 7 |
2 files changed, 29 insertions, 1 deletions
diff --git a/81315368e643c714319b03809d18170adfb46021.patch b/81315368e643c714319b03809d18170adfb46021.patch new file mode 100644 index 0000000..7f3d0c7 --- /dev/null +++ b/81315368e643c714319b03809d18170adfb46021.patch @@ -0,0 +1,23 @@ +From 81315368e643c714319b03809d18170adfb46021 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 6 Sep 2019 11:11:37 +0200 +Subject: [PATCH] fix for 7.4 + +--- + src/copy.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/copy.c b/src/copy.c +index 468232c..c2be302 100644 +--- a/src/copy.c ++++ b/src/copy.c +@@ -127,7 +127,9 @@ static inline zend_op* uopz_copy_opcodes(zend_op_array *op_array, zval *literals + case ZEND_JMP: + case ZEND_FAST_CALL: + case ZEND_DECLARE_ANON_CLASS: ++#if PHP_VERSION_ID < 70400 + case ZEND_DECLARE_ANON_INHERITED_CLASS: ++#endif + opline->op1.jmp_addr = ©[opline->op1.jmp_addr - op_array->opcodes]; + break; + diff --git a/php-pecl-uopz.spec b/php-pecl-uopz.spec index 6e085e8..f7978cf 100644 --- a/php-pecl-uopz.spec +++ b/php-pecl-uopz.spec @@ -24,7 +24,7 @@ Summary: User Operations for Zend Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 6.1.0 -Release: 4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP URL: http://pecl.php.net/package/%{pecl_name} %if 0%{?gh_commit:1} @@ -35,6 +35,7 @@ Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz Patch0: https://github.com/krakjoe/uopz/commit/2b3ab9da097a07825e7f36ee400fa28b8d3ce8e1.patch Patch1: https://github.com/krakjoe/uopz/commit/998a115360e9713c5d2da959dcde3ff49dc1a4fc.patch +Patch2: https://github.com/krakjoe/uopz/commit/81315368e643c714319b03809d18170adfb46021.patch BuildRequires: %{?scl_prefix}php-devel > 7.1 BuildRequires: %{?scl_prefix}php-pear @@ -126,6 +127,7 @@ sed -e 's/role="test"/role="src"/' \ cd NTS %patch0 -p1 -b .up1 %patch1 -p1 -b .up2 +%patch2 -p1 -b .up3 # Sanity check, really often broken extver=$(sed -n '/#define PHP_UOPZ_VERSION/{s/.* "//;s/".*$//;p}' uopz.h) @@ -262,6 +264,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Fri Sep 6 2019 Remi Collet <remi@remirepo.net> - 6.1.0-5 +- add upstream patches for 7.4.0RC1 + * Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 6.1.0-4 - rebuild for 7.4.0RC1 |