diff options
| author | Remi Collet <remi@remirepo.net> | 2026-04-04 09:16:25 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2026-04-04 09:16:25 +0200 |
| commit | 2b5629870988103a4fcb508c8a4725a048309604 (patch) | |
| tree | b357f606200eafc5a1ba0209a893b0cb773ba7b8 | |
| parent | 224403f8d384d752d70667184ec96622e00a34cd (diff) | |
add patch for 8.5 / build from full sources tree
| -rw-r--r-- | 0001-Fix-16874-missing-include.patch | 24 | ||||
| -rw-r--r-- | php-phalcon5.spec | 9 |
2 files changed, 33 insertions, 0 deletions
diff --git a/0001-Fix-16874-missing-include.patch b/0001-Fix-16874-missing-include.patch new file mode 100644 index 0000000..4b42c78 --- /dev/null +++ b/0001-Fix-16874-missing-include.patch @@ -0,0 +1,24 @@ +From 646b02c3351ee209c335a9409cd0effd7b7a0e5a Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Sat, 4 Apr 2026 09:09:22 +0200 +Subject: [PATCH] Fix #16874 missing include + +--- + ext/kernel/backtrace.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ext/kernel/backtrace.c b/ext/kernel/backtrace.c +index 702686038e..ccc148684d 100644 +--- a/ext/kernel/backtrace.c ++++ b/ext/kernel/backtrace.c +@@ -12,6 +12,7 @@ + #ifndef ZEPHIR_RELEASE + #if defined(linux) && !defined(ALPINE_LINUX) || defined(DARWIN) || defined(__APPLE__) + ++#include <php.h> + #include <execinfo.h> + #include <Zend/zend.h> + #if PHP_VERSION_ID < 80500 +-- +2.53.0 + diff --git a/php-phalcon5.spec b/php-phalcon5.spec index feaacbc..a43d8b2 100644 --- a/php-phalcon5.spec +++ b/php-phalcon5.spec @@ -52,6 +52,8 @@ Release: 1%{?dist} URL: https://phalcon.io/ Source0: %{forgesource} +Patch0: 0001-Fix-16874-missing-include.patch + BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 8.1 BuildRequires: %{?scl_prefix}php-pear @@ -100,7 +102,12 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -qc +pushd %{archivename} +%patch -P0 -p1 +popd + pushd %{sources} + # Sanity check, really often broken extver=$(sed -n '/#define PHP_PHALCON_VERSION/{s/.* "//;s/".*$//;p}' php_phalcon.h) if test "x${extver}" != "x%{upstream_version}%{?upstream_prever:%{upstream_prever}}"; then @@ -238,6 +245,8 @@ done - add support for 8.5, drop 8.0 - open https://github.com/phalcon/cphalcon/issues/16874 ext tree is unusable for PHP 8.5 +- open https://github.com/phalcon/cphalcon/pull/16875 + missing include * Sat Jan 3 2026 Remi Collet <remi@remirepo.net> - 5.10.0-1 - update to 5.10.0 |