diff --git a/fix-integral-size-32bit.patch b/fix-integral-size-32bit.patch new file mode 100644 index 0000000..03fc9e0 --- /dev/null +++ b/fix-integral-size-32bit.patch @@ -0,0 +1,26 @@ +From 8182bb208e31cf9244dd3e6f567d3e27a33c973e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jean-No=C3=ABl=20Grad?= +Date: Wed, 20 Jul 2022 21:25:34 +0200 +Subject: [PATCH] tests: Fix integral size on 32bit archs + +--- + src/utils/tests/integral_parameter_test.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/src/utils/tests/integral_parameter_test.cpp ++++ b/src/utils/tests/integral_parameter_test.cpp +@@ -38,11 +38,11 @@ BOOST_AUTO_TEST_CASE(integral_parameter_ + std::pair>::value, + ""); + +- BOOST_CHECK(std::make_pair(1ul, 13) == ++ BOOST_CHECK(std::make_pair(std::size_t{1u}, 13) == + (Utils::integral_parameter(1, 13))); +- BOOST_CHECK(std::make_pair(3ul, 13) == ++ BOOST_CHECK(std::make_pair(std::size_t{3u}, 13) == + (Utils::integral_parameter(3, 13))); +- BOOST_CHECK(std::make_pair(5ul, 13) == ++ BOOST_CHECK(std::make_pair(std::size_t{5u}, 13) == + (Utils::integral_parameter(5, 13))); + BOOST_CHECK_THROW((Utils::integral_parameter(6, 13)), + std::exception); diff --git a/python3-espressomd.changes b/python3-espressomd.changes index d8101be..51a076f 100644 --- a/python3-espressomd.changes +++ b/python3-espressomd.changes @@ -65,6 +65,8 @@ Tue Jul 19 19:40:59 UTC 2022 - Matej Cepl interactive Python session (#3751). * MDAnalysis integration now provides bond information (#3801). +- Add fix-integral-size-32bit.patch to fix build on 32bit arch + (gh#espressomd/espresso#4537). ------------------------------------------------------------------- Sat Apr 16 00:24:21 UTC 2022 - Jean-Noel Grad diff --git a/python3-espressomd.spec b/python3-espressomd.spec index 976f68f..d6a5241 100644 --- a/python3-espressomd.spec +++ b/python3-espressomd.spec @@ -50,6 +50,9 @@ Patch1: missing_size_t.patch Patch2: hdf5.patch # PATCH-FIX-OPENSUSE rpath.patch boo#1198352 Patch3: rpath.patch +# PATCH-FIX-UPSTREAM fix-integral-size-32bit.patch gh#espressomd/espresso#4537 mcepl@suse.com +# fix building on 32bit arch +Patch4: fix-integral-size-32bit.patch BuildRequires: cmake BuildRequires: fftw3-devel BuildRequires: gcc-c++