diff --git a/.gitignore b/.gitignore index 736757c..b240e18 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /xdebug-3.2.2-a909eb0.tar.gz /xdebug-3.3.0alpha2-9b96425.tar.gz /xdebug-3.3.0alpha3-a03bda1.tar.gz +/xdebug-3.3.0-15d672e.tar.gz diff --git a/916.patch b/916.patch deleted file mode 100644 index ef61153..0000000 --- a/916.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d9a61214ca40418dba961858029dc00e79977056 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Sun, 22 Oct 2023 08:55:38 +0200 -Subject: [PATCH] Update xdebug.ini - ---- - xdebug.ini | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/xdebug.ini b/xdebug.ini -index c983bef23..9d091b4c7 100644 ---- a/xdebug.ini -+++ b/xdebug.ini -@@ -1,9 +1,5 @@ - ; This file is generated by the 'xdebug.org:html/docs/convert.php' robot --<<<<<<< Updated upstream --; for Xdebug 3.3.0alpha2 — do not modify by hand --======= - ; for Xdebug 3.3.0alpha3 — do not modify by hand -->>>>>>> Stashed changes - - ; ----------------------------------------------------------------------------- - ; xdebug.cli_color diff --git a/php-pecl-xdebug3.spec b/php-pecl-xdebug3.spec index e1cbcf1..e76ea99 100644 --- a/php-pecl-xdebug3.spec +++ b/php-pecl-xdebug3.spec @@ -13,13 +13,13 @@ %global pecl_name xdebug %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global gh_commit a03bda14ba866a34e7f90399078c73eadb1ecbfe +%global gh_commit 15d672e84caa6015d1b2b509aa13a0528d6e9a7e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) # version/release %global upstream_version 3.3.0 -%global upstream_prever alpha3 -%global upstream_lower %(echo %{upstream_prever} | tr '[:upper:]' '[:lower:]') +#global upstream_prever alpha3 +#global upstream_lower %%(echo %%{upstream_prever} | tr '[:upper:]' '[:lower:]') %global sources src %global _configure ../%{sources}/configure @@ -29,11 +29,9 @@ Name: php-pecl-xdebug3 Summary: Provides functions for function traces and profiling Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} -Release: 2%{?dist} +Release: 1%{?dist} Source0: https://github.com/%{pecl_name}/%{pecl_name}/archive/%{gh_commit}/%{pecl_name}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz -Patch0: https://patch-diff.githubusercontent.com/raw/xdebug/xdebug/pull/916.patch - License: Xdebug-1.03 URL: https://xdebug.org/ @@ -44,7 +42,7 @@ BuildRequires: php-pear BuildRequires: php-simplexml BuildRequires: libtool BuildRequires: php-soap -# BuildRequires: gdb +BuildRequires: pkgconfig(zlib) >= 1.2.9 Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} @@ -89,8 +87,6 @@ mv %{sources}/package.xml . sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml cd %{sources} -%patch -P0 -p1 - # Check extension version ver=$(sed -n '/XDEBUG_VERSION/{s/.* "//;s/".*$//;p}' php_xdebug.h) if test "$ver" != "%{upstream_version}%{?upstream_prever}%{?gh_date:-dev}"; then @@ -110,7 +106,6 @@ zend_extension=%{pecl_name}.so ; Configuration ; See https://xdebug.org/docs/all_settings - EOF sed -e '1,2d' %{sources}/%{pecl_name}.ini >>%{ini_name} @@ -124,6 +119,7 @@ cd %{sources} cd ../NTS %configure \ --enable-xdebug \ + --with-xdebug-compression \ --with-php-config=%{__phpconfig} make %{?_smp_mflags} @@ -131,6 +127,7 @@ make %{?_smp_mflags} cd ../ZTS %configure \ --enable-xdebug \ + --with-xdebug-compression \ --with-php-config=%{__ztsphpconfig} make %{?_smp_mflags} %endif @@ -236,6 +233,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Fri Dec 1 2023 Remi Collet - 3.3.0-1 +- update to 3.3.0 + * Sun Oct 22 2023 Remi Collet - 3.3.0~alpha3-2 - fix configuration file using patch from https://github.com/xdebug/xdebug/pull/916 diff --git a/sources b/sources index 042354b..f96c87f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xdebug-3.3.0alpha3-a03bda1.tar.gz) = a5d1305a7c190662268a2467a8fcf9b77b2093f747a1083460117aa9da46b306da12e4e64ec188a8570ef92d5c1adf218c366a192067caadd94dde20e0ffff2d +SHA512 (xdebug-3.3.0-15d672e.tar.gz) = e243417570813709953f451648a75fa09848e6dca16114ed40bbbf51ec2c95ddea6cabd153651cc1fa43f2ea6ff3c046a9bbdfee615df7424f35c95ce5094bb5