<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/f4c2a305695ae18f86ad3f1f51a9223744e2d5ce">https://github.com/macports/macports-ports/commit/f4c2a305695ae18f86ad3f1f51a9223744e2d5ce</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 f4c2a305695 Aseprite: Update patch for macOS < 10.15
</span>f4c2a305695 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f4c2a305695ae18f86ad3f1f51a9223744e2d5ce
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Aug 28 21:38:31 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> Aseprite: Update patch for macOS < 10.15
</span>---
graphics/Aseprite/Portfile | 2 +-
graphics/Aseprite/files/no-base_aligned_alloc.patch | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 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 22cfc4d3320..41cbeec5bc3 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;'>@@ -197,7 +197,7 @@ patchfiles prefix.patch \
</span> # Can probably apply this unconditionally but only these older systems need it
# and builds for newer systems have already succeeded and I don't want to risk
# disturbing them.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${version} > 1.3.8.1] || (${os.platform} eq "darwin" && ${os.major} < 19)} {
</span> patchfiles-append no-base_aligned_alloc.patch
}
<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><span style='display:block; white-space:pre;color:#808080;'>index 0a6b4eeb3df..4afc7a05658 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Aseprite/files/no-base_aligned_alloc.patch
</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;'>@@ -5,9 +5,9 @@ error: excess elements in scalar initializer
</span>
by removing base_aligned_alloc because it calls aligned_alloc which macOS 10.14
and earlier don't have. Fortunately nothing calls base_aligned_alloc yet.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/laf/base/memory.cpp.orig 2023-11-15 13:30:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/laf/base/memory.cpp 2024-01-11 20:08:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -299,14 +299,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/laf/base/memory.cpp.orig 2024-05-08 13:22:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/laf/base/memory.cpp 2024-08-28 21:31:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -301,18 +301,6 @@
</span>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,15 +16,19 @@ and earlier don't have. Fortunately nothing calls base_aligned_alloc yet.
</span> -#if LAF_WINDOWS
- return _aligned_malloc(bytes, alignment);
-#else
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- ASSERT(alignment > 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::size_t misaligned = (bytes % alignment);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (misaligned > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bytes += alignment - misaligned;
</span> - return aligned_alloc(alignment, bytes);
-#endif
-}
void base_aligned_free(void* mem)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/laf/base/memory.h.orig 2023-11-15 13:30:37.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/laf/base/memory.h 2024-01-11 20:10:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,11 +34,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/laf/base/memory.h.orig 2024-02-29 08:08:07.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/laf/base/memory.h 2024-08-28 21:26:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,11 +33,6 @@
</span> void base_free (void* mem);
char* base_strdup (const char* string);
</pre><pre style='margin:0'>
</pre>