<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/60d5eb578fe7b2b0931a6fc84e1c90e29472bd4f">https://github.com/macports/macports-ports/commit/60d5eb578fe7b2b0931a6fc84e1c90e29472bd4f</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 60d5eb578fe Aseprite: Update to 1.3.7
</span>60d5eb578fe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 60d5eb578fe7b2b0931a6fc84e1c90e29472bd4f
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jun 12 14:58:32 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> Aseprite: Update to 1.3.7
</span>---
graphics/Aseprite/Portfile | 11 +--
.../Aseprite/files/USE_SHARED_LIBARCHIVE.patch | 14 ++--
graphics/Aseprite/files/updater-lib.patch | 84 ++++++++++++++++++++++
3 files changed, 97 insertions(+), 12 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 49a4b4437a8..3ef85208a6f 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;'>@@ -41,7 +41,7 @@ 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.6 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup aseprite aseprite 1.3.7 v
</span> revision 0
# Aseprite doesn't specify which commit of depot_tools we should use, so I'm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,9 +58,9 @@ distname ${name}-v${version}-Source
</span> use_zip yes
checksums ${distfiles} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7ac3f5e221a27db10e843db73dd16dd188c699c8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5e974aa2786297981cd5ebe81f040a49b722bddfe33d70def207ad06cb0d34fc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 64194232 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 f3e8e40f4ff496a44058efeafe67591513c00a8f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6524b4dd38adac22f954122846ccca7377983cee2e0f17c1482294cf09cbdcfc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 64992864 \
</span> skia-${skia_commit}.tar.gz \
rmd160 b7649f5478916cf79567f2bedd70cf1b361fd723 \
sha256 6924ab75b5ea2b7390d22ad1710b8e6586d6068aec79457362350820bf10aaf3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,7 +118,7 @@ depends_lib-append port:cmark \
</span> port:lz4 \
port:mesa \
port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tinyxml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tinyxml2 \
</span> port:webp \
port:zlib \
port:zstd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,6 +191,7 @@ post-extract {
</span>
patch.dir ${workpath}
patchfiles prefix.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ updater-lib.patch \
</span> USE_SHARED_LIBARCHIVE.patch \
USE_SHARED_LIBWEBP.patch
<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 a92e588558d..ec175abe684 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;'>@@ -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-04-05 18:58:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/src/app/CMakeLists.txt 2024-04-16 12:11:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/src/app/CMakeLists.txt.orig 2024-06-12 15:03:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/src/app/CMakeLists.txt 2024-06-12 15:03:16.000000000 -0500
</span> @@ -95,9 +95,6 @@
add_definitions(-DENABLE_PSD)
endif()
<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;'>-@@ -726,8 +723,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -728,8 +725,8 @@
</span> ${ZLIB_LIBRARIES}
${FREETYPE_LIBRARIES}
${HARFBUZZ_LIBRARIES}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,9 +47,9 @@ https://github.com/aseprite/aseprite/pull/2535
</span> fmt
tinyexpr
qoi)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/third_party/CMakeLists.txt.orig 2023-04-19 15:39:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/third_party/CMakeLists.txt 2023-04-19 20:20:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,6 +126,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/third_party/CMakeLists.txt.orig 2024-05-08 06:31:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/third_party/CMakeLists.txt 2024-06-12 13:25:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,6 +127,7 @@
</span> add_subdirectory(json11)
# libarchive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +57,7 @@ https://github.com/aseprite/aseprite/pull/2535
</span> set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.")
set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,6 +145,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,6 +146,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/updater-lib.patch b/graphics/Aseprite/files/updater-lib.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8ec63a9816b
</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/updater-lib.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,84 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Now updater-lib is always compiled as it's required for app.os.fullName in scripts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Undefined symbols for architecture x86_64:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "updater::getFullOSString()", referenced from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app::script::(anonymous namespace)::AppOS_get_fullName(lua_State*) in libapp-lib.a(app_os_object.cpp.o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/aseprite/aseprite/issues/4486
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/aseprite/aseprite/commit/8fce589069090bb086d7ad7b0b50340171c98b17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,6 +117,10 @@ if(REQUIRE_CURL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(net)
</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;'>++# We need the updater library to check for updates (when
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ENABLE_UPDATER) or for the app.os object (ENABLE_SCRIPTING).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++add_subdirectory(updater)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(GEN_EXE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(gen IMPORTED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(gen PROPERTIES IMPORTED_LOCATION ${GEN_EXE})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,10 +131,6 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(GEN_DEP gen)
</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;'>+-if(ENABLE_UPDATER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_subdirectory(updater)
</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;'>+ if(ENABLE_STEAM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(steam)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/src/app/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/src/app/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -717,6 +717,7 @@ target_link_libraries(app-lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ laf-os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui-lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ver-lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ updater-lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ undo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMARK_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${TINYXML_LIBRARY}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -756,10 +757,6 @@ if(ENABLE_SCRIPTING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</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;'>+-if(ENABLE_UPDATER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries(app-lib updater-lib)
</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;'>+ if(ENABLE_STEAM)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We need the ENABLE_STEAM flag in main module too so AppOptions are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # equal in both modules, app-lib and main (that's why this flag is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/src/updater/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/src/updater/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,15 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ASEPRITE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Copyright (C) 2020-2021 Igara Studio S.A.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Copyright (C) 2020-2024 Igara Studio S.A.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright (C) 2001-2017 David Capello
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(UPDATER_LIB_SOURCES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- check_update.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- user_agent.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# By default the updater-lib will contain only the functions related
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# the user agent string.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++add_library(updater-lib user_agent.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_link_libraries(updater-lib laf-base ver-lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_library(updater-lib ${UPDATER_LIB_SOURCES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_libraries(updater-lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- laf-base
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- net-lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ver-lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${TINYXML_LIBRARY})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Only when ENABLE_UPDATER is ON we'll enable the "check for update"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# portion of the library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(ENABLE_UPDATER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_sources(updater-lib PRIVATE check_update.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(updater-lib net-lib ${TINYXML_LIBRARY})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span></pre><pre style='margin:0'>
</pre>