From 3edff7a13135e93653b2eac3c419732db372411a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 26 Oct 2018 09:06:16 +0200 Subject: [PATCH] new upstream release 0.14.1 --- .gitignore | 1 + ...Fix-build-issues-on-32-bit-platforms.patch | 57 ------------------- libixion.spec | 10 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 63 deletions(-) delete mode 100644 0001-Fix-build-issues-on-32-bit-platforms.patch diff --git a/.gitignore b/.gitignore index d962396..7deeb35 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /libixion-0.12.2.tar.xz /libixion-0.13.0.tar.xz /libixion-0.14.0.tar.xz +/libixion-0.14.1.tar.xz diff --git a/0001-Fix-build-issues-on-32-bit-platforms.patch b/0001-Fix-build-issues-on-32-bit-platforms.patch deleted file mode 100644 index 5e3e72f..0000000 --- a/0001-Fix-build-issues-on-32-bit-platforms.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 869492c9f3f61aaab0d1ecdda147ea9adbdb04d5 Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida -Date: Tue, 28 Aug 2018 22:58:49 -0400 -Subject: [PATCH] Fix build issues on 32-bit platforms. - -The string ID's are stored in mdds's unsigned long block, but we -have changed the underlying type of string ID's from unsigned long -to uint64_t. Because of this, on 32-bit systems it caused a type -mismatch. On 64-bit systems this was fine since unsigned long was -the underlying type for uint64_t... ---- - src/libixion/model_context.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/libixion/model_context.cpp b/src/libixion/model_context.cpp -index 0bcf940..b44713f 100644 ---- a/src/libixion/model_context.cpp -+++ b/src/libixion/model_context.cpp -@@ -541,7 +541,7 @@ void model_context_impl::set_string_cell(const abs_address_t& addr, const char* - string_id_t str_id = add_string(p, n); - column_store_t& col_store = sheet.at(addr.column); - column_store_t::iterator& pos_hint = sheet.get_pos_hint(addr.column); -- pos_hint = col_store.set(pos_hint, addr.row, str_id); -+ pos_hint = col_store.set(pos_hint, addr.row, static_cast(str_id)); - } - - void model_context_impl::set_string_cell(const abs_address_t& addr, string_id_t identifier) -@@ -549,7 +549,7 @@ void model_context_impl::set_string_cell(const abs_address_t& addr, string_id_t - worksheet& sheet = m_sheets.at(addr.sheet); - column_store_t& col_store = sheet.at(addr.column); - column_store_t::iterator& pos_hint = sheet.get_pos_hint(addr.column); -- pos_hint = col_store.set(pos_hint, addr.row, identifier); -+ pos_hint = col_store.set(pos_hint, addr.row, static_cast(identifier)); - } - - void model_context_impl::set_formula_cell(const abs_address_t& addr, formula_tokens_t tokens) -@@ -800,7 +800,7 @@ string_id_t model_context_impl::get_string_identifier(const abs_address_t& addr) - switch (col_store.get_type(addr.row)) - { - case ixion::element_type_string: -- return col_store.get(addr.row); -+ return col_store.get(addr.row); - default: - ; - } -@@ -813,7 +813,7 @@ string_id_t model_context_impl::get_string_identifier_nowait(const abs_address_t - switch (col_store.get_type(addr.row)) - { - case ixion::element_type_string: -- return col_store.get(addr.row); -+ return col_store.get(addr.row); - case ixion::element_type_formula: - { - const formula_cell* p = col_store.get(addr.row); --- -2.17.1 - diff --git a/libixion.spec b/libixion.spec index 9d18362..7236ca2 100644 --- a/libixion.spec +++ b/libixion.spec @@ -1,7 +1,7 @@ %global apiversion 0.14 Name: libixion -Version: 0.14.0 +Version: 0.14.1 Release: 1%{?dist} Summary: A general purpose formula parser & interpreter library @@ -15,8 +15,6 @@ BuildRequires: help2man BuildRequires: pkgconfig(mdds-1.4) BuildRequires: pkgconfig(python3) -Patch0: 0001-Fix-build-issues-on-32-bit-platforms.patch - %description Ixion is a general purpose formula parser & interpreter that can calculate multiple named targets, or "cells". @@ -107,12 +105,11 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PA make %{?_smp_mflags} check %files -%doc AUTHORS README +%doc AUTHORS %license LICENSE %{_libdir}/%{name}-%{apiversion}.so.* %files devel -%doc ChangeLog %{_includedir}/%{name}-%{apiversion} %{_libdir}/%{name}-%{apiversion}.so %{_libdir}/pkgconfig/%{name}-%{apiversion}.pc @@ -133,6 +130,9 @@ make %{?_smp_mflags} check %doc doc/python %changelog +* Fri Oct 26 2018 David Tardon - 0.14.1-1 +- new upstream release + * Sun Sep 02 2018 David Tardon - 0.14.0-1 - new upstream release diff --git a/sources b/sources index 659ac1b..798fd81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libixion-0.14.0.tar.xz) = 8681912fb1bebb4de1fdcb4f0589aa84a3e38cd21747c81a204a87594f67879732461f3c02b70d0bf5659af59c1af1fa17df425eba5946d22a8599bc8da9fd92 +SHA512 (libixion-0.14.1.tar.xz) = e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3