diff --git a/dev-libs/ixion/ixion-0.14.0.recipe b/dev-libs/ixion/ixion-0.14.1.recipe similarity index 95% rename from dev-libs/ixion/ixion-0.14.0.recipe rename to dev-libs/ixion/ixion-0.14.1.recipe index 47ddc170a..aa998b35f 100644 --- a/dev-libs/ixion/ixion-0.14.0.recipe +++ b/dev-libs/ixion/ixion-0.14.1.recipe @@ -10,11 +10,10 @@ and a partial calculation of only the affected cells need to be calculated." HOMEPAGE="https://gitlab.com/ixion/ixion" COPYRIGHT="Kohei Yoshida et al." LICENSE="MPL v2.0" -REVISION="3" +REVISION="1" SOURCE_URI="https://kohei.us/files/ixion/src/libixion-$portVersion.tar.xz" -CHECKSUM_SHA256="5805d49bb110e53eeb4224cdbcbcdba91928315dcb5672af8f90942ad34afe5e" +CHECKSUM_SHA256="6ad1384fcf813083c6d981a16b2643c953f9bac4c2caf1ed1682921d9b69ed91" SOURCE_DIR="libixion-$portVersion" -PATCHES="ixion-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" diff --git a/dev-libs/ixion/patches/ixion-0.14.0.patchset b/dev-libs/ixion/patches/ixion-0.14.0.patchset deleted file mode 100644 index 1bbae1fb1..000000000 --- a/dev-libs/ixion/patches/ixion-0.14.0.patchset +++ /dev/null @@ -1,54 +0,0 @@ -From 0aed775d71d92ce291a8b9b8dcc0930f5223d86d Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida -Date: Tue, 28 Aug 2018 22:58:49 -0400 -Subject: 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... - -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.16.4 -