summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-01-14 11:47:11 +0100
committerRemi Collet <remi@remirepo.net>2020-01-14 11:47:11 +0100
commitff74cd8305972528ee1beba7046042c87656ad6d (patch)
treeb054682115ea874c73b02ead3a255e8356a9be1b
parentef4b9ec3cda8091b0537428f93fb118a91d60ad6 (diff)
rebuild with libxlsxwriter 0.9.3HEADmaster
add patch from https://github.com/viest/php-ext-xlswriter/pull/226
-rw-r--r--226.patch25
-rw-r--r--PHPINFO4
-rw-r--r--php-pecl-xlswriter.spec14
3 files changed, 38 insertions, 5 deletions
diff --git a/226.patch b/226.patch
new file mode 100644
index 0000000..b5a99eb
--- /dev/null
+++ b/226.patch
@@ -0,0 +1,25 @@
+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) {
diff --git a/PHPINFO b/PHPINFO
index f76118e..27f1258 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -3,7 +3,7 @@ xlswriter
xlswriter support => enabled
Version => 1.3.3.2
-libxlsxwriter headers version => 0.9.1
-libxlsxwriter library version => 0.9.1
+libxlsxwriter headers version => 0.9.3
+libxlsxwriter library version => 0.9.3
libxlsxio headers version => 0.2.21
libxlsxio library version => 0.2.21
diff --git a/php-pecl-xlswriter.spec b/php-pecl-xlswriter.spec
index c12e18c..7dd998f 100644
--- a/php-pecl-xlswriter.spec
+++ b/php-pecl-xlswriter.spec
@@ -1,6 +1,6 @@
# remirepo spec file for php-pecl-xlswriter
#
-# Copyright (c) 2018-2019 Remi Collet
+# Copyright (c) 2018-2020 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -22,17 +22,19 @@
%global ini_name 40-%{pecl_name}.ini
# No soname, so manage dependency on available version
-%global libxlsxwriter_version 0.9.1
+%global libxlsxwriter_version 0.9.3
%global libxlsxio_version 0.2.21
Summary: An efficient and fast xlsx file export extension
Name: %{?sub_prefix}php-pecl-%{pecl_name}
Version: 1.3.3.2
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 2%{?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
@@ -105,6 +107,8 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
+%patch0 -p1 -b .pr226
+
# we use the system libraries
rm -r library
@@ -250,6 +254,10 @@ cd ..
%changelog
+* Tue Jan 14 2020 Remi Collet <remi@remirepo.net> - 1.3.3.2-2
+- rebuild with libxlsxwriter 0.9.3
+- add patch from https://github.com/viest/php-ext-xlswriter/pull/226
+
* Wed Jan 1 2020 Remi Collet <remi@remirepo.net> - 1.3.3.2-1
- update to 1.3.3.2