From 38f626fe4737ed8701bd152bbcd1c8e3394675656b229c4e0746fb642a021a3f Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 5 Jun 2024 03:29:45 +0000 Subject: [PATCH] Accepting request 1178634 from home:cjunghans:branches:science - Add upsteam patch, 1032.patch, to fix build with newer boost OBS-URL: https://build.opensuse.org/request/show/1178634 OBS-URL: https://build.opensuse.org/package/show/science/votca?expand=0&rev=24 --- 1032.patch | 35 +++++++++++++++++++++++++++++++++++ votca.changes | 5 +++++ votca.spec | 4 +++- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 1032.patch diff --git a/1032.patch b/1032.patch new file mode 100644 index 0000000..f8b53fc --- /dev/null +++ b/1032.patch @@ -0,0 +1,35 @@ +From 9a29a3a82ea23c5159d43b0f25218601e12085b4 Mon Sep 17 00:00:00 2001 +From: Michael Cho +Date: Thu, 25 Apr 2024 14:14:54 -0400 +Subject: [PATCH] Fix build with Boost 1.85.0 + +Signed-off-by: Michael Cho +--- + 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 +-#include + #include + + // 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 ++#include + + // VOTCA includes + #include diff --git a/votca.changes b/votca.changes index acb3043..e7c0882 100644 --- a/votca.changes +++ b/votca.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 3 21:40:05 UTC 2024 - Christoph Junghans + +- Add upsteam patch, 1032.patch, to fix build with newer boost + ------------------------------------------------------------------- Wed Jan 31 20:58:32 UTC 2024 - Christoph Junghans diff --git a/votca.spec b/votca.spec index e7ce9a1..0e4ff73 100644 --- a/votca.spec +++ b/votca.spec @@ -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