From 1de720f12b01b7697acfa9b8e0944593f99544ba Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 19 Oct 2015 13:50:56 +0200 Subject: [PATCH] rebase to the 0.9.x line --- .gitignore | 1 + ...ity-54448-Uninitialized-scalar-field.patch | 26 ---------- 0001-do-not-let-main-throw.patch | 52 ------------------- liborcus-0.7.0-iostream.patch | 13 ----- liborcus.spec | 15 +++--- sources | 2 +- 6 files changed, 10 insertions(+), 99 deletions(-) delete mode 100644 0001-coverity-54448-Uninitialized-scalar-field.patch delete mode 100644 0001-do-not-let-main-throw.patch delete mode 100644 liborcus-0.7.0-iostream.patch diff --git a/.gitignore b/.gitignore index b39be24..ce18367 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /liborcus-0.5.1.tar.bz2 /liborcus-0.7.0.tar.bz2 /liborcus-0.7.1.tar.xz +/liborcus-0.9.2.tar.xz diff --git a/0001-coverity-54448-Uninitialized-scalar-field.patch b/0001-coverity-54448-Uninitialized-scalar-field.patch deleted file mode 100644 index 536661a..0000000 --- a/0001-coverity-54448-Uninitialized-scalar-field.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9ef8ed8bdbe2c9756115c7d3e98c7180bb63fd0f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 25 Sep 2014 10:38:35 +0100 -Subject: [PATCH] coverity#54448 Uninitialized scalar field - ---- - src/liborcus/xls_xml_context.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/liborcus/xls_xml_context.cpp b/src/liborcus/xls_xml_context.cpp -index 01f5dc9..abdd478 100644 ---- a/src/liborcus/xls_xml_context.cpp -+++ b/src/liborcus/xls_xml_context.cpp -@@ -141,7 +141,8 @@ xls_xml_context::xls_xml_context(session_context& session_cxt, const tokens& tok - xml_context_base(session_cxt, tokens), - mp_factory(factory), - mp_cur_sheet(NULL), -- m_cur_row(0), m_cur_col(0), m_cur_cell_type(ct_unknown) -+ m_cur_row(0), m_cur_col(0), m_cur_cell_type(ct_unknown), -+ m_cur_cell_value(std::numeric_limits::quiet_NaN()) - { - } - --- -2.3.5 - diff --git a/0001-do-not-let-main-throw.patch b/0001-do-not-let-main-throw.patch deleted file mode 100644 index c94dc06..0000000 --- a/0001-do-not-let-main-throw.patch +++ /dev/null @@ -1,52 +0,0 @@ -From da5d99c57ecdf54b40c248a109969021b70f5a38 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Mon, 4 May 2015 17:49:37 +0200 -Subject: [PATCH] do not let main() throw - ---- - src/orcus_detect_main.cpp | 18 ++++++++---------- - 1 file changed, 8 insertions(+), 10 deletions(-) - -diff --git a/src/orcus_detect_main.cpp b/src/orcus_detect_main.cpp -index 2a9f082..2f4110f 100644 ---- a/src/orcus_detect_main.cpp -+++ b/src/orcus_detect_main.cpp -@@ -16,22 +16,14 @@ - using namespace orcus; - using namespace std; - --int main(int argc, char** argv) -+int main(int argc, char** argv) try - { - if (argc != 2) - return EXIT_FAILURE; - - const char* filepath = argv[1]; - string strm; -- try -- { -- load_file_content(filepath, strm); -- } -- catch (const general_error& e) -- { -- cerr << e.what() << endl; -- return EXIT_FAILURE; -- } -+ load_file_content(filepath, strm); - - if (strm.empty()) - { -@@ -67,4 +59,10 @@ int main(int argc, char** argv) - - return EXIT_SUCCESS; - } -+catch (const general_error& e) -+{ -+ cerr << e.what() << endl; -+ return EXIT_FAILURE; -+} -+ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ --- -2.3.5 - diff --git a/liborcus-0.7.0-iostream.patch b/liborcus-0.7.0-iostream.patch deleted file mode 100644 index 84c763d..0000000 --- a/liborcus-0.7.0-iostream.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up liborcus-0.7.0/src/parser/string_pool_test.cpp\~ liborcus-0.7.0/src/parser/string_pool_test.cpp ---- liborcus-0.7.0/src/parser/string_pool_test.cpp~ 2013-10-05 16:44:15.000000000 +0200 -+++ liborcus-0.7.0/src/parser/string_pool_test.cpp 2015-01-28 21:47:45.271937850 +0100 -@@ -5,6 +5,7 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -+#include - #include "orcus/string_pool.hpp" - #include "orcus/pstring.hpp" - - -Diff finished. Wed Jan 28 21:48:06 2015 diff --git a/liborcus.spec b/liborcus.spec index 09f278d..ca49f2d 100644 --- a/liborcus.spec +++ b/liborcus.spec @@ -1,19 +1,16 @@ -%global apiversion 0.8 +%global apiversion 0.10 # build conversion tools %bcond_without convtools Name: liborcus -Version: 0.7.1 -Release: 7%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: Standalone file import filter library for spreadsheet documents License: MPLv2.0 URL: https://gitlab.com/orcus/orcus Source: http://kohei.us/files/orcus/src/%{name}-%{version}.tar.xz -Patch0: liborcus-0.7.0-iostream.patch -Patch1: 0001-coverity-54448-Uninitialized-scalar-field.patch -Patch2: 0001-do-not-let-main-throw.patch BuildRequires: boost-devel %if %{with convtools} @@ -102,7 +99,7 @@ make check %{?_smp_mflags} %endif %files -%doc AUTHORS COPYING README +%doc AUTHORS COPYING NEWS %{_libdir}/%{name}-%{apiversion}.so.* %{_libdir}/%{name}-mso-%{apiversion}.so.* %{_libdir}/%{name}-parser-%{apiversion}.so.* @@ -124,6 +121,7 @@ make check %{?_smp_mflags} %endif %files tools +%{_bindir}/orcus-css-dump %{_bindir}/orcus-detect %{_bindir}/orcus-mso-encryption %{_bindir}/orcus-xml-dump @@ -144,6 +142,9 @@ make check %{?_smp_mflags} %endif %changelog +* Mon Oct 19 2015 David Tardon - 0.9.2-1 +- rebase to the 0.9.x line + * Thu Aug 27 2015 Jonathan Wakely - 0.7.1-7 - Rebuilt for Boost 1.59 diff --git a/sources b/sources index 3741258..e255292 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -644145470758d3ea4dd1d63582e82f8e liborcus-0.7.1.tar.xz +3ff918cc988cb325e12d8bbc7f8c3deb liborcus-0.9.2.tar.xz