summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-06-28 06:06:16 +0200
committerRemi Collet <remi@remirepo.net>2019-06-28 06:06:16 +0200
commit11ff8defc1bf87bfb36e08dee9d49a72c99629b5 (patch)
tree300d7ba16331ba36939b0d3e509ae1e6e86aefd0
parent33d0a3eea172b82fe0d4f34ad76d293e5f76ddb2 (diff)
v0.10.16v0.10
-rw-r--r--1251b877c4e3962c8d4d89d5a210fb380f8177ca.patch40
-rw-r--r--zephir.spec11
2 files changed, 6 insertions, 45 deletions
diff --git a/1251b877c4e3962c8d4d89d5a210fb380f8177ca.patch b/1251b877c4e3962c8d4d89d5a210fb380f8177ca.patch
deleted file mode 100644
index 142758d..0000000
--- a/1251b877c4e3962c8d4d89d5a210fb380f8177ca.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 873bc5031c511abbcbaa17117b86d0109f0fef91 Mon Sep 17 00:00:00 2001
-From: Joe Watkins <krakjoe@php.net>
-Date: Thu, 6 Jun 2019 18:43:30 +0200
-Subject: [PATCH] really fix incorrect usage of zend_declare_class_constant_ex,
- for PHP >=7.2
-
----
- kernels/ZendEngine3/main.c | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/kernels/ZendEngine3/main.c b/kernels/ZendEngine3/main.c
-index c940e0e26..c8d45ce0b 100644
---- a/kernels/ZendEngine3/main.c
-+++ b/kernels/ZendEngine3/main.c
-@@ -387,7 +387,24 @@ zend_class_entry* zephir_get_internal_ce(const char *class_name, unsigned int cl
- /* Declare constants */
- int zephir_declare_class_constant(zend_class_entry *ce, const char *name, size_t name_length, zval *value)
- {
--#if PHP_VERSION_ID >= 70100
-+#if PHP_VERSION_ID >= 70200
-+ int ret;
-+ zend_string *key;
-+
-+ if (ce->type == ZEND_INTERNAL_CLASS) {
-+ key = zend_string_init_interned(name, name_length, 1);
-+ } else {
-+ key = zend_string_init(name, name_length, 0);
-+ }
-+
-+ zend_declare_class_constant_ex(ce, key, value, ZEND_ACC_PUBLIC, NULL);
-+
-+ if (ce->type != ZEND_INTERNAL_CLASS) {
-+ zend_string_release(key);
-+ }
-+
-+ return ret;
-+#elif PHP_VERSION_ID >= 70100
- int ret;
-
- zend_string *key = zend_string_init(name, name_length, ce->type & ZEND_INTERNAL_CLASS);
diff --git a/zephir.spec b/zephir.spec
index 0736c9d..fbf12f4 100644
--- a/zephir.spec
+++ b/zephir.spec
@@ -21,7 +21,7 @@
# Get commit from PHP_PHALCON_ZEPVERSION in
# https://github.com/phalcon/cphalcon/blob/master/ext/php_phalcon.h
-%global gh_commit 5e3e4828916188802e2a91d782e6cbb7dce687f0
+%global gh_commit 6826149172ce2c7cfc16ead5ce2aac45d92c66b0
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20161126
%global gh_owner phalcon
@@ -30,8 +30,8 @@
%global parser_ver 1.1.1
Name: %{?scl_prefix}%{gh_project}
-Version: 0.10.15
-Release: 2%{?gh_date:.%{gh_date}.%{gh_short}}%{?dist}
+Version: 0.10.16
+Release: 1%{?gh_date:.%{gh_date}.%{gh_short}}%{?dist}
Summary: Zephir language for creation of extensions for PHP.
License: MIT
@@ -40,7 +40,6 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
# Adapt path used in RPM
Patch0: %{gh_project}-rpm.patch
-Patch1: https://github.com/phalcon/zephir/commit/1251b877c4e3962c8d4d89d5a210fb380f8177ca.patch
BuildArch: noarch
BuildRequires: %{?scl_prefix}php-devel > 5.5
@@ -113,7 +112,6 @@ Compiler design goals:
%patch0 -p0 -b .rpm
sed -e 's:@DATADIR@:%{_datadir}:;s:@BINDIR@:%{_bindir}:' \
-i bin/%{gh_project}
-%patch1 -p1 -b .up
find . -name \*.php -exec chmod -x {} \;
@@ -162,6 +160,9 @@ sh ./bin/%{gh_project}.test version | grep %{version}
%changelog
+* Fri Jun 28 2019 Remi Collet <remi@remirepo.net> - 0.10.16-1
+- update to 0.10.16
+
* Thu Jun 27 2019 Remi Collet <remi@remirepo.net> - 0.10.15-2
- build with upstream patch for
https://github.com/phalcon/cphalcon/issues/14160