rebuild with libxlsxwriter 0.8.2

2 files changed, 66 insertions, 2 deletions

diff --git a/php-pecl-xlswriter.spec b/php-pecl-xlswriter.spec
index 51335c0..8be054f 100644
--- a/php-pecl-xlswriter.spec
+++ b/php-pecl-xlswriter.spec
@@ -25,12 +25,12 @@
 %global ini_name     40-%{pecl_name}.ini
 
 # No soname, so manage dependency on available version
-%global libxlsxwriter_version 0.8.1
+%global libxlsxwriter_version 0.8.2
 
 Summary:        An efficient and fast xlsx file export extension
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        1.2.2
-Release:        6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        7%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        BSD
 URL:            http://pecl.php.net/package/%{pecl_name}
 Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
@@ -245,6 +245,9 @@ cd ..
 
 
 %changelog
+* Mon Sep 17 2018 Remi Collet <remi@remirepo.net> - 1.2.2-7
+- rebuild with libxlsxwriter 0.8.2
+
 * Sun Sep 16 2018 Remi Collet <remi@remirepo.net> - 1.2.2-6
 - rebuild with libxlsxwriter 0.8.1
 
diff --git a/xlswriter-build.patch b/xlswriter-build.patch
new file mode 100644
index 0000000..15526e5
--- /dev/null
+++ b/xlswriter-build.patch
@@ -0,0 +1,61 @@
+diff -up ./kernel/excel.c.fixbuild ./kernel/excel.c
+--- ./kernel/excel.c.fixbuild	2018-07-11 14:15:31.000000000 +0200
++++ ./kernel/excel.c	2018-09-12 11:26:05.455567873 +0200
+@@ -10,10 +10,6 @@
+   +----------------------------------------------------------------------+
+ */
+ 
+-#ifdef HAVE_CONFIG_H
+-#include "config.h"
+-#endif
+-
+ #include "include.h"
+ 
+ zend_class_entry *vtiful_xls_ce;
+diff -up ./kernel/format.c.fixbuild ./kernel/format.c
+--- ./kernel/format.c.fixbuild	2018-07-11 14:15:31.000000000 +0200
++++ ./kernel/format.c	2018-09-12 11:26:05.456567879 +0200
+@@ -10,10 +10,6 @@
+   +----------------------------------------------------------------------+
+ */
+ 
+-#ifdef HAVE_CONFIG_H
+-#include "config.h"
+-#endif
+-
+ #include "include.h"
+ #include "ext/standard/php_var.h"
+ 
+diff -up ./kernel/include.h.fixbuild ./kernel/include.h
+--- ./kernel/include.h.fixbuild	2018-07-11 14:15:31.000000000 +0200
++++ ./kernel/include.h	2018-09-12 11:26:05.456567879 +0200
+@@ -13,6 +13,10 @@
+ #ifndef PHP_XLS_WRITER_INCLUDE_H
+ #define PHP_XLS_WRITER_INCLUDE_H
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include <php.h>
+ 
+ #include "zend_exceptions.h"
+diff -up ./kernel/write.c.fixbuild ./kernel/write.c
+--- ./kernel/write.c.fixbuild	2018-09-12 11:26:05.456567879 +0200
++++ ./kernel/write.c	2018-09-12 11:26:54.646837194 +0200
+@@ -368,7 +368,7 @@ _prepare_drawings(lxw_workbook *self)
+         STAILQ_FOREACH(image_options, worksheet->chart_data, list_pointers) {
+             chart_ref_id++;
+             lxw_worksheet_prepare_chart(worksheet, chart_ref_id, drawing_id,
+-                                        image_options);
++                                        image_options, 0);
+             if (image_options->chart)
+                 STAILQ_INSERT_TAIL(self->ordered_charts, image_options->chart,
+                                    ordered_list_pointers);
+@@ -755,4 +755,4 @@ _populate_range(lxw_workbook *self, lxw_
+ {
+     _populate_range_dimensions(self, range);
+     _populate_range_data_cache(self, range);
+-}
+\ Pas de fin de ligne à la fin du fichier
++}