<pre style='margin:0'>
Craig Treleaven (ctreleaven) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/913b1a02c112a678f15a14e2b1b021fe74188b82">https://github.com/macports/macports-ports/commit/913b1a02c112a678f15a14e2b1b021fe74188b82</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 913b1a02c11 zim: update to 0.75.1, various
</span>913b1a02c11 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 913b1a02c112a678f15a14e2b1b021fe74188b82
</span>Author: Craig Treleaven <ctreleaven@macports.org>
AuthorDate: Thu Jan 5 14:04:47 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> zim: update to 0.75.1, various
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> update to current release including patch for path issue
</span><span style='display:block; white-space:pre;color:#404040;'> specify noarch
</span><span style='display:block; white-space:pre;color:#404040;'> update to use Python 3.10; 3.11 untested at present
</span><span style='display:block; white-space:pre;color:#404040;'> add dummy variants ala Gramps for X11/Quartz
</span><span style='display:block; white-space:pre;color:#404040;'> switch to pretty app icon
</span><span style='display:block; white-space:pre;color:#404040;'> note that X11 variant cures bouncing app icon in Dock
</span><span style='display:block; white-space:pre;color:#404040;'> note that tests largely pass but not within MacPorts (?)
</span>---
editors/zim/Portfile | 51 ++++++++++++++++++++++++++++++++++++---------------
1 file changed, 36 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/zim/Portfile b/editors/zim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f29b23dde22..8b34a083876 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/zim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/zim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,8 @@ PortGroup app 1.0
</span> PortGroup github 1.0
name zim
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin any}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs noarch
</span> categories editors
maintainers nomaintainer
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,16 +22,15 @@ long_description \
</span> plugins provide additional functionality, like a task list manager, an \
equation editor, a tray icon, and support for version control.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://zim-wiki.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup zim-desktop-wiki zim-desktop-wiki 0.72.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${github.version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6dc04c9ead36e148448f2773be3ec92b0554fb12 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bfa2b630eef496c4ec3383ee9c14e5773140e6149e937ce8680fcecd05c67240 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2590805
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://zim-wiki.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup zim-desktop-wiki zim-desktop-wiki 0.75.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5b5062a5634ef90fb5abe23d5b26f32e1f7842ca \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e24f801ab6d2c0233eaf3bd36b23672282bdc602eadee1005d9c4487642f08fe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3212275
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 310
</span> python.link_binaries no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+python.test_framework ""
</span>
destroot.destdir-append \
--install-data=${prefix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,8 +44,23 @@ depends_run-append \
</span> port:adwaita-icon-theme \
port:desktop-file-utils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixed after 0.75.1 release, see
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/zim-desktop-wiki/zim-desktop-wiki/pull/2251
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-2251-fix-path-parsing.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Dummy variants, to ensure user's choice cascades to dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz conflicts x11 {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 conflicts quartz {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset quartz] && ![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Either +x11 or +quartz is required"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
pre-destroot {
xinstall -m 755 ${filespath}/zim ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,14 +69,20 @@ pre-destroot {
</span> }
post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- exec update-desktop-database
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/update-desktop-database -v ${prefix}/share/applications"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "env XDG_DATA_DIRS=${prefix}/share ${prefix}/bin/update-mime-database -Vn ${prefix}/share/mime"
</span> }
app.create yes
app.name Zim
app.executable zim
<span style='display:block; white-space:pre;background:#ffe0e0;'>-app.icon icons/zim48.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon icons/zim.ico
</span> app.retina yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.cmd ${python.bin} zim.py --help
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# tests fail to start when run via 'sudo port test'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# when run manually in the destroot directory, tests all run although 3 of 984
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# result in a failure. See
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/zim-desktop-wiki/zim-desktop-wiki/discussions/2282#discussioncomment-4595418
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd ${python.bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target test.py --verbose --debug
</span></pre><pre style='margin:0'>
</pre>