new upstream release 0.14.1
This commit is contained in:
parent
4851a6b149
commit
3edff7a131
|
@ -8,3 +8,4 @@
|
||||||
/libixion-0.12.2.tar.xz
|
/libixion-0.12.2.tar.xz
|
||||||
/libixion-0.13.0.tar.xz
|
/libixion-0.13.0.tar.xz
|
||||||
/libixion-0.14.0.tar.xz
|
/libixion-0.14.0.tar.xz
|
||||||
|
/libixion-0.14.1.tar.xz
|
||||||
|
|
|
@ -1,57 +0,0 @@
|
||||||
From 869492c9f3f61aaab0d1ecdda147ea9adbdb04d5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kohei Yoshida <kohei.yoshida@gmail.com>
|
|
||||||
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<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.17.1
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
%global apiversion 0.14
|
%global apiversion 0.14
|
||||||
|
|
||||||
Name: libixion
|
Name: libixion
|
||||||
Version: 0.14.0
|
Version: 0.14.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A general purpose formula parser & interpreter library
|
Summary: A general purpose formula parser & interpreter library
|
||||||
|
|
||||||
|
@ -15,8 +15,6 @@ BuildRequires: help2man
|
||||||
BuildRequires: pkgconfig(mdds-1.4)
|
BuildRequires: pkgconfig(mdds-1.4)
|
||||||
BuildRequires: pkgconfig(python3)
|
BuildRequires: pkgconfig(python3)
|
||||||
|
|
||||||
Patch0: 0001-Fix-build-issues-on-32-bit-platforms.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Ixion is a general purpose formula parser & interpreter that can calculate
|
Ixion is a general purpose formula parser & interpreter that can calculate
|
||||||
multiple named targets, or "cells".
|
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
|
make %{?_smp_mflags} check
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc AUTHORS README
|
%doc AUTHORS
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%{_libdir}/%{name}-%{apiversion}.so.*
|
%{_libdir}/%{name}-%{apiversion}.so.*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%doc ChangeLog
|
|
||||||
%{_includedir}/%{name}-%{apiversion}
|
%{_includedir}/%{name}-%{apiversion}
|
||||||
%{_libdir}/%{name}-%{apiversion}.so
|
%{_libdir}/%{name}-%{apiversion}.so
|
||||||
%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc
|
%{_libdir}/pkgconfig/%{name}-%{apiversion}.pc
|
||||||
|
@ -133,6 +130,9 @@ make %{?_smp_mflags} check
|
||||||
%doc doc/python
|
%doc doc/python
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 26 2018 David Tardon <dtardon@redhat.com> - 0.14.1-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
* Sun Sep 02 2018 David Tardon <dtardon@redhat.com> - 0.14.0-1
|
* Sun Sep 02 2018 David Tardon <dtardon@redhat.com> - 0.14.0-1
|
||||||
- new upstream release
|
- new upstream release
|
||||||
|
|
||||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
||||||
SHA512 (libixion-0.14.0.tar.xz) = 8681912fb1bebb4de1fdcb4f0589aa84a3e38cd21747c81a204a87594f67879732461f3c02b70d0bf5659af59c1af1fa17df425eba5946d22a8599bc8da9fd92
|
SHA512 (libixion-0.14.1.tar.xz) = e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3
|
||||||
|
|
Loading…
Reference in New Issue