<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/04fd2b746dbf62d1149ffa0f2e0007ae33e9dcfb">https://github.com/macports/macports-ports/commit/04fd2b746dbf62d1149ffa0f2e0007ae33e9dcfb</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 04fd2b746db Aseprite: Update to 1.3.8.1
</span>04fd2b746db is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 04fd2b746dbf62d1149ffa0f2e0007ae33e9dcfb
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Aug 28 21:00:16 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> Aseprite: Update to 1.3.8.1
</span>---
graphics/Aseprite/Portfile | 11 ++-
.../Aseprite/files/USE_SHARED_LIBARCHIVE.patch | 32 ++++-----
graphics/Aseprite/files/USE_SHARED_LIBWEBP.patch | 8 +--
graphics/Aseprite/files/updater-lib.patch | 84 ----------------------
4 files changed, 25 insertions(+), 110 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 3ef85208a6f..22cfc4d3320 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,12 +41,12 @@ 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.7 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup aseprite aseprite 1.3.8.1 v
</span> revision 0
# 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 f85dd800c796d44fa1b16f16f74cb1366a0670c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set depot_tools_commit 8f617b46176734ebd25b08ed4f2ab817e57c3a8a
</span>
# Latest commit in skia's aseprite-m102 branch at the time this version of
# Aseprite was released (see INSTALL.md).
<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 f3e8e40f4ff496a44058efeafe67591513c00a8f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6524b4dd38adac22f954122846ccca7377983cee2e0f17c1482294cf09cbdcfc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 64992864 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 44967fdc88cb6c5625284dc9495a69ba0507b2f6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fc13536a9e14551245028d578493aa63f9978b943250936735dc62a5abfbee53 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 65968844 \
</span> skia-${skia_commit}.tar.gz \
rmd160 b7649f5478916cf79567f2bedd70cf1b361fd723 \
sha256 6924ab75b5ea2b7390d22ad1710b8e6586d6068aec79457362350820bf10aaf3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,7 +191,6 @@ post-extract {
</span>
patch.dir ${workpath}
patchfiles prefix.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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 ec175abe684..1e3d029950c 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 2023-11-28 16:57:22.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/CMakeLists.txt 2024-01-11 14:12:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/CMakeLists.txt.orig 2024-08-21 17:10:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/CMakeLists.txt 2024-08-28 12:36:10.000000000 -0500
</span> @@ -44,2 +44,3 @@
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;'>-@@ -208,6 +209,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -214,6 +215,17 @@
</span> endif()
include_directories(${ZLIB_INCLUDE_DIRS})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,11 +25,11 @@ 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-06-12 15:03:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/src/app/CMakeLists.txt 2024-06-12 15:03:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,9 +95,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_definitions(-DENABLE_PSD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/src/app/CMakeLists.txt.orig 2024-08-21 17:10:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/src/app/CMakeLists.txt 2024-08-28 12:36:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,9 +87,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEPENDS ${GEN_DEP} ${widget_files} ${string_files} "${SOURCE_DATA_DIR}/gui.xml")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND generated_files ${output_fn})
</span>
-# libarchive definitions
-add_definitions(-DLIBARCHIVE_STATIC)
<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;'>-@@ -728,8 +725,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -759,8 +756,8 @@
</span> ${ZLIB_LIBRARIES}
${FREETYPE_LIBRARIES}
${HARFBUZZ_LIBRARIES}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,17 +47,17 @@ 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 2024-05-08 06:31:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/third_party/CMakeLists.txt 2024-06-12 13:25:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,6 +127,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/third_party/CMakeLists.txt.orig 2024-08-21 17:10:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/third_party/CMakeLists.txt 2024-08-28 12:38:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,6 +116,7 @@
</span> add_subdirectory(json11)
# libarchive
+if(NOT USE_SHARED_LIBARCHIVE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,6 +146,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(HAVE_WCSCPY 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(HAVE_WCSLEN 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,6 +138,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 475ec3f96da..6042ff90b78 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-03-06 09:27:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/CMakeLists.txt 2024-03-06 09:27:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/CMakeLists.txt.orig 2024-08-21 17:10:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/CMakeLists.txt 2024-08-28 12:38:54.000000000 -0500
</span> @@ -46,2 +46,3 @@
option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
+option(USE_SHARED_LIBWEBP "Use your installed copy of libwebp" off)
option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -340,6 +341,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -346,6 +347,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;'>-@@ -350,6 +355,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -356,6 +361,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/updater-lib.patch b/graphics/Aseprite/files/updater-lib.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8ec63a9816b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Aseprite/files/updater-lib.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,84 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Undefined symbols for architecture x86_64:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "updater::getFullOSString()", referenced from:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/aseprite/aseprite/issues/4486
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/aseprite/aseprite/commit/8fce589069090bb086d7ad7b0b50340171c98b17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,6 +117,10 @@ if(REQUIRE_CURL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(net)
</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;'>-+# We need the updater library to check for updates (when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ENABLE_UPDATER) or for the app.os object (ENABLE_SCRIPTING).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_subdirectory(updater)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(GEN_EXE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_executable(gen IMPORTED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(gen PROPERTIES IMPORTED_LOCATION ${GEN_EXE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,10 +131,6 @@ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(GEN_DEP gen)
</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(ENABLE_UPDATER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_subdirectory(updater)
</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(ENABLE_STEAM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(steam)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/src/app/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/src/app/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -717,6 +717,7 @@ target_link_libraries(app-lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- laf-os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui-lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ver-lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ updater-lib
</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;'>-@@ -756,10 +757,6 @@ if(ENABLE_SCRIPTING)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</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(ENABLE_UPDATER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_link_libraries(app-lib updater-lib)
</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(ENABLE_STEAM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We need the ENABLE_STEAM flag in main module too so AppOptions are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # equal in both modules, app-lib and main (that's why this flag is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/src/updater/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/src/updater/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,15 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ASEPRITE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Copyright (C) 2020-2021 Igara Studio S.A.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Copyright (C) 2020-2024 Igara Studio S.A.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copyright (C) 2001-2017 David Capello
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(UPDATER_LIB_SOURCES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- check_update.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- user_agent.cpp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# By default the updater-lib will contain only the functions related
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# the user agent string.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_library(updater-lib user_agent.cpp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_link_libraries(updater-lib laf-base ver-lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_library(updater-lib ${UPDATER_LIB_SOURCES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target_link_libraries(updater-lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- laf-base
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- net-lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ver-lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${TINYXML_LIBRARY})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Only when ENABLE_UPDATER is ON we'll enable the "check for update"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# portion of the library.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(ENABLE_UPDATER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_sources(updater-lib PRIVATE check_update.cpp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_link_libraries(updater-lib net-lib ${TINYXML_LIBRARY})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span></pre><pre style='margin:0'>
</pre>