diff --git a/ascii_reader_i386.patch b/ascii_reader_i386.patch deleted file mode 100644 index be6edd8..0000000 --- a/ascii_reader_i386.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/Table/src/lib/AsciiReaderHelper.cpp b/Table/src/lib/AsciiReaderHelper.cpp -index 4d3e441..e1ccc6f 100644 ---- a/Table/src/lib/AsciiReaderHelper.cpp -+++ b/Table/src/lib/AsciiReaderHelper.cpp -@@ -407,7 +407,7 @@ std::pair guessColumnType(const std::string& token - - auto it1 = token.begin(), it2 = it1; - if (qi::parse(it1, token.end(), qi::long_, l) && it1 == token.end()) { -- return {typeid(long), 0}; -+ return {typeid(int64_t), 0}; - } - if (qi::parse(it2, token.end(), qi::double_, d) && it2 == token.end()) { - return {typeid(double), 0}; -diff --git a/Table/tests/src/AsciiReader_test.cpp b/Table/tests/src/AsciiReader_test.cpp -index a932511..50f4696 100644 ---- a/Table/tests/src/AsciiReader_test.cpp -+++ b/Table/tests/src/AsciiReader_test.cpp -@@ -482,11 +482,11 @@ BOOST_AUTO_TEST_CASE(autoTypeDetection_test) { - auto column_info = table.getColumnInfo(); - - // Then -- BOOST_CHECK(column_info->getDescription(0).type == typeid(long)); -+ BOOST_CHECK(column_info->getDescription(0).type == typeid(int64_t)); - BOOST_CHECK(column_info->getDescription(1).type == typeid(std::string)); - BOOST_CHECK(column_info->getDescription(2).type == typeid(double)); - BOOST_CHECK(column_info->getDescription(3).type == typeid(std::string)); -- BOOST_CHECK(column_info->getDescription(4).type == typeid(long)); -+ BOOST_CHECK(column_info->getDescription(4).type == typeid(int64_t)); - } - - //----------------------------------------------------------------------------- diff --git a/elements-alexandria.spec b/elements-alexandria.spec index 270ea87..062d0e9 100644 --- a/elements-alexandria.spec +++ b/elements-alexandria.spec @@ -1,7 +1,7 @@ Summary: A lightweight C++ utility library Name: elements-alexandria -Version: 2.25.0 -Release: 5%{?dist} +Version: 2.27.0 +Release: 1%{?dist} License: LGPLv3+ URL: https://github.com/astrorama/Alexandria Source0: https://github.com/astrorama/Alexandria/archive/%{version}/%{name}-%{version}.tar.gz @@ -9,8 +9,8 @@ Source0: https://github.com/astrorama/Alexandria/archive/%{version}/%{nam # It is downloaded from: # https://upload.cppreference.com/w/File:cppreference-doxygen-web.tag.xml Source1: cppreference-doxygen-web.tag.xml -Patch0: ascii_reader_i386.patch -Patch1: drop-isEqual.patch +Patch0: drop-isEqual.patch +Patch1: i686.patch %global elements_version 6.0.1 @@ -191,6 +191,9 @@ make test -C "%{_vpath_builddir}" %{docdir} %changelog +* Tue Oct 18 2022 Alejandro Alvarez Ayllon - 2.27.0-1 +- Alexandria 2.27.0 + * Tue Aug 23 2022 Mamoru TASAKA - 2.25.0-5 - Rebuild for gcc / f38 (needed to build sourcextractor++) diff --git a/i686.patch b/i686.patch new file mode 100644 index 0000000..411dc7d --- /dev/null +++ b/i686.patch @@ -0,0 +1,26 @@ +diff --git a/NdArray/NdArray/io/_impl/NpyMmap.icpp b/NdArray/NdArray/io/_impl/NpyMmap.icpp +index 207a5a1..6a2e614 100644 +--- a/NdArray/NdArray/io/_impl/NpyMmap.icpp ++++ b/NdArray/NdArray/io/_impl/NpyMmap.icpp +@@ -39,7 +39,7 @@ NdArray mmapNpy(const boost::filesystem::path& path, boost::iostreams::mapped + boost::iostreams::mapped_file_params map_params; + map_params.path = path.native(); + map_params.flags = mode; +- max_size = std::max(max_size, boost::filesystem::file_size(path)); ++ max_size = std::max(boost::uintmax_t{max_size}, boost::filesystem::file_size(path)); + map_params.length = max_size; + + boost::iostreams::mapped_file input(map_params); +diff --git a/NdArray/tests/src/NdArray_test.cpp b/NdArray/tests/src/NdArray_test.cpp +index 1f214f2..22d0d9d 100644 +--- a/NdArray/tests/src/NdArray_test.cpp ++++ b/NdArray/tests/src/NdArray_test.cpp +@@ -33,7 +33,7 @@ using namespace Euclid::NdArray; + + BOOST_AUTO_TEST_SUITE(Matrix_test) + +-static_assert(sizeof(NdArray) == 8, "Expected NdArray to have size 8"); ++static_assert(sizeof(NdArray) == sizeof(void*), "Expected NdArray to have the size of a pointer"); + + //----------------------------------------------------------------------------- + diff --git a/sources b/sources index 259195e..6cb3995 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (elements-alexandria-2.25.0.tar.gz) = f0d296b0dcea61ad426e2057f4b33d16aa3bb6174d25d3e6a177155782c41ff7105aeeb842649172fb27abb970220cc0d815eca2c89ec117e84cc16304fc9cb7 +SHA512 (elements-alexandria-2.27.0.tar.gz) = ee4e1a52711de6857d09fe59283e98172bc881b99ac6b2dd94a0b0fccc4f1fcf07671c873e1ef7b56e04fcdc3cc80c71d5ef6982392e7413274fb81e7483ba30