haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

ixion: bump to 0.14.1.

Browse Source
This commit is contained in:
fbrosson
2018-10-31 23:38:59 +00:00
parent 9ec1efcd99
commit a3b7b6f66a
2 changed files with 2 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dev-libs/ixion/ixion-0.14.0.recipe → dev-libs/ixion/ixion-0.14.1.recipe
View File

@@ -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"

54
dev-libs/ixion/patches/ixion-0.14.0.patchset
View File

@@ -1,54 +0,0 @@
From 0aed775d71d92ce291a8b9b8dcc0930f5223d86d Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
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<unsigned long>(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<unsigned long>(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<string_id_t>(addr.row);
+ return col_store.get<unsigned long>(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<string_id_t>(addr.row);
+ return col_store.get<unsigned long>(addr.row);
case ixion::element_type_formula:
{
const formula_cell* p = col_store.get<formula_cell*>(addr.row);
--
2.16.4