Étienne Mollier pushed to branch master at Debian Med / autodock-vina
Commits: 9c5e791a by Étienne Mollier at 2023-12-18T14:57:34+01:00 boost1.83.patch: new: fix ftbfs with boost 1.83. Closes: #1056089 Thanks: jalegido - - - - - eb1af5d1 by Étienne Mollier at 2023-12-18T15:00:48+01:00 d/t/run-unit-test: remove bashisms flagged by lintian. - - - - - a161b6b8 by Étienne Mollier at 2023-12-18T15:05:40+01:00 ready to upload to unstable. - - - - - 4 changed files: - debian/changelog - + debian/patches/boost1.83.patch - debian/patches/series - debian/tests/run-unit-test Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +autodock-vina (1.2.5-2) unstable; urgency=medium + + * Team upload. + * boost1.83.patch: new: fix ftbfs with boost 1.83. + Thanks to jalegido (Closes: #1056089) + * d/t/run-unit-test: remove bashisms flagged by lintian. + + -- Étienne Mollier <[email protected]> Mon, 18 Dec 2023 15:02:05 +0100 + autodock-vina (1.2.5-1) unstable; urgency=medium * New upstream version ===================================== debian/patches/boost1.83.patch ===================================== @@ -0,0 +1,47 @@ +Description: compatibility boost >= 1.83 + In boost 1.83 boost/progress.hpp is deprecated. + I propose use this typedefs to use the correct class depending the boost + version. + +Author: jalegido +Bug: https://github.com/ccsb-scripps/AutoDock-Vina/pull/236 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1056089 +Reviewed-by: Étienne Mollier <[email protected]> +Last-Update: 2023-12-18 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- autodock-vina.orig/src/lib/parallel_progress.h ++++ autodock-vina/src/lib/parallel_progress.h +@@ -23,7 +23,14 @@ + #ifndef VINA_PARALLEL_PROGRESS_H + #define VINA_PARALLEL_PROGRESS_H + ++#include <boost/version.hpp> ++#if BOOST_VERSION < 107200 + #include <boost/progress.hpp> ++typedef boost::progress_display boost_progress; ++#else ++#include <boost/timer/progress_display.hpp> ++typedef boost::timer::progress_display boost_progress; ++#endif + #include <boost/thread/mutex.hpp> + + #include <functional> +@@ -34,7 +41,7 @@ + parallel_progress(std::function<void(double)>* c = NULL) : p(NULL), callback(c) {} + void init(unsigned long n) { + count = n; +- p = new boost::progress_display(count); ++ p = new boost_progress(count); + } + void operator++() { + if(p) { +@@ -47,7 +54,7 @@ + virtual ~parallel_progress() { delete p; } + private: + boost::mutex self; +- boost::progress_display* p; ++ boost_progress* p; + std::function<void(double)>* callback; + unsigned long count; + }; ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ remove_static.patch do_not_link_against_unneeded_libs.patch annoying_static_removed_was_in_for_a_reason_questionmark.patch +boost1.83.patch ===================================== debian/tests/run-unit-test ===================================== @@ -11,10 +11,15 @@ cd $AUTOPKGTEST_TMP cp /usr/share/doc/${pkg}/test-data/* . gunzip *.gz -echo "Testing vina...\n" +echo "Testing vina..." +echo vina --config conf.txt -echo "\nTesting vina_split...\n" +echo +echo "Testing vina_split..." +echo vina_split --input out.pdbqt -echo "\nPASS" +echo +echo "PASS" +echo View it on GitLab: https://salsa.debian.org/med-team/autodock-vina/-/compare/d784f789bd0c8defda3ab427c28387c1e31c62c5...a161b6b872c0a6049ade74b93905bee5c3912821 -- View it on GitLab: https://salsa.debian.org/med-team/autodock-vina/-/compare/d784f789bd0c8defda3ab427c28387c1e31c62c5...a161b6b872c0a6049ade74b93905bee5c3912821 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
