Control: tags -1 + patch Hi,
On Tue, 15 May 2018 00:14:25 +0200 Michael Banck <mba...@debian.org> wrote: > Hi Lori, > > On Mon, May 14, 2018 at 11:18:43AM -0400, Lori Burns wrote: > > * What version of psi4 are you trying to build? > > This should be 1.1. > > > Apparently not a git clone, so I can’t see the version info. If it’s > > 1.1, then the pybind11 2.2 that you’re using absolutely won’t work (I > > hadn’t added EXACT to `find_package(pybind11 2.0 EXACT REQUIRED)` > > then). Moreover, no pb11 2.0 _package_ will work (unless yours was > > built with CMake, not pip) and you just have to let psi4 build system > > pull and build its own. > > Back when 1.1. was introduced to Debian/Ubuntu, pybin11-2.0 was the > current version and yes, it seems like they were built with cmake, but I > didnt' dig very deep into this. > > In the meantime, it appears that pybind11 got updated to 2.2. Could the fix be as simple as the one attached? The package builds fine, but I don't know how to test it (just investigating this issue because psi4 is a reverse dependency of hdf5). Regards, _g.
diff -Nru psi4-1.1/debian/changelog psi4-1.1/debian/changelog --- psi4-1.1/debian/changelog 2018-01-14 11:12:10.000000000 +0100 +++ psi4-1.1/debian/changelog 2018-05-17 20:07:24.000000000 +0200 @@ -1,3 +1,10 @@ +psi4 (1:1.1-6) UNRELEASED; urgency=medium + + * Non-maintainer upload + * Fix FTBFS with pybind11 2.2 (closes: #897492) + + -- Gilles Filippini <p...@debian.org> Thu, 17 May 2018 20:07:24 +0200 + psi4 (1:1.1-5) unstable; urgency=medium * debian/control (Build-Depends): Added python3-pytest. diff -Nru psi4-1.1/debian/patches/series psi4-1.1/debian/patches/series --- psi4-1.1/debian/patches/series 2018-01-13 18:27:21.000000000 +0100 +++ psi4-1.1/debian/patches/series 2018-05-17 20:04:40.000000000 +0200 @@ -5,3 +5,4 @@ libderiv_include_location.patch fix_manual_build.patch verbose_makefile.patch +support-pybind11-2.2.patch diff -Nru psi4-1.1/debian/patches/support-pybind11-2.2.patch psi4-1.1/debian/patches/support-pybind11-2.2.patch --- psi4-1.1/debian/patches/support-pybind11-2.2.patch 1970-01-01 01:00:00.000000000 +0100 +++ psi4-1.1/debian/patches/support-pybind11-2.2.patch 2018-05-17 20:07:24.000000000 +0200 @@ -0,0 +1,14 @@ +Description: Tentative fix for pybind11 2.2 support +Index: psi4-1.1/psi4/src/export_functional.cc +=================================================================== +--- psi4-1.1.orig/psi4/src/export_functional.cc ++++ psi4-1.1/psi4/src/export_functional.cc +@@ -109,7 +109,7 @@ void export_functional(py::module &m) + def("set_meta_cutoff", &Functional::set_meta_cutoff, "docstring"). + def("set_parameter", &Functional::set_parameter, "docstring"). + def("print_out", &Functional::py_print, "docstring"). +- def("print_detail",&SuperFunctional::py_print_detail, "docstring"); ++ def("print_detail",&Functional::py_print_detail, "docstring"); + + py::class_<VBase, std::shared_ptr<VBase> >(m, "VBase", "docstring"). + def_static("build", [](std::shared_ptr<BasisSet> &basis, std::shared_ptr<SuperFunctional> &func, std::string type){
signature.asc
Description: OpenPGP digital signature