diff options
| author | Remi Collet <remi@remirepo.net> | 2025-07-08 15:11:05 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-07-08 15:11:05 +0200 |
| commit | 8f81f31671945fa24e3ad1752d27056d249cc476 (patch) | |
| tree | ae62b40ed2c9398e5a069b0961e1db508f20972e | |
| parent | 1bcdab02f576f0224ce04e6ed649312aa7c85395 (diff) | |
add patch for test suite with PHP 8.5 from
https://github.com/m6w6/ext-pq/pull/53
| -rw-r--r-- | 53.patch | 24 | ||||
| -rw-r--r-- | php-pecl-pq.spec | 17 |
2 files changed, 37 insertions, 4 deletions
diff --git a/53.patch b/53.patch new file mode 100644 index 0000000..ed40ab8 --- /dev/null +++ b/53.patch @@ -0,0 +1,24 @@ +From da7fe208d67f10ed106aec33163496e42a129022 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 8 Jul 2025 15:07:07 +0200 +Subject: [PATCH] Relax text expectation (for 8.5) + +-Warning: fclose(): %d is not a valid stream resource in ... ++Warning: fclose(): cannot close the provided stream, as it must not be manually closed in ... +--- + tests/lob003.phpt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/lob003.phpt b/tests/lob003.phpt +index f6d846e..c25dac7 100644 +--- a/tests/lob003.phpt ++++ b/tests/lob003.phpt +@@ -25,7 +25,7 @@ Test + resource(%d) of type (stream) + resource(%d) of type (stream) + +-Warning: fclose(): %d is not a valid stream resource in %s on line %d ++Warning: fclose(): %s in %s on line %d + resource(%d) of type (stream) + string(0) "" + DONE diff --git a/php-pecl-pq.spec b/php-pecl-pq.spec index adad0ab..d3a2006 100644 --- a/php-pecl-pq.spec +++ b/php-pecl-pq.spec @@ -1,8 +1,8 @@ # remirepo spec file for php-pecl-pq # -# Copyright (c) 2014-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2014-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -23,11 +23,13 @@ Summary: PostgreSQL client library (libpq) binding Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 2.2.3 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz License: BSD-2-Clause URL: https://pecl.php.net/package/%{pecl_name} +Patch0: 53.patch + BuildRequires: libpq-devel > 9 BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -74,6 +76,8 @@ sed -e '/role="test"/d' \ -i package.xml cd %{sources} +%patch -P0 -p1 -b .pr53 + # Sanity check, really often broken extver=$(sed -n '/#define PHP_PQ_VERSION/{s/.* "//;s/".*$//;p}' php_pq.h) if test "x${extver}" != "x%{version}%{?prever}"; then @@ -221,6 +225,11 @@ exit $RET %changelog +* Tue Jul 8 2025 Remi Collet <remi@remirepo.net> - 2.2.3-3 +- re-license spec file to CECILL-2.1 +- add patch for test suite with PHP 8.5 from + https://github.com/m6w6/ext-pq/pull/53 + * Fri Feb 16 2024 Remi Collet <remi@remirepo.net> - 2.2.3-2 - F40: fix build dependencies |