<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9630557e73620912818ddfa9212b95367ccad4a0">https://github.com/macports/macports-ports/commit/9630557e73620912818ddfa9212b95367ccad4a0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 9630557e736 pymol: fix build on 10.13 and below
</span>9630557e736 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 9630557e73620912818ddfa9212b95367ccad4a0
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Fri Oct 15 21:20:56 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    pymol: fix build on 10.13 and below
</span>---
 science/pymol/Portfile                           |  6 ++++++
 science/pymol/files/patch-layer1_Wizard.cpp.diff | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pymol/Portfile b/science/pymol/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 822ac91d3a9..050c948c445 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pymol/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/pymol/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +81,12 @@ patchfiles          pymol_shell.diff \
</span>                     setup.py.diff \
                     patch-boost-include.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix for build on 10.13 and below, can be removed upon next update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see: https://github.com/schrodinger/pymol-open-source/issues/193
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} != "pymol-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-layer1_Wizard.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
     reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/setup.py
     reinplace  "s|@@BOOST_INC_DIR@@|[boost::include_dir]|g" ${worksrcpath}/setup.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pymol/files/patch-layer1_Wizard.cpp.diff b/science/pymol/files/patch-layer1_Wizard.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e86db1c955b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/pymol/files/patch-layer1_Wizard.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- layer1/Wizard.cpp.orig 2021-10-15 21:12:37.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ layer1/Wizard.cpp      2021-10-15 21:14:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -153,9 +153,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<typename Func, typename... FuncArgs>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto WizardCallPython(PyMOLGlobals* G, PyObject* wiz, const char* funcName, Func&& func, FuncArgs&&... fargs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  -> pymol::result_of_t<Func(PyObject*, const char*, FuncArgs...)>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  -> decltype(func(std::declval<PyObject*>(), std::declval<const char*>(), fargs...))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  using result_t = pymol::result_of_t<Func(PyObject*, const char*, FuncArgs...)>;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  using result_t = decltype(func(std::declval<PyObject*>(), std::declval<const char*>(), fargs...));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   result_t result{};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   assert(wiz != nullptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (PyObject_HasAttrString(wiz, funcName)) {
</span></pre><pre style='margin:0'>

</pre>