summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-06-06 09:04:18 +0200
committerRemi Collet <remi@remirepo.net>2019-06-06 09:04:18 +0200
commitc12af14cad98c0dd3b5b055c73858ebd56753b19 (patch)
tree39bb87cbe20513b656dfe909639de244e5016487
parentdf3dcddff2a9e7bf94d8791b865fe2e2a478c66f (diff)
add upstream patch for 7.4HEADmaster
-rw-r--r--e1ebead8120aa27a3bdd14f00e468df1a4ff7a7e.patch24
-rw-r--r--php-pecl-seaslog.spec20
2 files changed, 35 insertions, 9 deletions
diff --git a/e1ebead8120aa27a3bdd14f00e468df1a4ff7a7e.patch b/e1ebead8120aa27a3bdd14f00e468df1a4ff7a7e.patch
new file mode 100644
index 0000000..01f2a9a
--- /dev/null
+++ b/e1ebead8120aa27a3bdd14f00e468df1a4ff7a7e.patch
@@ -0,0 +1,24 @@
+From e1ebead8120aa27a3bdd14f00e468df1a4ff7a7e Mon Sep 17 00:00:00 2001
+From: wujunze <itwujunze@163.com>
+Date: Tue, 28 May 2019 11:39:05 +0800
+Subject: [PATCH] php 70400 define ZEND_ACC_IMPLICIT_PUBLIC ZEND_ACC_PUBLIC
+
+---
+ include/php7_wrapper.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/include/php7_wrapper.h b/include/php7_wrapper.h
+index 701ce34..c3fa839 100644
+--- a/include/php7_wrapper.h
++++ b/include/php7_wrapper.h
+@@ -14,6 +14,10 @@
+ +----------------------------------------------------------------------+
+ */
+
++#if !defined(ZEND_ACC_IMPLICIT_PUBLIC)
++# define ZEND_ACC_IMPLICIT_PUBLIC ZEND_ACC_PUBLIC
++#endif
++
+ #if PHP_VERSION_ID >= 70000
+
+ # define SEASLOG_MAKE_ZVAL(z) zval _stack_zval_##z; z = &(_stack_zval_##z)
diff --git a/php-pecl-seaslog.spec b/php-pecl-seaslog.spec
index 0d1fd17..7f39dbe 100644
--- a/php-pecl-seaslog.spec
+++ b/php-pecl-seaslog.spec
@@ -31,6 +31,8 @@ License: PHP
URL: http://pecl.php.net/package/%{proj_name}
Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz
+Patch0: https://github.com/SeasX/SeasLog/commit/e1ebead8120aa27a3bdd14f00e468df1a4ff7a7e.patch
+
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel
BuildRequires: %{?scl_prefix}php-pear
@@ -52,14 +54,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{rele
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
# Other third party repo stuff
-%if "%{php_version}" > "5.6"
-Obsoletes: php56u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php56w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.0"
-Obsoletes: php70u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php70w-pecl-%{pecl_name} <= %{version}
-%endif
%if "%{php_version}" > "7.1"
Obsoletes: php71u-pecl-%{pecl_name} <= %{version}
Obsoletes: php71w-pecl-%{pecl_name} <= %{version}
@@ -69,9 +63,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
@@ -108,6 +106,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 SEASLOG_VERSION /{s/.* "//;s/".*$//;p}' include/SeasLog.h)
@@ -260,6 +259,9 @@ fi
%changelog
+* Thu Jun 6 2019 Remi Collet <remi@remirepo.net> - 2.0.2-2
+- add upstream patch for 7.4
+
* Tue Feb 12 2019 Remi Collet <remi@remirepo.net> - 2.0.2-1
- update to 2.0.2
- add dependency on %{?scl_prefix}php-json