<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4fe617f17de2007b8f19f37ba371989e4057685a">https://github.com/macports/macports-ports/commit/4fe617f17de2007b8f19f37ba371989e4057685a</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 4fe617f17de Aseprite: Fix build on older systems
</span>4fe617f17de is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4fe617f17de2007b8f19f37ba371989e4057685a
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jan 11 23:46:52 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> Aseprite: Fix build on older systems
</span>---
graphics/Aseprite/Portfile | 13 +++++---
.../Aseprite/files/no-base_aligned_alloc.patch | 38 ++++++++++++++++++++++
2 files changed, 46 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/Portfile b/graphics/Aseprite/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dc36760960b..4b032fc3e33 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Aseprite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/Aseprite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,10 @@ PortGroup app 1.0
</span> PortGroup cmake 1.1
PortGroup conflicts_build 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup xcodeversion 1.0
</span>
name Aseprite
categories graphics
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms {macosx >= 15}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {macosx >= 16}
</span> maintainers {ryandesign @ryandesign} openmaintainer
license Restrictive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -198,6 +197,13 @@ patchfiles prefix.patch \
</span> USE_SHARED_LIBARCHIVE.patch \
USE_SHARED_LIBWEBP.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Can probably apply this unconditionally but only these older systems need it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and builds for newer systems have already succeeded and I don't want to risk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# disturbing them.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append no-base_aligned_alloc.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace -W ${workpath}/skia/third_party "s|@PREFIX@|${prefix}|g" \
freetype2/BUILD.gn harfbuzz/BUILD.gn
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -330,9 +336,6 @@ post-destroot {
</span> "${prefix}/bin/makeicns -in [shellescape ${worksrcpath}/${extension_icon}] -out Extension.icns"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Might be able to improve this later using the MacOSX.sdk port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-minimum_xcodeversions {15 8}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # https://aseprite.org/faq/#if-aseprite-source-code-is-available-how-is-that-you-are-selling-it
notes "
${name} is free for personal and commercial use provided you compile it\
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/files/no-base_aligned_alloc.patch b/graphics/Aseprite/files/no-base_aligned_alloc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0a6b4eeb3df
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/Aseprite/files/no-base_aligned_alloc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: reference to unresolved using declaration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: excess elements in scalar initializer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+by removing base_aligned_alloc because it calls aligned_alloc which macOS 10.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and earlier don't have. Fortunately nothing calls base_aligned_alloc yet.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/laf/base/memory.cpp.orig 2023-11-15 13:30:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/laf/base/memory.cpp 2024-01-11 20:08:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -299,14 +299,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+-void* base_aligned_alloc(std::size_t bytes, std::size_t alignment)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LAF_WINDOWS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return _aligned_malloc(bytes, alignment);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return aligned_alloc(alignment, bytes);
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void base_aligned_free(void* mem)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/laf/base/memory.h.orig 2023-11-15 13:30:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/laf/base/memory.h 2024-01-11 20:10:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,11 +34,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void base_free (void* mem);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char* base_strdup (const char* string);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void* base_aligned_alloc(std::size_t bytes, std::size_t alignment = base_alignment);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void* base_aligned_alloc(std::size_t bytes, std::size_t alignment);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void base_aligned_free(void* mem);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef LAF_MEMLEAK
</span></pre><pre style='margin:0'>
</pre>