diff options
| -rw-r--r-- | 53533cd4dd972087da705550eeb3e41485d9c5be.patch | 54 | ||||
| -rw-r--r-- | php-pecl-v8js.spec | 13 |
2 files changed, 66 insertions, 1 deletions
diff --git a/53533cd4dd972087da705550eeb3e41485d9c5be.patch b/53533cd4dd972087da705550eeb3e41485d9c5be.patch new file mode 100644 index 0000000..cb83258 --- /dev/null +++ b/53533cd4dd972087da705550eeb3e41485d9c5be.patch @@ -0,0 +1,54 @@ +From 53533cd4dd972087da705550eeb3e41485d9c5be Mon Sep 17 00:00:00 2001 +From: Jan-E <github@ehrhardt.nl> +Date: Tue, 13 Jun 2017 18:14:12 +0200 +Subject: [PATCH] remove ZEND_ACC_CLONE + +--- + v8js_class.cc | 2 +- + v8js_object_export.cc | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/v8js_class.cc b/v8js_class.cc +index 4c27783..c424f32 100644 +--- a/v8js_class.cc ++++ b/v8js_class.cc +@@ -537,7 +537,7 @@ static PHP_METHOD(V8Js, __construct) + continue; + } + +- if ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) != 0) { ++ if ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR)) != 0) { + /* no __construct, __destruct(), or __clone() functions */ + continue; + } +diff --git a/v8js_object_export.cc b/v8js_object_export.cc +index 254e0ed..d733ae2 100644 +--- a/v8js_object_export.cc ++++ b/v8js_object_export.cc +@@ -336,7 +336,7 @@ static void v8js_named_property_enumerator(const v8::PropertyCallbackInfo<v8::Ar + /* Allow only public methods */ + continue; + } +- if ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) != 0) { ++ if ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR)) != 0) { + /* no __construct, __destruct(), or __clone() functions */ + continue; + } +@@ -539,7 +539,7 @@ static void v8js_fake_call_impl(const v8::FunctionCallbackInfo<v8::Value>& info) + + if (method_ptr == NULL || + (method_ptr->common.fn_flags & ZEND_ACC_PUBLIC) == 0 || +- (method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) != 0) { ++ (method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR)) != 0) { + error_len = spprintf(&error, 0, + "%s::__call to %s method %s", ce->name, + (method_ptr == NULL) ? "undefined" : "non-public", method_name); +@@ -619,7 +619,7 @@ v8::Local<v8::Value> v8js_named_property_callback(v8::Local<v8::String> property + (method_ptr = reinterpret_cast<zend_function *> + (zend_hash_find_ptr(&ce->function_table, method_name))) && + ((method_ptr->common.fn_flags & ZEND_ACC_PUBLIC) != 0) && /* Allow only public methods */ +- ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) == 0) /* no __construct, __destruct(), or __clone() functions */ ++ ((method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR)) == 0) /* no __construct, __destruct(), or __clone() functions */ + ) || (method_ptr=NULL, is_magic_call) + ) { + if (callback_type == V8JS_PROP_GETTER) { diff --git a/php-pecl-v8js.spec b/php-pecl-v8js.spec index 5359064..4ae01ee 100644 --- a/php-pecl-v8js.spec +++ b/php-pecl-v8js.spec @@ -18,12 +18,14 @@ Summary: V8 Javascript Engine for PHP Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.4.0 -Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} +Release: 2%{?dist}%{!?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}.tgz +Patch0: 53533cd4dd972087da705550eeb3e41485d9c5be.patch + # See http://pkgs.fedoraproject.org/cgit/rpms/v8.git/tree/v8.spec#n49 # arm is excluded because of bz1334406 ExclusiveArch: %{ix86} x86_64 ppc ppc64 aarch64 %{mips} s390 s390x @@ -53,6 +55,10 @@ Obsoletes: php70w-pecl-%{pecl_name} <= %{version} Obsoletes: php71u-pecl-%{pecl_name} <= %{version} Obsoletes: php71w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.2" +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} +Obsoletes: php72w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -80,6 +86,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p1 -b .upstream + # Sanity check, really often broken extver=$(sed -n '/#define PHP_V8JS_VERSION/{s/.* "//;s/".*$//;p}' php_v8js_macros.h) if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then @@ -227,6 +235,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Wed Jun 21 2017 Remi Collet <remi@remirepo.net> - 1.4.0-2 +- rebuild for 7.2.0alpha2 + * Mon Apr 24 2017 Remi Collet <remi@remirepo.net> - 1.4.0-1 - Update to 1.4.0 |