<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1a34c9e5be7d98519754e959043fc6fc85ea855b">https://github.com/macports/macports-ports/commit/1a34c9e5be7d98519754e959043fc6fc85ea855b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1a34c9e5be7d98519754e959043fc6fc85ea855b
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Mon Jun 10 03:32:03 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    treesheets: update to 20230408
</span>---
 editors/treesheets/Portfile                        | 27 +++++++++++++++------
 ...ls.h-avoid-conflicting-define-for-ssize_t.patch | 28 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 7 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/treesheets/Portfile b/editors/treesheets/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 647aeca6022..eb2d896ac9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/treesheets/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/treesheets/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,11 @@ PortGroup           cmake 1.1
</span> PortGroup           github 1.0
 PortGroup           wxWidgets 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        aardappel treesheets 5175451
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version             20210411
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        aardappel treesheets 4640240271
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             20230408
</span> revision            0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            http://strlen.com/treesheets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            https://strlen.com/treesheets
</span> 
 description         Free-Form Data Organizer (Hierarchical Spreadsheet)
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,12 +22,16 @@ maintainers         {gmail.com:herby.gillot @herbygillot} \
</span>                     openmaintainer
 
 checksums           ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  c6e758bbfb4d91d383fda66d6ff9d90908ec38a3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  6b76d44578627e67d9a56c665f8ea08d354ec87a127c57da6a7d2a9c8593d14a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    2490516
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  9164ba2f3ff1678cbaeac267da4c87684eee1012 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  394b6ab25126a0b9fc680ec8dfd53385170664eb8fcb40b4e24489afda9ab770 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    3060894
</span> 
 github.tarball_from archive
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/aardappel/treesheets/pull/671
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   0001-lobster-tools.h-avoid-conflicting-define-for-ssize_t.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/aardappel/treesheets/issues/670
</span> if {${os.platform} eq "darwin" && ${os.major} > 17} {
     wxWidgets.use   wxWidgets-3.2
 } elseif {${os.platform} eq "darwin" && ${os.major} > 11} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +41,7 @@ if {${os.platform} eq "darwin" && ${os.major} > 17} {
</span> }
 
 compiler.cxx_standard \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    2017
</span> 
 set ts_app_dir      ${applications_dir}/TreeSheets.app
 set ts_libexec_dir  ${prefix}/libexec/${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +59,15 @@ build.env-append    PATH=$env(PATH):${wxWidgets.prefix}/bin
</span> configure.args-append \
                     -DwxWidgets_CONFIG_EXECUTABLE=${wxWidgets.wxconfig}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${configure.build_arch} in [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:libdispatch-legacy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -I${prefix}/libexec/dispatch/usr/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${prefix}/libexec/dispatch/usr/lib/libdispatch.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
     # Set up .app directory
     file mkdir ${destroot}${ts_app_dir}/Contents/MacOS
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/treesheets/files/0001-lobster-tools.h-avoid-conflicting-define-for-ssize_t.patch b/editors/treesheets/files/0001-lobster-tools.h-avoid-conflicting-define-for-ssize_t.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fb2a1559a1e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/treesheets/files/0001-lobster-tools.h-avoid-conflicting-define-for-ssize_t.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 384dfd3d2fc47505e462607a7676279bbf81ec34 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 10 Jun 2024 01:50:01 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] lobster/tools.h: avoid conflicting define for ssize_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lobster/src/lobster/tools.h | 7 +++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git lobster/src/lobster/tools.h lobster/src/lobster/tools.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 42d5434..2640793 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lobster/src/lobster/tools.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lobster/src/lobster/tools.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,9 +25,12 @@ typedef int64_t iint;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // args and indexing, so using the 64-bit type above would introduce a lot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // of casts. Best we can do is a signed version of that, until we can
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // stop targetting 32-bit entirely.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// This may also be defined in Posix (sys/types.h), but in C++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// redefining typedefs is totally cool:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// This may also be defined in Posix (sys/types.h) or in string.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// on Darwin, where it breaks the build. Undefine ssize_t if defined.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef ssize_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef ssize_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef ptrdiff_t ssize_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Custom _L suffix, since neither L (different size on win/nix) or LL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // (does not convert to int64_t on nix!) is portable.
</span></pre><pre style='margin:0'>

</pre>