<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7e0cc603b01062ca0949309aa2a5b38d0f93bc11">https://github.com/macports/macports-ports/commit/7e0cc603b01062ca0949309aa2a5b38d0f93bc11</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 7e0cc603b01 cherrytree: fix crash on launch See: https://trac.macports.org/ticket/65743
</span>7e0cc603b01 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7e0cc603b01062ca0949309aa2a5b38d0f93bc11
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Sep 14 08:16:37 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> cherrytree: fix crash on launch
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/65743
</span>---
editors/cherrytree/Portfile | 4 +++-
.../files/patch-ct_filesystem-empty-string.diff | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/cherrytree/Portfile b/editors/cherrytree/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 131b77275b8..d5ce7da8d01 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/cherrytree/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/cherrytree/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup app 1.0
</span> PortGroup active_variants 1.1
github.setup giuspen cherrytree 0.99.49
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories editors
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +42,8 @@ configure.ldflags-append \
</span> compiler.cxx_standard 2017
patchfiles-append patch-cherrytree-all-apple-is-not-homebrew-for-goodness-sake.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix crash on launch; see: https://trac.macports.org/ticket/65743
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-ct_filesystem-empty-string.diff
</span>
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/cherrytree/files/patch-ct_filesystem-empty-string.diff b/editors/cherrytree/files/patch-ct_filesystem-empty-string.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ba46c0d9e0a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/cherrytree/files/patch-ct_filesystem-empty-string.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#===================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# From: Ken Cunningham
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: Tue, 13 Sep 2022 20:29:26 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Subject: [PATCH] legacy_canonicalize_filename: manage empty filename
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this function crashes if the filename is an empty string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# just return an empty string if it comes in as one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see: https://github.com/giuspen/cherrytree/issues/2112
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#===================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/ct/ct_filesystem.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/ct/ct_filesystem.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,6 +46,10 @@ static fs::path _mingw64Dir;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // replacement of Glib::canonicalize_filename for Glibmm < 2.64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string legacy_canonicalize_filename(const std::string& filename, const std::string& relative_to/*= ""*/)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // manage case where filename is an empty string -- just send it back unchanged
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (filename == "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string retFilepath;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GFile* pGFile{nullptr};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (not Glib::path_is_absolute(filename) and not relative_to.empty()) {
</span></pre><pre style='margin:0'>
</pre>