From 3f0dc34803209c9b85c2f4e5c4a94877c6291179 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Oct 2021 09:37:41 +0200 Subject: rename patch --- php-8.0.0-parser.patch | 16 ---------------- php-8.1.0-parser.patch | 16 ++++++++++++++++ php.spec | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 php-8.0.0-parser.patch create mode 100644 php-8.1.0-parser.patch diff --git a/php-8.0.0-parser.patch b/php-8.0.0-parser.patch deleted file mode 100644 index f443f1d..0000000 --- a/php-8.0.0-parser.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php ---- ./build/gen_stub.php.syslib 2020-06-25 08:11:51.782046813 +0200 -+++ ./build/gen_stub.php 2020-06-25 08:13:11.188860368 +0200 -@@ -1075,6 +1075,12 @@ function initPhpParser() { - } - - $isInitialized = true; -+ -+ if (file_exists('/usr/share/php/PhpParser4/autoload.php')) { -+ require_once '/usr/share/php/PhpParser4/autoload.php'; -+ return; -+ } -+ - $version = "4.12.0"; - $phpParserDir = __DIR__ . "/PHP-Parser-$version"; - if (!is_dir($phpParserDir)) { diff --git a/php-8.1.0-parser.patch b/php-8.1.0-parser.patch new file mode 100644 index 0000000..f443f1d --- /dev/null +++ b/php-8.1.0-parser.patch @@ -0,0 +1,16 @@ +diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php +--- ./build/gen_stub.php.syslib 2020-06-25 08:11:51.782046813 +0200 ++++ ./build/gen_stub.php 2020-06-25 08:13:11.188860368 +0200 +@@ -1075,6 +1075,12 @@ function initPhpParser() { + } + + $isInitialized = true; ++ ++ if (file_exists('/usr/share/php/PhpParser4/autoload.php')) { ++ require_once '/usr/share/php/PhpParser4/autoload.php'; ++ return; ++ } ++ + $version = "4.12.0"; + $phpParserDir = __DIR__ . "/PHP-Parser-$version"; + if (!is_dir($phpParserDir)) { diff --git a/php.spec b/php.spec index 1e51be1..7793389 100644 --- a/php.spec +++ b/php.spec @@ -176,7 +176,7 @@ Patch10: php-7.0.7-curl.patch # Functional changes # Use system nikic/php-parser -Patch41: php-8.0.0-parser.patch +Patch41: php-8.1.0-parser.patch # use system tzdata Patch43: php-8.1.0-systzdata-v21.patch # See http://bugs.php.net/53436 -- cgit