fix PHP 8.2 deprecations using patch from

https://github.com/pear/pear-core/pull/124
use SPDX license IDs
This commit is contained in:
Remi Collet 2023-02-20 16:42:02 +01:00
parent 5f719681f7
commit 5a38e22157
2 changed files with 36 additions and 5 deletions

22
pear-php82.patch Normal file
View File

@ -0,0 +1,22 @@
From 4217e3ea503ba6c0651ea2d182fb9cb88f21ce0b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 20 Feb 2023 16:02:34 +0100
Subject: [PATCH] Fix: Creation of dynamic property PEAR_Error::$callback is
deprecated
---
PEAR.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/PEAR.php b/PEAR.php
index fee6638f4..6dba3b010 100644
--- a/PEAR.php
+++ b/PEAR.php
@@ -859,6 +859,7 @@ class PEAR_Error
var $message = '';
var $userinfo = '';
var $backtrace = null;
+ var $callback = null;
/**
* PEAR_Error constructor

View File

@ -27,11 +27,12 @@
Summary: PHP Extension and Application Repository framework
Name: php-pear
Version: 1.10.13
Release: 4%{?dist}
Release: 5%{?dist}
Epoch: 1
# PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD
# Structures_Graph is LGPLv3+
License: BSD and LGPLv3+
# BSD-2-Clause: PEAR, PEAR_Manpages, Archive_Tar, Console_Getopt
# BSD-3-Clause: XML_Util
# LGPL-3.0-or-later: Structures_Graph is LGPLv3+
License: BSD-2-Clause AND BSD-3-Clause AND LGPL-3.0-or-later
URL: http://pear.php.net/package/PEAR
Source0: http://download.pear.php.net/package/PEAR-%{version}%{?pearprever}.tgz
# wget https://raw.githubusercontent.com/pear/pear-core/stable/install-pear.php
@ -47,6 +48,9 @@ Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz
Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz
Source25: http://pear.php.net/get/PEAR_Manpages-%{manpages}.tgz
# Fix PHP 8.2 deprecations
Patch0: pear-php82.patch
BuildArch: noarch
BuildRequires: php(language) > 5.4
BuildRequires: php-cli
@ -219,7 +223,7 @@ install -m 644 -D macros.pear \
# apply patches on installed PEAR tree
pushd %{buildroot}%{peardir}
: no patch
patch -p1 <%{PATCH0}
popd
# Why this file here ?
@ -332,6 +336,11 @@ fi
%changelog
* Mon Feb 20 2023 Remi Collet <remi@remirepo.net> - 1.10.13-5
- fix PHP 8.2 deprecations using patch from
https://github.com/pear/pear-core/pull/124
- use SPDX license IDs
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.10.13-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild