<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/deffa5133d266b2a88f0e927d5ce360247f58329">https://github.com/macports/macports-ports/commit/deffa5133d266b2a88f0e927d5ce360247f58329</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 deffa5133d2 pymol Update to 3.0.0
</span>deffa5133d2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit deffa5133d266b2a88f0e927d5ce360247f58329
</span>Author: jwhowarth <howarth.mailing.lists@gmail.com>
AuthorDate: Fri Apr 12 11:29:04 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> pymol Update to 3.0.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update to new pymol 3.0.0 upstream release and remove the unnecessary patches patch-layer1_Wizard.cpp.diff and patch-vtkm.diff.
</span>---
science/pymol/Portfile | 18 +++-------
science/pymol/files/patch-layer1_Wizard.cpp.diff | 14 --------
science/pymol/files/patch-vtkm.diff | 43 ------------------------
3 files changed, 4 insertions(+), 71 deletions(-)
<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 a8700882236..5801bc7d41c 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;'>@@ -5,8 +5,7 @@ PortGroup python 1.0
</span> PortGroup github 1.0
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup schrodinger pymol-open-source 2.5.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup schrodinger pymol-open-source 3.0.0 v
</span> name pymol
conflicts pymol-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +21,9 @@ long_description PyMOL is a molecular graphics system with an embedded Python
</span>
homepage https://www.pymol.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6432d47616aee1e5d9d40cc2a74425b33159d7a0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 67c5aa944ce9ac2e3babd42e7e2b78ed11719283a2c0a063e100cfe24665c0d3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10471287
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d963b8704371db01d78cf75708b29f8f1c27829a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 27659a99d843c58c513bd9fd78cc67a717cef151b34a439213fbca8bffa2298f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 29508167
</span>
subport pymol-devel {
github.setup schrodinger pymol-open-source c33c916e7c21a86e220260d4ed08d9c26f7c6da4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,15 +90,6 @@ patchfiles pymol_shell.diff \
</span> setup.py.diff \
patch-boost-include.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# two fixes for PyMOL v2.5.0 (can be removed upon next update):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 1. fix for build on 10.13 and below;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see: https://github.com/schrodinger/pymol-open-source/issues/193
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 2. fix for build with VTK-M 1.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} != "pymol-devel"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-layer1_Wizard.cpp.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-vtkm.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e86db1c955b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pymol/files/patch-layer1_Wizard.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- layer1/Wizard.cpp.orig 2021-10-15 21:12:37.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ layer1/Wizard.cpp 2021-10-15 21:14:04.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -153,9 +153,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template<typename Func, typename... FuncArgs>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto WizardCallPython(PyMOLGlobals* G, PyObject* wiz, const char* funcName, Func&& func, FuncArgs&&... fargs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -> pymol::result_of_t<Func(PyObject*, const char*, FuncArgs...)>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -> decltype(func(std::declval<PyObject*>(), std::declval<const char*>(), fargs...))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- using result_t = pymol::result_of_t<Func(PyObject*, const char*, FuncArgs...)>;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ using result_t = decltype(func(std::declval<PyObject*>(), std::declval<const char*>(), fargs...));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- result_t result{};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(wiz != nullptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (PyObject_HasAttrString(wiz, funcName)) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pymol/files/patch-vtkm.diff b/science/pymol/files/patch-vtkm.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a9850b322f0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pymol/files/patch-vtkm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with vtk-m 1.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See: https://github.com/schrodinger/pymol-open-source/commit/5a6d65e8a5102fc71bcb5ac714e62884fca50505
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/setup.py b/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 07d90ffd4..4dbfd7c76 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,7 +46,7 @@ class options:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- help="skip libxml2 dependency, disables COLLADA export")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parser.add_argument('--use-openmp', choices=('yes', 'no'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- help="Use OpenMP")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- parser.add_argument('--use-vtkm', choices=('1.5.x', 'master', 'no'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ parser.add_argument('--use-vtkm', choices=('1.5', '1.6', '1.7', 'no'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- help="Use VTK-m for isosurface generation")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parser.add_argument('--use-msgpackc', choices=('c++11', 'c', 'guess', 'no'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- help="c++11: use msgpack-c header-only library; c: link against "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -421,7 +421,7 @@ def make_launch_script(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if options.use_vtkm != "no":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for prefix in prefix_path:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vtkm_inc_dir = os.path.join(prefix, "include", "vtkm-1.5")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vtkm_inc_dir = os.path.join(prefix, "include", f"vtkm-{options.use_vtkm}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.path.exists(vtkm_inc_dir):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -434,14 +434,14 @@ def make_launch_script(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vtkm_inc_dir,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vtkm_inc_dir + "/vtkm/thirdparty/diy/vtkmdiy/include",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vtkm_inc_dir + "/vtkm/thirdparty/lcl/vtkmlcl",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ] + (options.use_vtkm != "master") * [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ] + (options.use_vtkm == "1.5") * [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vtkm_inc_dir + "/vtkm/thirdparty/diy",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vtkm_inc_dir + "/vtkm/thirdparty/taotuple",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libs += [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "vtkm_cont-1.5",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "vtkm_filter_contour-1.5"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if options.use_vtkm == "master" else "vtkm_filter-1.5",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f"vtkm_cont-{options.use_vtkm}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f"vtkm_filter-{options.use_vtkm}" if options.use_vtkm == "1.5" else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f"vtkm_filter_contour-{options.use_vtkm}",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if options.vmd_plugins:
</span></pre><pre style='margin:0'>
</pre>