<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/7a9eccd1393dc9ebcb8b70bddf885fc0d8a578cf">https://github.com/macports/macports-ports/commit/7a9eccd1393dc9ebcb8b70bddf885fc0d8a578cf</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 7a9eccd1393 cherrytree: update to 0.99.55
</span>7a9eccd1393 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7a9eccd1393dc9ebcb8b70bddf885fc0d8a578cf
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu Apr 20 17:15:50 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> cherrytree: update to 0.99.55
</span>---
editors/cherrytree/Portfile | 14 +++++++-------
.../files/patch-ct_filesystem-empty-string.diff | 22 ----------------------
2 files changed, 7 insertions(+), 29 deletions(-)
<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 639d87a44d5..25d7fc0ec38 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;'>@@ -7,8 +7,8 @@ PortGroup cmake 1.1
</span> PortGroup app 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup giuspen cherrytree 0.99.49
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup giuspen cherrytree 0.99.55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories editors
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ github.tarball_from releases
</span> use_xz yes
distname ${name}_${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6150e97d1b078fc27521412fe1320f22f4e05fb2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cb3f48903716c3dfca7b4638c57137642d99c76f1bfc2f5f9f5b442baff2cde1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3469172
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 03447950e7132944e3988da0093a81f3daab31d4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7daa4358463eb41c133d9b4b742df18f68f47fa5bf398fc2e0801fc4c8381e84 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2449336
</span>
# Enable use of 'macports-libcxx' for macOS 10.12 and earlier, as port uses
# libcxx features normally only available on 10.13 and later.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,8 +42,6 @@ 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:#ffe0e0;'>-# Fix crash on launch; see: https://trac.macports.org/ticket/65743
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-ct_filesystem-empty-string.diff
</span>
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,6 +64,7 @@ depends_lib-append port:adwaita-icon-theme \
</span> port:gtkmm3 \
port:gtksourceview3 \
port:gtksourceviewmm3 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
</span> port:${port_libfmt} \
port:libsigcxx2 \
port:libxmlxx2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,6 +76,7 @@ depends_lib-append port:adwaita-icon-theme \
</span> port:uchardet
configure.args-append -DBUILD_TESTING=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DUSE_VTE=OFF
</span>
if {${os.platform} eq "darwin" && ${os.major} < 13} {
# uses '-k' option to gzip which is not supported until 10.9
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ba46c0d9e0a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/cherrytree/files/patch-ct_filesystem-empty-string.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#===================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# From: Ken Cunningham
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date: Tue, 13 Sep 2022 20:29:26 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Subject: [PATCH] legacy_canonicalize_filename: manage empty filename
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# this function crashes if the filename is an empty string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# just return an empty string if it comes in as one
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see: https://github.com/giuspen/cherrytree/issues/2112
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#===================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/ct/ct_filesystem.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/ct/ct_filesystem.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,6 +46,10 @@ static fs::path _mingw64Dir;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // replacement of Glib::canonicalize_filename for Glibmm < 2.64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string legacy_canonicalize_filename(const std::string& filename, const std::string& relative_to/*= ""*/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // manage case where filename is an empty string -- just send it back unchanged
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (filename == "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string retFilepath;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GFile* pGFile{nullptr};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (not Glib::path_is_absolute(filename) and not relative_to.empty()) {
</span></pre><pre style='margin:0'>
</pre>