rpm/python3-espressomd
SHA256
1
0
Fork 0
forked from pool/python3-espressomd
Code Pull Requests Activity

Accepting request 844905 from devel:languages:python:numeric

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/844905
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python3-espressomd?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger 2020-10-30 10:47:45 +00:00 committed by Git OBS Bridge
commit 7bfb486dd5
5 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
boost-1.74.patch Normal file
View File

@ -0,0 +1,32 @@
From a392907978506408482d0bdd388534455ba8dfba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Grad?= <jgrad@icp.uni-stuttgart.de>
Date: Wed, 28 Oct 2020 21:22:39 +0100
Subject: [PATCH] core: Add guard for boost 1.74.0
This <boost/serialization/version.hpp> include guards against an issue
in boost::serialization from boost 1.74.0 that leads to compiler error
"explicit specialization of undeclared template struct 'version'" when
including <boost/serialization/optional.hpp>. More details in tickets:
https://github.com/boostorg/serialization/issues/210
https://github.com/boostorg/serialization/issues/217
diff --git a/src/core/grid_based_algorithms/lb_particle_coupling.hpp b/src/core/grid_based_algorithms/lb_particle_coupling.hpp
index de12cb4..13111ab 100644
--- a/src/core/grid_based_algorithms/lb_particle_coupling.hpp
+++ b/src/core/grid_based_algorithms/lb_particle_coupling.hpp
@@ -21,6 +21,15 @@
#include "ParticleRange.hpp"
+/* This <boost/serialization/version.hpp> include guards against an issue
+ * in boost::serialization from boost 1.74.0 that leads to compiler error
+ * "explicit specialization of undeclared template struct 'version'" when
+ * including <boost/serialization/optional.hpp>. More details in tickets:
+ * https://github.com/boostorg/serialization/issues/210
+ * https://github.com/boostorg/serialization/issues/217
+ */
+#include <boost/serialization/version.hpp>
+
#include <boost/serialization/optional.hpp>
#include "ParticleRange.hpp"

3
espresso-4.1.3.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:13dd998f71547c6c979a33d918b7f83e1a0e1c5f2bf2ddeeb0d1e99a3dcd6008
size 16947336

3
espresso-4.1.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c1b68de63755475c5eb3ae8117d8c6d96c8ac36cc0f46dd44417a8e7ebe9242c
size 16950522

18
python3-espressomd.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu Oct 29 15:42:42 UTC 2020 - Christoph Junghans <junghans@votca.org>
- added boost-1.74.patch to fix build with boost-1.74
(gh#espressomd/espresso#3864)
-------------------------------------------------------------------
Tue Oct 20 19:03:28 UTC 2020 - Christoph Junghans <junghans@votca.org>
- Update to 4.1.4, see
https://github.com/espressomd/espresso/blob/4.1.4/NEWS for
details
-------------------------------------------------------------------
Tue Sep 8 20:26:00 UTC 2020 - Christoph Junghans <junghans@votca.org>
- fix unversioned Obsoletes: statement
-------------------------------------------------------------------
Fri Aug 21 16:36:20 UTC 2020 - Christoph Junghans <junghans@votca.org>

9
python3-espressomd.spec
View File

@ -35,13 +35,15 @@
%define pkgname espresso
%define modname %{pkgname}md
Name: python3-%{modname}
Version: 4.1.3
Version: 4.1.4
Release: 0
Summary: Parallel simulation software for soft matter research
License: GPL-3.0-or-later
Group: Productivity/Scientific/Chemistry
URL: http://espressomd.org
Source: https://github.com/%{modname}/%{pkgname}/releases/download/%{version}/%{pkgname}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM boost-1.74.patch gh#espressomd/espresso#3864
Patch0: boost-1.74.patch
BuildRequires: cmake
BuildRequires: fftw3-devel
BuildRequires: gcc-c++
@ -63,7 +65,7 @@ BuildRequires: python3-h5py
%else
BuildRequires: boost-devel
%endif
Obsoletes: libEspresso4
Obsoletes: libEspresso4 < 4.1
Requires: python3-numpy
Requires: python3-h5py
# make sure rpm pulls in the right dependency
@ -79,6 +81,7 @@ systems, for example DNA and lipid membranes.
%prep
%setup -q -n %{pkgname}
%patch0 -p1
%build
source %{_libdir}/mpi/gcc/%{mpiver}/bin/mpivars.sh
@ -103,7 +106,7 @@ export HDF5_USE_SHLIB=yes
rm -f %{buildroot}%{_libdir}/lib*.so
%check
# https://github.com/espressomd/espresso/issues/3315
# gh#espressomd/espresso#3315
%ifarch i586
%define testargs ARGS='-E collision_detection'
%endif