<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d8e80c6ebe7b72c33459e77815a72f5abdce7d1d">https://github.com/macports/macports-ports/commit/d8e80c6ebe7b72c33459e77815a72f5abdce7d1d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d8e80c6ebe7b72c33459e77815a72f5abdce7d1d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Feb 21 11:05:52 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> Aseprite: Update to 1.2.33
</span>---
graphics/Aseprite/Portfile | 44 +++++---
graphics/Aseprite/files/USE_SHARED_LIBWEBP.patch | 22 ++--
graphics/Aseprite/files/harfbuzz3.patch | 137 -----------------------
graphics/Aseprite/files/prefix.patch | 17 +--
graphics/Aseprite/files/stdlib.patch | 11 +-
5 files changed, 53 insertions(+), 178 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 4134fae7a5b..1be7aa20cee 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;'>@@ -9,23 +9,23 @@ PortGroup xcodeversion 1.0
</span>
name Aseprite
categories graphics
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms macosx
</span> maintainers {ryandesign @ryandesign} openmaintainer
# We are allowed to redistribute the source code but not binaries.
# https://github.com/aseprite/aseprite/blob/master/EULA.txt
# https://github.com/aseprite/aseprite/issues/2266#issuecomment-586600478
license Restrictive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup aseprite aseprite 1.2.30 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup aseprite aseprite 1.2.33 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
# Aseprite doesn't specify which commit of depot_tools we should use, so I'm
# using the latest commit at the time this version of Aseprite was released.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set depot_tools_commit 8093a3e1d1402592cdda0377303a0c4c8d58ca8c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set depot_tools_commit 1b93e14c92416185694f8764be425f82fa0d4242
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Latest commit in skia's aseprite-m81 branch at the time this version of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Latest commit in skia's aseprite-m96 branch at the time this version of
</span> # Aseprite was released (see INSTALL.md).
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set skia_commit 3043aa83d14f2251f22c068816ceb6759ea3fb61
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set skia_commit 223763e26f0e1dbfcdb0564b05a3a55c1cefe5a4
</span>
homepage https://aseprite.org
github.tarball_from releases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,13 +33,13 @@ distname ${name}-v${version}-Source
</span> use_zip yes
checksums ${distfiles} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 417acd8dadd3b5d585d17df3c8065a4d29865ec3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9f4b098fe2327f2e9d73eb9f2aeebecad63e87ff2cf6fb6eeeee3c0778bb8874 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 30057883 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skia-3043aa83d14f2251f22c068816ceb6759ea3fb61.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6b896f8f0fc374256a22713c9b244fbc01dc3c9f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 368813ce058806a267a3bf157f4b0133fb58ae531c2c38247d6e6a191f3280ff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 47137258
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5b5f117b2d9c527438420c66b1e4d401e602ade9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c3a86005f59483fcfcedae89bf82dfc6f82bba8d5244835ca4c005beab31435b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 56234668 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ skia-${skia_commit}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b9e09401b23be29bc735fefaa38164d7f6d1f2d3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f84fef3941b1207e49899f1b0d266a304e99f0cd7cde0f29cc2609650fc1f294 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 55741811
</span>
set main_distfile [lindex ${distfiles} 0]
set skia_distfile skia-${skia_commit}.tar.gz
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +57,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.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.10
</span> set python_version [string map {. {}} ${python_branch}]
configure.python ${prefix}/bin/python${python_branch}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,6 +86,7 @@ depends_lib-append port:bzip2 \
</span> path:lib/pkgconfig/harfbuzz-icu.pc:harfbuzz-icu \
port:icu \
port:libb2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdeflate \
</span> path:include/turbojpeg.h:libjpeg-turbo \
path:lib/pkgconfig/pixman-1.pc:libpixman \
port:libpng \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,7 +160,6 @@ post-extract {
</span>
patch.dir ${workpath}
patchfiles prefix.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- harfbuzz3.patch \
</span> stdlib.patch \
USE_SHARED_LIBWEBP.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,7 +238,10 @@ configure.args -DENABLE_BZip2=ON \
</span> -DENABLE_LIBXML2=ON \
-DENABLE_LZMA=ON \
-DENABLE_UPDATER=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_WEBP=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DHARFBUZZ_LIBRARY=${prefix}/lib/libharfbuzz.dylib \
</span> -DLAF_BACKEND=skia \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAF_WITH_EXAMPLES=OFF \
</span> -DPNG_SHARED=ON \
-DSKIA_DIR=${workpath}/skia \
-DSKIA_LIBRARY=[join ${skia_libraries} {\;}] \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -254,8 +257,13 @@ configure.args -DENABLE_BZip2=ON \
</span> -DUSE_SHARED_PIXMAN=YES \
-DUSE_SHARED_TINYXML=YES \
-DUSE_SHARED_ZLIB=YES \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_BZip2=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_WEBP_SUPPORT=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_BZip2=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Work around wrong libdeflate.0.dylib install_name.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/64699
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${build.dir}/bin "install_name_tool -change libdeflate.0.dylib ${prefix}/lib/libdeflate.0.dylib aseprite"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
app.executable ${build.dir}/bin/aseprite
app.retina yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -319,3 +327,5 @@ please purchase a license at ${homepage}/#buy
</span> Please read and agree to the end user license agreement:\
${github.raw}/${github.tag_prefix}${github.version}/EULA.txt
"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.livecheck.regex {([0-9.]+)}
</span><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 b93e8fe514a..b49e025ea63 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,9 +2,9 @@ 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 2021-05-17 17:54:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/CMakeLists.txt 2021-05-17 17:54:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,6 +56,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/CMakeLists.txt.orig 2022-01-30 22:50:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/CMakeLists.txt 2022-01-30 22:51:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,6 +52,7 @@
</span> option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
option(USE_SHARED_ZLIB "Use your installed copy of zlib" off)
option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,10 +12,10 @@ https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c
</span> option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off)
option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -223,9 +224,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -229,9 +230,29 @@
</span>
# libwebp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_WEBP_SUPPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_WEBP)
</span> - set(WEBP_LIBRARIES webp webpdemux libwebpmux)
- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src)
- include_directories(${WEBP_INCLUDE_DIR})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,14 +45,14 @@ https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c
</span> endif()
# tinyxml
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/third_party/CMakeLists.txt.orig 2021-04-13 16:40:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/third_party/CMakeLists.txt 2021-05-17 17:54:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/third_party/CMakeLists.txt.orig 2022-01-30 22:44:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/third_party/CMakeLists.txt 2022-01-30 22:51:33.000000000 -0600
</span> @@ -33,7 +33,7 @@
add_subdirectory(giflib)
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>--if(WITH_WEBP_SUPPORT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(WITH_WEBP_SUPPORT AND NOT USE_SHARED_LIBWEBP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(ENABLE_WEBP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(ENABLE_WEBP AND NOT USE_SHARED_LIBWEBP)
</span> set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(libwebp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(WEBP_BUILD_ANIM_UTILS OFF CACHE BOOL "Build animation utilities.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(WEBP_BUILD_CWEBP OFF CACHE BOOL "Build the cwebp command line tool.")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/files/harfbuzz3.patch b/graphics/Aseprite/files/harfbuzz3.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cd1acc1d407..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Aseprite/files/harfbuzz3.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,137 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Add support for harfbuzz 3's subsetting API. Combination of:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/aseprite/skia/commit/66684b17b382fdfe6cc3d18bbbe46658115e8628
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/aseprite/skia/commit/51d83abcd24aae1b2e8e653f26af531c58b59a45
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- skia/gn/skia.gni.orig 2020-03-11 07:02:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skia/gn/skia.gni 2021-12-31 02:18:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skia_include_multiframe_procs = false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skia_lex = false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skia_libgifcodec_path = "third_party/externals/libgifcodec"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- skia_pdf_subset_harfbuzz = false # TODO: set skia_pdf_subset_harfbuzz to skia_use_harfbuzz.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skia_qt_path = getenv("QT_PATH")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skia_skqp_global_error_tolerance = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skia_tools_require_resources = false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,6 +84,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- declare_args() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ skia_pdf_subset_harfbuzz = skia_use_harfbuzz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+declare_args() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skia_enable_atlas_text = is_skia_dev_build && skia_enable_gpu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skia_enable_fontmgr_android = skia_use_expat && skia_use_freetype
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skia_enable_fontmgr_custom =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- skia/src/pdf/SkPDFSubsetFont.cpp.orig 2020-03-11 07:02:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skia/src/pdf/SkPDFSubsetFont.cpp 2021-12-31 02:18:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,6 +49,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- blob.release());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template<typename...> using void_t = void;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template<typename T, typename = void>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct SkPDFHarfBuzzSubset {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // This is the HarfBuzz 3.0 interface.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // hb_subset_flags_t does not exist in 2.0. It isn't dependent on T, so inline the value of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // HB_SUBSET_FLAGS_RETAIN_GIDS until 2.0 is no longer supported.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static HBFace Make(T input, hb_face_t* face) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // If it isn't known if a font is 'tricky', retain the hints.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hb_subset_input_set_flags(input, 2/*HB_SUBSET_FLAGS_RETAIN_GIDS*/);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return HBFace(hb_subset_or_fail(face, input));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template<typename T>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct SkPDFHarfBuzzSubset<T, void_t<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ decltype(hb_subset_input_set_retain_gids(std::declval<T>(), std::declval<bool>())),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ decltype(hb_subset_input_set_drop_hints(std::declval<T>(), std::declval<bool>())),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ decltype(hb_subset(std::declval<hb_face_t*>(), std::declval<T>()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ >>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // This is the HarfBuzz 2.0 (non-public) interface, used if it exists.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // This code should be removed as soon as all users are migrated to the newer API.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static HBFace Make(T input, hb_face_t* face) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hb_subset_input_set_retain_gids(input, true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // If it isn't known if a font is 'tricky', retain the hints.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hb_subset_input_set_drop_hints(input, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return HBFace(hb_subset(face, input));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static sk_sp<SkData> subset_harfbuzz(sk_sp<SkData> fontData,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const SkPDFGlyphUse& glyphUsage,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ttcIndex) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,11 +102,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hb_set_t* glyphs = hb_subset_input_glyph_set(input.get());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glyphUsage.getSetValues([&glyphs](unsigned gid) { hb_set_add(glyphs, gid);});
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- hb_subset_input_set_retain_gids(input.get(), true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // TODO: When possible, check if a font is 'tricky' with FT_IS_TRICKY.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // If it isn't known if a font is 'tricky', retain the hints.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- hb_subset_input_set_drop_hints(input.get(), false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- HBFace subset(hb_subset(face.get(), input.get()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HBFace subset = SkPDFHarfBuzzSubset<hb_subset_input_t*>::Make(input.get(), face.get());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!subset) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HBBlob result(hb_face_reference_blob(subset.get()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return to_data(std::move(result));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- skia/third_party/harfbuzz/BUILD.gn.orig 2021-12-30 14:01:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skia/third_party/harfbuzz/BUILD.gn 2021-12-31 02:14:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,6 +14,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system("harfbuzz") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_dirs = [ "/opt/local/include/harfbuzz" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libs = [ "harfbuzz" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (skia_pdf_subset_harfbuzz) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ libs += [ "harfbuzz-subset" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- third_party("harfbuzz") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,9 +29,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defines = [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "HAVE_ICU",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "HAVE_ICU_BUILTIN",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "HAVE_INTEL_ATOMIC_PRIMITIVES",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "HAVE_OT",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "HAVE_FREETYPE",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "HAVE_CONFIG_OVERRIDE_H",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- deps = [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "//third_party/icu",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -188,9 +191,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$_src/hb-ot-shape-complex-myanmar-machine.hh",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$_src/hb-ot-shape-complex-myanmar.cc",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$_src/hb-ot-shape-complex-myanmar.hh",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "$_src/hb-ot-shape-complex-syllabic.cc",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "$_src/hb-ot-shape-complex-syllabic.hh",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$_src/hb-ot-shape-complex-thai.cc",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$_src/hb-ot-shape-complex-use-machine.hh",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "$_src/hb-ot-shape-complex-use-table.cc",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$_src/hb-ot-shape-complex-use.cc",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$_src/hb-ot-shape-complex-use.hh",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$_src/hb-ot-shape-complex-vowel-constraints.cc",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -248,6 +252,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$_src/hb-utf.hh",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$_src/hb-vector.hh",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$_src/hb.hh",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "config-override.h",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skia/third_party/harfbuzz/config-override.h 2021-12-31 02:18:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Adds a mutex implementation based on c++ mutex to harfbuzz.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <mutex>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+using hb_mutex_impl_t = std::mutex;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HB_MUTEX_IMPL_INIT UNUSED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define hb_mutex_impl_init(M) HB_STMT_START { new (M) hb_mutex_impl_t; } HB_STMT_END
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define hb_mutex_impl_lock(M) (M)->lock ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define hb_mutex_impl_unlock(M) (M)->unlock ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define hb_mutex_impl_finish(M) HB_STMT_START { (M)->~hb_mutex_impl_t(); } HB_STMT_END
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/files/prefix.patch b/graphics/Aseprite/files/prefix.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index ae4bf26fc1c..f31f85271dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Aseprite/files/prefix.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/Aseprite/files/prefix.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Find dependencies in MacPorts prefix.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- skia/third_party/freetype2/BUILD.gn.orig 2020-03-11 07:02:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skia/third_party/freetype2/BUILD.gn 2020-09-22 07:20:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,7 +13,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Find dependencies in MacPorts prefix. MacPorts will replace the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+placeholder with the actual MacPorts prefix.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- skia/third_party/freetype2/BUILD.gn.orig 2021-11-16 18:33:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ skia/third_party/freetype2/BUILD.gn 2022-01-30 23:21:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,7 @@
</span>
if (skia_use_system_freetype2) {
system("freetype2") {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,8 +11,8 @@ Find dependencies in MacPorts prefix.
</span> libs = [ "freetype" ]
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- skia/third_party/harfbuzz/BUILD.gn.orig 2020-03-11 07:02:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skia/third_party/harfbuzz/BUILD.gn 2020-09-22 07:20:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- skia/third_party/harfbuzz/BUILD.gn.orig 2021-11-16 18:33:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ skia/third_party/harfbuzz/BUILD.gn 2022-01-30 23:21:32.000000000 -0600
</span> @@ -12,7 +12,7 @@
if (skia_use_system_harfbuzz) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,5 +20,5 @@ Find dependencies in MacPorts prefix.
</span> - include_dirs = [ "/usr/include/harfbuzz" ]
+ include_dirs = [ "@PREFIX@/include/harfbuzz" ]
libs = [ "harfbuzz" ]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (skia_pdf_subset_harfbuzz) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libs += [ "harfbuzz-subset" ]
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/files/stdlib.patch b/graphics/Aseprite/files/stdlib.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 828fdc17967..f3f552dc917 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Aseprite/files/stdlib.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/Aseprite/files/stdlib.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,14 @@
</span> Don't muck with the stdlib. MacPorts already sets it the way we want.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/CMakeLists.txt.orig 2020-09-22 12:01:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/CMakeLists.txt 2020-09-22 12:34:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,11 +30,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aseprite/CMakeLists.txt.orig 2022-01-12 08:10:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aseprite/CMakeLists.txt 2022-01-30 22:43:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,12 +30,6 @@
</span> # Aseprite project
project(aseprite C CXX)
-if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- # As we compile with CMAKE_OSX_DEPLOYMENT_TARGET=10.7, we have to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # explicitly say that we want to use libc++ instead of the GNU libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # As we compile with CMAKE_OSX_DEPLOYMENT_TARGET=10.9, we have to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # explicitly say that we want to use libc++ instead of the GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # libstdc++
</span> - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-endif()
</pre><pre style='margin:0'>
</pre>