diff options
| author | Remi Collet <remi@remirepo.net> | 2020-05-26 07:29:40 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-05-26 07:29:40 +0200 |
| commit | f2000a423fecf5c6f53bdfd40a92b81ca8acaec9 (patch) | |
| tree | c162f91df209946d703d878539b0cb393c9dc62b | |
| parent | ef79129cd51ae33a52b71f476d33de381baae614 (diff) | |
update to 1.3.5
drop patch merged upstream
| -rw-r--r-- | 226.patch | 25 | ||||
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 11 | ||||
| -rw-r--r-- | php-pecl-xlswriter.spec | 11 |
4 files changed, 16 insertions, 33 deletions
diff --git a/226.patch b/226.patch deleted file mode 100644 index b5a99eb..0000000 --- a/226.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c190802563372c2394f94cb9df3ee563ec701e63 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 14 Jan 2020 11:37:29 +0100 -Subject: [PATCH] fix build with libxlsxwriter-0.9.3 - ---- - kernel/write.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/kernel/write.c b/kernel/write.c -index 0467c61..cd7042b 100644 ---- a/kernel/write.c -+++ b/kernel/write.c -@@ -915,7 +915,11 @@ _populate_range_data_cache(lxw_workbook *self, lxw_series_range *range) - return; - } - -+#if defined(LXW_VERSION_ID) && LXW_VERSION_ID >= 93 -+ cell_obj = lxw_worksheet_find_cell_in_row(row_obj, col_num); -+#else - cell_obj = lxw_worksheet_find_cell(row_obj, col_num); -+#endif - - if (cell_obj) { - if (cell_obj->type == NUMBER_CELL) { @@ -2,7 +2,7 @@ xlswriter xlswriter support => enabled -Version => 1.3.4.1 +Version => 1.3.5 libxlsxwriter headers version => 0.9.4 libxlsxwriter library version => 0.9.4 libxlsxio headers version => 0.2.26 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #100 xlswriter version 1.3.4.1 ] { +Extension [ <persistent> extension #101 xlswriter version 1.3.5 ] { - Classes [4] { Class [ <internal:xlswriter> class Vtiful\Kernel\Exception extends Exception implements Throwable ] { @@ -100,7 +100,7 @@ Extension [ <persistent> extension #100 xlswriter version 1.3.4.1 ] { Property [ <default> private $read_row_type ] } - - Methods [33] { + - Methods [34] { Method [ <internal:xlswriter, ctor> public method __construct ] { - Parameters [1] { @@ -130,6 +130,13 @@ Extension [ <persistent> extension #100 xlswriter version 1.3.4.1 ] { } } + Method [ <internal:xlswriter> public method activateSheet ] { + + - Parameters [1] { + Parameter #0 [ <required> $sheet_name ] + } + } + Method [ <internal:xlswriter> public method constMemory ] { - Parameters [2] { diff --git a/php-pecl-xlswriter.spec b/php-pecl-xlswriter.spec index a81090c..3da20d6 100644 --- a/php-pecl-xlswriter.spec +++ b/php-pecl-xlswriter.spec @@ -27,14 +27,12 @@ Summary: An efficient and fast xlsx file export extension Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.3.4.1 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.3.5 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz -Patch0: https://patch-diff.githubusercontent.com/raw/viest/php-ext-xlswriter/pull/226.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear @@ -107,7 +105,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .pr226 # we use the system libraries rm -r library @@ -254,6 +251,10 @@ cd .. %changelog +* Tue May 26 2020 Remi Collet <remi@remirepo.net> - 1.3.5-1 +- update to 1.3.5 +- drop patch merged upstream + * Mon Apr 13 2020 Remi Collet <remi@remirepo.net> - 1.3.4.1-1 - update to 1.3.4.1 |