#1 Patch for pybind 2.2.3
Merged 5 years ago by jussilehtola. Opened 5 years ago by dormouse.
rpms/ dormouse/psi4 master  into  master

Patch for pybind 2.2.3
Marcel Plch • 5 years ago  
@@ -0,0 +1,12 @@ 

+ diff -ru psi4-add49b95b6be2441c522f71bddb47f1371e16958/psi4/src/export_functional.cc psi4-add49b95b6be2441c522f71bddb47f1371e16958_patched/psi4/src/export_functional.cc

+ --- psi4-add49b95b6be2441c522f71bddb47f1371e16958/psi4/src/export_functional.cc	2017-05-17 10:01:40.000000000 +0200

+ +++ psi4-add49b95b6be2441c522f71bddb47f1371e16958_patched/psi4/src/export_functional.cc	2018-08-09 13:38:22.174066224 +0200

+ @@ -109,7 +109,7 @@

+          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){

file modified
+8 -1
@@ -11,7 +11,7 @@ 

  Name:           psi4

  Epoch:          1

  Version:        1.1

- Release:        7.%{shortcommit}git%{?dist}

+ Release:        8.%{shortcommit}git%{?dist}

  Summary:        An ab initio quantum chemistry package

  Group:          Applications/Engineering

  License:        LGPLv3 and MIT
@@ -20,6 +20,9 @@ 

  

  # Use system packages

  Patch0:         psi4-1.1-fedora.patch

+ # Correct usage of wrong datatype that is incompatible

+ # with system header.

+ Patch1:         psi4-wrong-definition.patch

  

  BuildRequires:  cmake

  BuildRequires:  bison-devel
@@ -93,6 +96,7 @@ 

  %prep

  %setup -q -n psi4-%{commit}

  %patch0 -p1 -b .fedora

+ %patch1 -p1

  

  %build

  export F77=gfortran
@@ -146,6 +150,9 @@ 

  %{_libdir}/psi4/

  

  %changelog

+ * Fri Aug 10 2018 Marcel Plch <mplch@redhat.com> - 1:1.1-8.add49b9git

+ - Patch for pybind 2.2.3

+ 

  * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.1-7.add49b9git

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

  

Pull-Request has been merged by jussilehtola

5 years ago