summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-06-06 08:58:26 +0200
committerRemi Collet <remi@remirepo.net>2019-06-06 08:58:26 +0200
commit9ea017c4d1e706353625fea62a3c4e3eb59cdfd9 (patch)
tree3d7e3ba164aa3491f579a868a50e5e8ae941a32c
parent219280f975aadfa9e9219e77c07c5f12861a725e (diff)
add upstream patch for 7.4HEADmaster
-rw-r--r--fe089abf1a34a1ae5575bd7cc8b9bfa9a6605e16.patch27
-rw-r--r--php-pecl-seasclick.spec14
2 files changed, 39 insertions, 2 deletions
diff --git a/fe089abf1a34a1ae5575bd7cc8b9bfa9a6605e16.patch b/fe089abf1a34a1ae5575bd7cc8b9bfa9a6605e16.patch
new file mode 100644
index 0000000..43631ad
--- /dev/null
+++ b/fe089abf1a34a1ae5575bd7cc8b9bfa9a6605e16.patch
@@ -0,0 +1,27 @@
+From fe089abf1a34a1ae5575bd7cc8b9bfa9a6605e16 Mon Sep 17 00:00:00 2001
+From: Panda <itwujunze@163.com>
+Date: Tue, 28 May 2019 16:22:15 +0800
+Subject: [PATCH] PHP 7.4 support
+
+PHP 7.4 support
+fix: https://github.com/SeasX/SeasClick/issues/1
+---
+ php7_wrapper.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/php7_wrapper.h b/php7_wrapper.h
+index e856b15..2306ff8 100644
+--- a/php7_wrapper.h
++++ b/php7_wrapper.h
+@@ -15,6 +15,11 @@
+ | Author: SeasX Group <ahhhh.wang@gmail.com> |
+ +----------------------------------------------------------------------+
+ */
++// PHP7.4 +
++#if !defined(ZEND_ACC_IMPLICIT_PUBLIC)
++# define ZEND_ACC_IMPLICIT_PUBLIC ZEND_ACC_PUBLIC
++#endif
++
+ // PHP7+
+ #if PHP_MAJOR_VERSION < 7
+
diff --git a/php-pecl-seasclick.spec b/php-pecl-seasclick.spec
index b37acd3..567a3ca 100644
--- a/php-pecl-seasclick.spec
+++ b/php-pecl-seasclick.spec
@@ -28,11 +28,13 @@
Summary: An Yandex ClickHouse client driven extension for PHP
Name: %{?sub_prefix}php-pecl-%{lowername}
Version: 0.1.0
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: ASL 2.0
URL: http://pecl.php.net/package/%{proj_name}
Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz
+Patch0: https://github.com/SeasX/SeasClick/commit/fe089abf1a34a1ae5575bd7cc8b9bfa9a6605e16.patch
+
%if 0%{?rhel} == 6
BuildRequires: devtoolset-6-toolchain
%else
@@ -67,9 +69,13 @@ Obsoletes: php72u-pecl-%{pecl_name} <= %{version}
Obsoletes: php72w-pecl-%{pecl_name} <= %{version}
%endif
%if "%{php_version}" > "7.3"
-Obsoletes: php73u-pecl-%{pecl_name} <= %{version}
+Obsoletes: php73-pecl-%{pecl_name} <= %{version}
Obsoletes: php73w-pecl-%{pecl_name} <= %{version}
%endif
+%if "%{php_version}" > "7.4"
+Obsoletes: php74-pecl-%{pecl_name} <= %{version}
+Obsoletes: php74w-pecl-%{pecl_name} <= %{version}
+%endif
%endif
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -96,6 +102,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_SEASCLICK_VERSION /{s/.* "//;s/".*$//;p}' php_SeasClick.h)
@@ -219,5 +226,8 @@ fi
%changelog
+* Thu Jun 6 2019 Remi Collet <remi@remirepo.net> - 0.1.0-2
+- add upstream patch for 7.4
+
* Thu Mar 28 2019 Remi Collet <remi@remirepo.net> - 0.1.0-1
- initial package, version 0.1.0