diff options
| author | Remi Collet <remi@remirepo.net> | 2024-06-06 10:44:03 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-06-06 10:44:03 +0200 |
| commit | 3e818862cb1120788bc66fa85ba00a3588878a23 (patch) | |
| tree | 12eb606caa5e1e888bc7599610395f18620a1e54 /php-pecl-swoole5.spec | |
| parent | 3bc96772fc3ee55730b11773be306d0413d524d5 (diff) | |
fix build warnings (errors with GCC 14) using patch from
https://github.com/swoole/swoole-src/pull/5363
Diffstat (limited to 'php-pecl-swoole5.spec')
| -rw-r--r-- | php-pecl-swoole5.spec | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/php-pecl-swoole5.spec b/php-pecl-swoole5.spec index 5ff68b4..69e0d30 100644 --- a/php-pecl-swoole5.spec +++ b/php-pecl-swoole5.spec @@ -24,11 +24,11 @@ %bcond_with oracle %ifarch aarch64 -%global oraclever 19.19 +%global oraclever 19.22 %global oraclelib 19.1 -%global oracledir 19.19 +%global oracledir 19.22 %else -%global oraclever 21.11 +%global oraclever 21.13 %global oraclelib 21.1 %global oracledir 21 %endif @@ -54,7 +54,7 @@ %bcond_without nghttpd2 -%global upstream_version 5.1.2 +%global upstream_version 5.1.3 #global upstream_prever RC2 %global sources %{pecl_name}-%{upstream_version}%{?upstream_prever} %global _configure ../%{sources}/configure @@ -62,7 +62,7 @@ Summary: PHP's asynchronous concurrent distributed networking framework Name: %{?scl_prefix}php-pecl-%{pecl_name}5 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} # Extension is Apache-2.0 # BSD-3-Clause: Hiredis # MIT: nlohmann/json, nghttp2 @@ -70,6 +70,9 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz +Patch0: 0001-missing-header.patch +Patch1: 0002-fix-implicit-int.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ @@ -189,6 +192,9 @@ sed \ cd %{sources} +%patch -P0 -p1 +%patch -P1 -p1 + cp -p thirdparty/hiredis/COPYING hiredis-COPYING %if %{with nghttpd2} rm -r thirdparty/nghttp2 @@ -248,6 +254,8 @@ peclbuild() { %endif %if %{with brotli} --enable-brotli \ +%else + --disable-brotli \ %endif %if %{with nghttpd2} --with-nghttp2-dir=%{_root_prefix} \ @@ -381,6 +389,11 @@ cd ../ZTS %changelog +* Thu Jun 6 2024 Remi Collet <remi@remirepo.net> - 5.1.3-1 +- update to 5.1.3 +- fix build warnings (errors with GCC 14) using patch from + https://github.com/swoole/swoole-src/pull/5363 + * Mon May 13 2024 Remi Collet <remi@remirepo.net> - 5.1.2-2 - refresh sources - drop patch merged upstream |