rpm/votca
SHA256
1
0
Fork 0
forked from pool/votca
Code Pull Requests Activity

Accepting request 1178635 from science

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1178635
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/votca?expand=0&rev=11
This commit is contained in:
Ana Guerrero 2024-06-05 15:42:29 +00:00 committed by Git OBS Bridge
commit a432fdf0eb
3 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
1032.patch Normal file
View File

@ -0,0 +1,35 @@
From 9a29a3a82ea23c5159d43b0f25218601e12085b4 Mon Sep 17 00:00:00 2001
From: Michael Cho <michael@michaelcho.dev>
Date: Thu, 25 Apr 2024 14:14:54 -0400
Subject: [PATCH] Fix build with Boost 1.85.0
Signed-off-by: Michael Cho <michael@michaelcho.dev>
---
csg/src/libcsg/modules/io/pdbreader.cc | 1 -
xtp/src/libxtp/calculators/kmcmultiple.cc | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/csg/src/libcsg/modules/io/pdbreader.cc b/csg/src/libcsg/modules/io/pdbreader.cc
index 14b259ee8b..3686806e9d 100644
--- a/csg/src/libcsg/modules/io/pdbreader.cc
+++ b/csg/src/libcsg/modules/io/pdbreader.cc
@@ -22,7 +22,6 @@
// Third party includes
#include <boost/algorithm/string.hpp>
-#include <boost/filesystem/convenience.hpp>
#include <boost/lexical_cast.hpp>
// VOTCA includes
diff --git a/xtp/src/libxtp/calculators/kmcmultiple.cc b/xtp/src/libxtp/calculators/kmcmultiple.cc
index 1627950277..fa515e78eb 100644
--- a/xtp/src/libxtp/calculators/kmcmultiple.cc
+++ b/xtp/src/libxtp/calculators/kmcmultiple.cc
@@ -20,6 +20,7 @@
// Third party includes
#include <boost/format.hpp>
+#include <boost/numeric/conversion/cast.hpp>
// VOTCA includes
#include <votca/tools/constants.h>

5
votca.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jun 3 21:40:05 UTC 2024 - Christoph Junghans <junghans@votca.org>
- Add upsteam patch, 1032.patch, to fix build with newer boost
-------------------------------------------------------------------
Wed Jan 31 20:58:32 UTC 2024 - Christoph Junghans <junghans@votca.org>

4
votca.spec
View File

@ -34,6 +34,8 @@ License: Apache-2.0
Group: Productivity/Scientific/Chemistry
URL: https://www.votca.org
Source0: https://github.com/votca/votca/archive/v%{uversion}.tar.gz#/%{name}-%{uversion}.tar.gz
# PATCH-FIX-UPSTREAM 1032.patch -- fix build with newer boost votca/votca#1032
Patch0: 1032.patch
BuildRequires: cmake >= 3.13
BuildRequires: eigen3-devel
@ -175,7 +177,7 @@ Provides: votca-csg-bash = %version-%release
This package contains the bash completion support for votca.
%prep
%autosetup -n %{name}-%{uversion}
%autosetup -p1 -n %{name}-%{uversion}
%build
%setup_openmpi