Accepting request 1125776 from home:cjunghans:branches:science

- Add 1083.patch to fix build with boost-1.82

OBS-URL: https://build.opensuse.org/request/show/1125776
OBS-URL: https://build.opensuse.org/package/show/science/votca?expand=0&rev=17

1083.patch

@@ -0,0 +1,44 @@
+diff --git a/xtp/src/libxtp/calculators/kmclifetime.cc b/xtp/src/libxtp/calculators/kmclifetime.cc
+index f6a1093ff..56730bce9 100644
+--- a/xtp/src/libxtp/calculators/kmclifetime.cc
++++ b/xtp/src/libxtp/calculators/kmclifetime.cc
+@@ -21,7 +21,7 @@
+ 
+ // Third party includes
+ #include <boost/format.hpp>
+-#include <boost/progress.hpp>
++#include <boost/timer/progress_display.hpp>
+ 
+ // VOTCA includes
+ #include <votca/tools/constants.h>
+@@ -290,7 +290,7 @@ void KMCLifetime::RunVSSM() {
+ 
+       // determine where it will jump to
+       ResetForbiddenlist(forbiddendests);
+-      boost::progress_display progress(insertions_);
++      boost::timer::progress_display progress(insertions_);
+ 
+       while (true) {
+         // LEVEL 2
+diff --git a/xtp/src/libxtp/calculators/neighborlist.cc b/xtp/src/libxtp/calculators/neighborlist.cc
+index ce18af288..0b4bcc61b 100644
+--- a/xtp/src/libxtp/calculators/neighborlist.cc
++++ b/xtp/src/libxtp/calculators/neighborlist.cc
+@@ -17,7 +17,7 @@
+ 
+ // Third party includes
+ #include <boost/format.hpp>
+-#include <boost/progress.hpp>
++#include <boost/timer/progress_display.hpp>
+ 
+ // Local private VOTCA includes
+ #include "neighborlist.h"
+@@ -124,7 +124,7 @@ bool Neighborlist::Evaluate(Topology& top) {
+ 
+   top.NBList().Cleanup();
+ 
+-  boost::progress_display progress(segs.size());
++  boost::timer::progress_display progress(segs.size());
+   // cache approx sizes
+   std::vector<double> approxsize = std::vector<double>(segs.size(), 0.0);
+ #pragma omp parallel for

votca.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 13 23:26:43 UTC 2023 - Christoph Junghans <junghans@votca.org>
+
+- Add 1083.patch to fix build with boost-1.82
+
 -------------------------------------------------------------------
 Mon Jan  2 15:23:48 UTC 2023 - Christoph Junghans <junghans@votca.org>
 

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 1083.patch -- based on upsteam PR 1083, fix build with boost-1.82
+Patch0:         1083.patch
 
 BuildRequires:  cmake >= 3.13
 BuildRequires:  eigen3-devel
@@ -179,6 +181,7 @@ This package contains the bash completion support for votca.
 
 %prep
 %setup -n %{name}-%{uversion} -q
+%patch 0 -p1
 
 %build
 %setup_openmpi