From c728df9820cc07e6461c818d6ec6fcbd139b7faf Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 10 Oct 2016 11:03:17 +0200
Subject: zephir-parser: new snapshot but still broken

---
 zephir-parser.spec | 12 ++++++++----
 zephir-rpm.patch   | 13 ++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/zephir-parser.spec b/zephir-parser.spec
index 9732e11..04d1d16 100644
--- a/zephir-parser.spec
+++ b/zephir-parser.spec
@@ -16,16 +16,16 @@
 
 # Get commit from PHP_PHALCON_ZEPVERSION in 
 # https://github.com/phalcon/cphalcon/blob/master/ext/php_phalcon.h
-%global gh_commit    e716dbe641fe731031dba38a63af599d1c384824
+%global gh_commit    22f663212836d6dadd5c5d4239ada4f9d30406c9
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_date      20160728
+%global gh_date      20160929
 %global gh_owner     phalcon
 %global gh_project   zephir
 %global ext_name     zephir_parser
 
 Name:           %{?scl_prefix}%{gh_project}-parser
-Version:        0.9.3
-Release:        2%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:        0.9.4
+Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Summary:        Zephir parser extension
 
 Group:          Development/Libraries
@@ -155,6 +155,7 @@ make install -C parser INSTALL_ROOT=%{buildroot}
 sed -e 's:%ZEPHIRDIR%:%{buildroot}%{_datadir}/%{gh_project}:g' \
     -e 's: php:%{_bindir}/php:' \
      bin/%{gh_project}.rpm > bin/%{gh_project}.test
+sh ./bin/%{gh_project}.test version
 sh ./bin/%{gh_project}.test version | grep %{version}
 
 : Check extension
@@ -190,6 +191,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 10 2016 Remi Collet <remi@fedoraproject.org> - 0.9.4-1.20160929git22f6632
+- new snapshot to fix PHP 7.1 compatibility of generated code
+
 * Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 0.9.3-2.20160728gite716dbe
 - rebuild for PHP 7.1 new API version
 
diff --git a/zephir-rpm.patch b/zephir-rpm.patch
index 505e682..30b5ea7 100644
--- a/zephir-rpm.patch
+++ b/zephir-rpm.patch
@@ -1,11 +1,11 @@
 diff -up bin/zephir.rpm bin/zephir
---- bin/zephir.rpm	2016-07-30 18:49:46.000000000 +0200
-+++ bin/zephir	2016-07-30 18:52:16.000000000 +0200
-@@ -1,27 +1,9 @@
- #!/bin/bash
+--- bin/zephir.rpm	2016-10-10 10:45:24.937478208 +0200
++++ bin/zephir	2016-10-10 10:47:47.437248408 +0200
+@@ -1,26 +1,8 @@
+ #!/bin/sh
 -if [ -z "$ZEPHIRDIR" ]; then
 -  ZEPHIRDIR="%ZEPHIRDIR%"
--  if [[ "$ZEPHIRDIR" == "%""ZEPHIRDIR""%" ]]; then
+-  if [ "$ZEPHIRDIR" = "%""ZEPHIRDIR""%" ]; then
 -    if [ -h $0 ]; then
 -        REALPATH="`dirname $0`/`readlink $0`"
 -        CURDIR=`dirname $REALPATH`
@@ -24,11 +24,10 @@ diff -up bin/zephir.rpm bin/zephir
 -fi
 +export ZEPHIRDIR="@DATADIR@/zephir"
  
- if [[ $1 && $2 && $3 && "$1"=="-c" ]]; then
+ if [ ! -z $1 ] && [ ! -z $2 ] && [ ! -z $3 ] && [ "$1" = "-c" ]; then
 -    php -d safe_mode=Off -d enable_dl=On -c $2 $ZEPHIRDIR/compiler.php ${*:3}
 +    @BINDIR@/php -d memory_limit=1G -d extension=zephir_parser.so -c $2 $ZEPHIRDIR/compiler.php ${*:3}
  else
 -    php -d safe_mode=Off -d enable_dl=On $ZEPHIRDIR/compiler.php $*
 +    @BINDIR@/php -d memory_limit=1G -d extension=zephir_parser.so $ZEPHIRDIR/compiler.php $*
  fi
- 
-- 
cgit