<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/46fb844bed24f6ef9cbacaa96ce0ebaf479287db">https://github.com/macports/macports-ports/commit/46fb844bed24f6ef9cbacaa96ce0ebaf479287db</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 46fb844bed24f6ef9cbacaa96ce0ebaf479287db
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sun Jan 26 05:53:40 2025 -0600
<span style='display:block; white-space:pre;color:#404040;'> Aseprite: Update to 1.3.11
</span>---
graphics/Aseprite/Portfile | 15 +++--
.../Aseprite/files/USE_SHARED_LIBARCHIVE.patch | 24 ++++----
graphics/Aseprite/files/USE_SHARED_LIBWEBP.patch | 12 ++--
graphics/Aseprite/files/USE_SHARED_TINYEXIF.patch | 70 ----------------------
graphics/Aseprite/files/json11.patch | 6 +-
.../Aseprite/files/no-base_aligned_alloc.patch | 18 +++---
6 files changed, 37 insertions(+), 108 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 6ae319e2591..71234e68777 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;'>@@ -42,15 +42,15 @@ license Restrictive
</span> # Aseprite (official or compiled). About the EULA is that you cannot
# compile Aseprite for commercial purposes (e.g. resell it)."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup aseprite aseprite 1.3.10.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup aseprite aseprite 1.3.11 v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 052eeb72394157c07a03af1da37e609b04c5debc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 73743039
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 02a6aff0b6c0fd6330c8da52e4ea8aab4e0535d9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e608b7a77a1d77a50394323759ba12cf3543e1d05745e1d907fe9818157f2d4c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 73750698
</span>
# Aseprite doesn't specify which commit of depot_tools we should use, so I'm
# using the most recent commit before this version of Aseprite was tagged.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set depot_tools_commit 090b7be49149a3045a01838df94af192c4e570cd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set depot_tools_commit 423f1e1914ab4aa7b2bdf804e216d4c097853ba2
</span>
# Latest commit in the skia branch indicated in INSTALL.md at the time this
# version of Aseprite was released.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +90,7 @@ description animated sprite editor & pixel art tool
</span> long_description ${name} is an image editor for creating animated \
sprites and other pixel art.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_branch 3.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.13
</span> set python_version [string map {. {}} ${python_branch}]
configure.python ${prefix}/bin/python${python_branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -246,8 +246,7 @@ patchfiles json11.patch \
</span> no-base_aligned_alloc.patch \
prefix.patch \
USE_SHARED_LIBARCHIVE.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- USE_SHARED_LIBWEBP.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- USE_SHARED_TINYEXIF.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_SHARED_LIBWEBP.patch
</span>
post-patch {
# https://github.com/aseprite/skia/issues/19
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/files/USE_SHARED_LIBARCHIVE.patch b/graphics/Aseprite/files/USE_SHARED_LIBARCHIVE.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e47f5c28df..04ba5013609 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Aseprite/files/USE_SHARED_LIBARCHIVE.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/Aseprite/files/USE_SHARED_LIBARCHIVE.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,13 @@
</span> Add option to use shared libarchive.
https://github.com/aseprite/aseprite/issues/1681
https://github.com/aseprite/aseprite/pull/2535
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/CMakeLists.txt.orig 2024-09-20 08:41:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/CMakeLists.txt 2024-10-08 07:13:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,2 +44,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/CMakeLists.txt.orig 2025-01-02 08:04:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/CMakeLists.txt 2025-01-26 05:30:41.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,2 +71,3 @@
</span> option(USE_SHARED_ZLIB "Use your installed copy of zlib" off)
+option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -210,6 +211,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -239,6 +240,17 @@
</span> endif()
include_directories(${ZLIB_INCLUDE_DIRS})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,8 +25,8 @@ https://github.com/aseprite/aseprite/pull/2535
</span> # libpng
if(USE_SHARED_LIBPNG)
find_package(PNG REQUIRED)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/src/app/CMakeLists.txt.orig 2024-11-21 05:51:45.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/src/app/CMakeLists.txt 2024-11-30 01:29:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/src/app/CMakeLists.txt.orig 2025-01-02 08:04:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/src/app/CMakeLists.txt 2025-01-26 05:37:22.000000000 -0600
</span> @@ -87,9 +87,6 @@
DEPENDS ${GEN_DEP} ${widget_files} ${string_files} "${SOURCE_DATA_DIR}/gui.xml")
list(APPEND generated_files ${output_fn})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ https://github.com/aseprite/aseprite/pull/2535
</span> ######################################################################
# app-lib target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -751,8 +748,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -752,8 +749,8 @@
</span> ${GIF_LIBRARIES}
${PNG_LIBRARIES}
${ZLIB_LIBRARIES}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,10 +46,10 @@ https://github.com/aseprite/aseprite/pull/2535
</span> - archive_static
fmt
tinyexpr
<span style='display:block; white-space:pre;background:#ffe0e0;'>- TinyEXIFstatic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/third_party/CMakeLists.txt.orig 2024-12-03 05:58:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/third_party/CMakeLists.txt 2024-12-03 06:02:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -128,6 +128,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qoi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/third_party/CMakeLists.txt.orig 2025-01-26 05:30:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/third_party/CMakeLists.txt 2025-01-26 05:30:41.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,6 +130,7 @@
</span> add_subdirectory(json11 EXCLUDE_FROM_ALL)
# libarchive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +57,7 @@ https://github.com/aseprite/aseprite/pull/2535
</span> set(HAVE_WCSCPY 1)
set(HAVE_WCSLEN 1)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -149,6 +150,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,6 +152,7 @@
</span> add_subdirectory(libarchive)
target_include_directories(archive_static INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libarchive/libarchive>)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/files/USE_SHARED_LIBWEBP.patch b/graphics/Aseprite/files/USE_SHARED_LIBWEBP.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index e676229f325..3e6d4cc750f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Aseprite/files/USE_SHARED_LIBWEBP.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/Aseprite/files/USE_SHARED_LIBWEBP.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,13 +2,13 @@ Bring back the USE_SHARED_LIBWEBP option.
</span> https://github.com/aseprite/aseprite/issues/1699
https://github.com/orivej/aseprite/commit/6e3f74107c40029584c524d7458f5c5674c933c3
https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c17
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/CMakeLists.txt.orig 2024-10-08 07:23:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/CMakeLists.txt 2024-10-08 11:50:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,2 +46,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/CMakeLists.txt.orig 2025-01-26 05:37:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/CMakeLists.txt 2025-01-26 05:39:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,2 +73,3 @@
</span> option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
+option(USE_SHARED_LIBWEBP "Use your installed copy of libwebp" off)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -341,6 +342,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(USE_SHARED_TINYEXIF "Use your installed copy of TinyEXIF" off)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -380,6 +381,10 @@
</span>
# libwebp
if(ENABLE_WEBP)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c
</span> # Use libwebp from Skia
if(LAF_BACKEND STREQUAL "skia")
find_library(WEBP_LIBRARIES webp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -357,6 +362,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -396,6 +401,7 @@
</span> set(WEBP_LIBRARIES webp webpdemux libwebpmux)
set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
endif()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/files/USE_SHARED_TINYEXIF.patch b/graphics/Aseprite/files/USE_SHARED_TINYEXIF.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1a84654dfeb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Aseprite/files/USE_SHARED_TINYEXIF.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,70 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/aseprite/aseprite/issues/4843
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/CMakeLists.txt.orig 2024-12-02 05:30:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/CMakeLists.txt 2024-12-02 05:33:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,6 +45,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(USE_SHARED_LIBWEBP "Use your installed copy of libwebp" off)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option(USE_SHARED_TINYEXIF "Use your installed copy of TinyEXIF" off)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -167,6 +168,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(FREETYPE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/freetype2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(HARFBUZZ_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/harfbuzz)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SIMPLEINI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/simpleini)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(TINYEXIF_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/TinyEXIF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(TINYXML_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/tinyxml2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(ZLIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zlib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -250,6 +252,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories(${TINYXML_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# TinyEXIF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(USE_SHARED_TINYEXIF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_library(TINYEXIF_LIBRARY NAMES TinyEXIF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_path(TINYEXIF_INCLUDE_DIR NAMES TinyEXIF.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(TINYEXIF_LIBRARY TinyEXIFstatic)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(TINYEXIF_INCLUDE_DIR ${TINYEXIF_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+include_directories(${TINYEXIF_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # pixman
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(USE_SHARED_PIXMAN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(PIXMAN_LIBRARY NAMES pixman pixman-1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/src/app/CMakeLists.txt.orig 2024-12-02 05:30:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/src/app/CMakeLists.txt 2024-12-02 05:30:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -744,6 +744,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- undo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMARK_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${TINYXML_LIBRARY}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${TINYEXIF_LIBRARY}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${JPEG_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${GIF_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${PNG_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -752,7 +753,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- json11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fmt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tinyexpr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TinyEXIFstatic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qoi)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_WEBP AND WEBP_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/third_party/CMakeLists.txt.orig 2024-12-02 05:30:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/third_party/CMakeLists.txt 2024-12-02 05:30:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,11 +58,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(tinyxml2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(NOT USE_SHARED_TINYEXIF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(BUILD_SHARED_LIBS OFF CACHE BOOL "build as shared library")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(BUILD_STATIC_LIBS ON CACHE BOOL "build as static library")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(LINK_CRT_STATIC_LIBS OFF CACHE BOOL "link CRT static library")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(BUILD_DEMO OFF CACHE BOOL "build demo binary")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(TinyEXIF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(REQUIRE_CURL AND NOT USE_SHARED_CURL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(BUILD_RELEASE_DEBUG_DIRS ON BOOL)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/files/json11.patch b/graphics/Aseprite/files/json11.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f11a9cc8af7..1cbf5b321e2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Aseprite/files/json11.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/Aseprite/files/json11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> Prevent json11 files from being installed when Aseprite is installed.
https://github.com/aseprite/aseprite/issues/1602
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/third_party/CMakeLists.txt.orig 2024-10-28 16:48:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/third_party/CMakeLists.txt 2024-12-03 05:58:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,7 +125,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/third_party/CMakeLists.txt.orig 2025-01-02 08:04:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/third_party/CMakeLists.txt 2025-01-26 05:14:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,7 +127,7 @@
</span> endif()
# JSON
<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 4afc7a05658..2e8d5bbda31 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 2024-05-08 13:22:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/laf/base/memory.cpp 2024-08-28 21:31:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -301,18 +301,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/laf/base/memory.cpp.orig 2025-01-06 14:03:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/laf/base/memory.cpp 2025-01-26 05:14:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -303,18 +303,6 @@
</span>
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,16 +26,16 @@ and earlier don't have. Fortunately nothing calls base_aligned_alloc yet.
</span>
void base_aligned_free(void* mem)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/laf/base/memory.h.orig 2024-02-29 08:08:07.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/laf/base/memory.h 2024-08-28 21:26:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/laf/base/memory.h.orig 2025-01-06 14:03:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/laf/base/memory.h 2025-01-26 05:16:25.000000000 -0600
</span> @@ -33,11 +33,6 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- void base_free (void* mem);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char* base_strdup (const char* string);
</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>
-#ifdef __cplusplus
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- void* base_aligned_alloc(std::size_t bytes, std::size_t alignment = base_alignment);
</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> -#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- void* base_aligned_alloc(std::size_t bytes, std::size_t alignment);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void* base_aligned_alloc(std::size_t bytes, std::size_t alignment);
</span> -#endif
void base_aligned_free(void* mem);
</pre><pre style='margin:0'>
</pre>