From 0572e619765eeca7505d93050cb6524381a5977a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 24 Mar 2020 12:14:43 +0100 Subject: update to 0.2.26 drop patch merged upstream --- compat_reports/0.2.25_to_0.2.26/compat_report.html | 562 +++++++++++++++++++++ libxlsxio-feat.patch | 59 --- libxlsxio.spec | 14 +- libxlsxio.xml | 2 +- 4 files changed, 569 insertions(+), 68 deletions(-) create mode 100644 compat_reports/0.2.25_to_0.2.26/compat_report.html delete mode 100644 libxlsxio-feat.patch diff --git a/compat_reports/0.2.25_to_0.2.26/compat_report.html b/compat_reports/0.2.25_to_0.2.26/compat_report.html new file mode 100644 index 0000000..8b94d69 --- /dev/null +++ b/compat_reports/0.2.25_to_0.2.26/compat_report.html @@ -0,0 +1,562 @@ + + + + + + + + + +libxlsxio: 0.2.25 to 0.2.26 compatibility report + + + +

API compatibility report for the libxlsxio library between 0.2.25 and 0.2.26 versions on x86_64

+ +
+
+ Binary
Compatibility + Source
Compatibility +
+

Test Info

+ + + + + + + +
Library Namelibxlsxio
Version #10.2.25
Version #20.2.26
Archx86_64
GCC Version9
SubjectBinary Compatibility
+

Test Results

+ + + + + + +
Total Header Files3
Total Libraries2
Total Symbols / Types40 / 25
Compatibility98.8%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-1
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium1
Low0
Problems with
Constants		Low0
+ +

Added Symbols  1 

+xlsxio_read.h, libxlsxio_read.so
+xlsxioread_sheet_last_row_index ( xlsxioreadersheet sheethandle )
+
+to the top
+ +

Problems with Symbols, Medium Severity  1 

+xlsxio_read.h, libxlsxio_read.so
+ +[+] xlsxioread_sheet_last_column_index ( xlsxioreadersheet sheethandle )  1  +
+ +
+to the top
+

Header Files  3 

+
+xlsxio_read.h
+xlsxio_version.h
+xlsxio_write.h
+
+
to the top
+

Libraries  2 

+
+libxlsxio_read.so
+libxlsxio_write.so
+
+
to the top
+


+

Test Info

+ + + + + + +
Library Namelibxlsxio
Version #10.2.25
Version #20.2.26
Archx86_64
SubjectSource Compatibility
+

Test Results

+ + + + + + +
Total Header Files3
Total Libraries2
Total Symbols / Types221 / 72
Compatibility100%
+

Problem Summary

+ + + + + + + + + +
SeverityCount
Added Symbols-1
Removed SymbolsHigh0
Problems with
Data Types		High0
Medium0
Low0
Problems with
Symbols		High0
Medium0
Low1
Problems with
Constants		Low1
+ +

Added Symbols  1 

+xlsxio_read.h
+xlsxioread_sheet_last_row_index ( xlsxioreadersheet sheethandle )
+
+to the top
+ +

Problems with Symbols, Low Severity  1 

+xlsxio_read.h
+ +[+] xlsxioread_sheet_last_column_index ( xlsxioreadersheet sheethandle )  1  +
+ +
+to the top
+ +

Problems with Constants, Low Severity  1 

+xlsxio_version.h
+ +[+] XLSXIO_VERSION_MICRO +
+ + +
+to the top
+

Header Files  3 

+
+xlsxio_read.h
+xlsxio_version.h
+xlsxio_write.h
+
+
to the top
+

Libraries  2 

+
+libxlsxio_read.so
+libxlsxio_write.so
+
+
to the top
+


+
Generated by ABI Compliance Checker 2.3   +
+
+ + diff --git a/libxlsxio-feat.patch b/libxlsxio-feat.patch deleted file mode 100644 index c22712c..0000000 --- a/libxlsxio-feat.patch +++ /dev/null @@ -1,59 +0,0 @@ -Adapted for 0.2.24 from changes in https://github.com/viest/xlsxio - - -From 2ca1dd9967982dc3f4b5b4d49e019b95250893bf Mon Sep 17 00:00:00 2001 -From: viest -Date: Sat, 29 Feb 2020 22:15:15 +0800 -Subject: [PATCH] Feat: get read sheet information - ---- - .gitignore | 2 ++ - include/xlsxio_read.h | 12 +++++++++ - lib/xlsxio_read.c | 63 +++++++++++++++++++++++++------------------ - 3 files changed, 51 insertions(+), 26 deletions(-) - -diff --git a/include/xlsxio_read.h b/include/xlsxio_read.h -index b3d05a0..9ae382d 100644 ---- a/include/xlsxio_read.h -+++ b/include/xlsxio_read.h -@@ -224,6 +224,18 @@ DLL_EXPORT_XLSXIO const XLSXIOCHAR* xlsxioread_sheetlist_next (xlsxioreadersheet - /*! \brief read handle for worksheet object */ - typedef struct xlsxio_read_sheet_struct* xlsxioreadersheet; - -+/*! \brief get the index of the last column of the current worksheet row -+ * \param sheethandle read handle for worksheet object -+ * \sa xlsxioread_sheet_open() -+ */ -+DLL_EXPORT_XLSXIO int xlsxioread_sheet_last_column_index(xlsxioreadersheet sheethandle); -+ -+/*! \brief get worksheet open flags -+ * \param sheethandle read handle for worksheet object -+ * \sa xlsxioread_sheet_open() -+ */ -+DLL_EXPORT_XLSXIO unsigned int xlsxioread_sheet_flags(xlsxioreadersheet sheethandle); -+ - /*! \brief open worksheet - * \param handle read handle for .xlsx object - * \param sheetname worksheet name (NULL for first sheet) -diff --git a/lib/xlsxio_read.c b/lib/xlsxio_read.c -index 5d33705..2c63237 100644 ---- a/lib/xlsxio_read.c -+++ b/lib/xlsxio_read.c -@@ -1262,6 +1262,17 @@ struct xlsxio_read_sheet_struct { - size_t paddingcol; - }; - -+DLL_EXPORT_XLSXIO int xlsxioread_sheet_last_column_index(xlsxioreadersheet sheethandle) -+{ -+ return (int)sheethandle->lastcolnr; -+} -+ -+ -+DLL_EXPORT_XLSXIO unsigned int xlsxioread_sheet_flags(xlsxioreadersheet sheethandle) -+{ -+ return (int)sheethandle->processcallbackdata.flags; -+} -+ - DLL_EXPORT_XLSXIO int xlsxioread_process (xlsxioreader handle, const XLSXIOCHAR* sheetname, unsigned int flags, xlsxioread_process_cell_callback_fn cell_callback, xlsxioread_process_row_callback_fn row_callback, void* callbackdata) - { - int result = 0; diff --git a/libxlsxio.spec b/libxlsxio.spec index 56a09cd..d09d4c4 100644 --- a/libxlsxio.spec +++ b/libxlsxio.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit f03b05ed0fbb40a4895a015271df7af18a1a3c60 +%global gh_commit b9399e50ee1c6122f9c35aec4755ff650349aeb5 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner brechtsanders %global gh_project xlsxio @@ -15,16 +15,13 @@ Name: %{gh_project} Summary: XLSX tools from %{libname} -Version: 0.2.25 +Version: 0.2.26 Release: 1%{?dist} License: MIT URL: https://github.com/%{gh_owner}/%{gh_project}/ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz -# New feature needed for pecl/xlswriter -Patch0: libxlsxio-feat.patch - BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake >= 2.6 @@ -67,9 +64,6 @@ for %{libname}. %prep %setup -q -n %{gh_project}-%{gh_commit} -sed -e 's/\r//' -i include/xlsxio_read.h lib/xlsxio_read.c -%patch0 -p1 -b .feat - # Fix installation layout sed -e '/LIBRARY DESTINATION/s/lib/%{_lib}/' \ -e 's/DESTINATION \./DESTINATION share/' \ @@ -120,6 +114,10 @@ rm -rf %{buildroot}%{_mandir}/man3/_builddir_* %changelog +* Tue Mar 24 2020 Remi Collet - 0.2.26-1 +- update to 0.2.26 +- drop patch merged upstream + * Sun Mar 22 2020 Remi Collet - 0.2.25-1 - update to 0.2.25 diff --git a/libxlsxio.xml b/libxlsxio.xml index faabd28..5fe7bf6 100644 --- a/libxlsxio.xml +++ b/libxlsxio.xml @@ -9,7 +9,7 @@ -0.2.25 +0.2.26 -- cgit