From 479c402b036aaea957c89eaf4b77c01b9ad37ab5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 8 Jul 2019 13:08:52 +0200
Subject: add upstream patch to fix PHP 5.6 build

---
 15bc0173ef7b06ef16e477e8b12c3eac5bcf2abc.patch | 48 ++++++++++++++++++++++++++
 php-pecl-rdkafka.spec                          |  8 ++++-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 15bc0173ef7b06ef16e477e8b12c3eac5bcf2abc.patch

diff --git a/15bc0173ef7b06ef16e477e8b12c3eac5bcf2abc.patch b/15bc0173ef7b06ef16e477e8b12c3eac5bcf2abc.patch
new file mode 100644
index 0000000..95474cf
--- /dev/null
+++ b/15bc0173ef7b06ef16e477e8b12c3eac5bcf2abc.patch
@@ -0,0 +1,48 @@
+From 15bc0173ef7b06ef16e477e8b12c3eac5bcf2abc Mon Sep 17 00:00:00 2001
+From: Arnaud Le Blanc <arnaud.lb@gmail.com>
+Date: Wed, 3 Jul 2019 18:54:11 +0200
+Subject: [PATCH] Fix PHP 5.6 build
+
+---
+ rdkafka.c | 4 ++--
+ travis.sh | 2 +-
+ zeval.h   | 4 ++++
+ 3 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/rdkafka.c b/rdkafka.c
+index 74bc2b1..fd9c9d1 100644
+--- a/rdkafka.c
++++ b/rdkafka.c
+@@ -567,8 +567,8 @@ PHP_METHOD(RdKafka__Kafka, queryWatermarkOffsets)
+         return;
+     }
+ 
+-    ZVAL_DEREF(lowResult);
+-    ZVAL_DEREF(highResult);
++    ZEVAL_DEREF(lowResult);
++    ZEVAL_DEREF(highResult);
+ 
+     intern = get_kafka_object(getThis() TSRMLS_CC);
+     if (!intern) {
+diff --git a/zeval.h b/zeval.h
+index 62d445c..74c2711 100644
+--- a/zeval.h
++++ b/zeval.h
+@@ -31,6 +31,8 @@ typedef zval zeval;
+ #define ZEVAL_DUP_C
+ #define ZEVAL_DUP_CC
+ 
++#define ZEVAL_DEREF(v) ZVAL_DEREF(v)
++
+ /***************************************************************************/
+ #elif defined(ZEND_ENGINE_2)
+ 
+@@ -59,6 +61,8 @@ typedef zval* zeval;
+ #define ZEVAL_DUP_C    1
+ #define ZEVAL_DUP_CC , 1
+ 
++#define ZEVAL_DEREF(v) (v)
++
+ /***************************************************************************/
+ #else
+ # error "Unknown Zend Engine version"
diff --git a/php-pecl-rdkafka.spec b/php-pecl-rdkafka.spec
index 2ae8220..90e4f38 100644
--- a/php-pecl-rdkafka.spec
+++ b/php-pecl-rdkafka.spec
@@ -21,11 +21,13 @@
 Summary:        Kafka client based on librdkafka
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        3.1.1
-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:        MIT
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
+Patch0:         https://github.com/arnaud-lb/php-rdkafka/commit/15bc0173ef7b06ef16e477e8b12c3eac5bcf2abc.patch
+
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  librdkafka-devel > 0.8
 BuildRequires:  %{?scl_prefix}php-devel > 5.6
@@ -91,6 +93,7 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
+%patch0 -p1 -b .up
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_RDKAFKA_VERSION/{s/.* "//;s/".*$//;p}' php_rdkafka.h)
@@ -206,6 +209,9 @@ cd ../ZTS
 
 
 %changelog
+* Mon Jul  8 2019 Remi Collet <remi@remirepo.net> - 3.1.1-2
+- add upstream patch to fix PHP 5.6 build
+
 * Wed Jul  3 2019 Remi Collet <remi@remirepo.net> - 3.1.1-1
 - update to 3.1.1
 - open https://github.com/arnaud-lb/php-rdkafka/issues/235
-- 
cgit