<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/8c9a972fe0e3e912c091096c80a2a1411aa7c5c9">https://github.com/macports/macports-ports/commit/8c9a972fe0e3e912c091096c80a2a1411aa7c5c9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8c9a972fe0e3e912c091096c80a2a1411aa7c5c9
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jun 3 13:28:23 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> Aseprite: Update to 1.2.35
</span>---
graphics/Aseprite/Portfile | 22 ++++-----
graphics/Aseprite/files/prefix.patch | 6 +--
graphics/Aseprite/files/python3.patch | 92 -----------------------------------
graphics/Aseprite/files/stdlib.patch | 17 -------
4 files changed, 13 insertions(+), 124 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 57636fb5130..b988214c21b 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;'>@@ -16,16 +16,16 @@ maintainers {ryandesign @ryandesign} openmaintainer
</span> # 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.34.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup aseprite aseprite 1.2.35 v
</span> revision 0
# 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 34816458276bf9a528f306f0bc26f33dfdb428c8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set depot_tools_commit e1197f06a8f45c0328d341b30e337d3a4b609716
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Latest commit in skia's aseprite-m96 branch at the time this version of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Latest commit in skia's aseprite-m102 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 223763e26f0e1dbfcdb0564b05a3a55c1cefe5a4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set skia_commit 861e4743af6d9bf6077ae6dda7274e5a136ee4e2
</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 6883860f07d343e3fa99d39d4090c5bcf0b027f8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3dba4972048e25a06719e6227535937f17e6ff0f637bb337d97703cd7bdb0b41 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 56240404 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6f03a51950ae2134dc3432e78c36feebf6395188 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 407ee1cf9c4ac47cc0033d1ce597591d33f9c39bb8cfc5b95728c6195378be14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 61972632 \
</span> skia-${skia_commit}.tar.gz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b9e09401b23be29bc735fefaa38164d7f6d1f2d3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f84fef3941b1207e49899f1b0d266a304e99f0cd7cde0f29cc2609650fc1f294 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 55741811
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b7649f5478916cf79567f2bedd70cf1b361fd723 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6924ab75b5ea2b7390d22ad1710b8e6586d6068aec79457362350820bf10aaf3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 53948567
</span>
set main_distfile [lindex ${distfiles} 0]
set skia_distfile skia-${skia_commit}.tar.gz
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,8 +157,6 @@ post-extract {
</span>
patch.dir ${workpath}
patchfiles prefix.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- python3.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stdlib.patch \
</span> USE_SHARED_LIBWEBP.patch
post-patch {
<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 f31f85271dd..4e961e1a1fa 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,8 +1,8 @@
</span> Find dependencies in MacPorts prefix. MacPorts will replace the
placeholder with the actual MacPorts prefix.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- skia/third_party/freetype2/BUILD.gn.orig 2021-11-16 18:33:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skia/third_party/freetype2/BUILD.gn 2022-01-30 23:21:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- skia/third_party/freetype2/BUILD.gn.orig 2022-05-24 18:06:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ skia/third_party/freetype2/BUILD.gn 2022-06-03 12:54:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,7 +15,7 @@
</span>
if (skia_use_system_freetype2) {
system("freetype2") {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/Aseprite/files/python3.patch b/graphics/Aseprite/files/python3.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 81d5a21ed55..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/Aseprite/files/python3.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,92 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with python 3. Includes relevant parts of:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/google/skia/commit/7bc4c9a8d1389fd3188d9bff46726ffc3d9bebb9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- skia/gn/codesign_ios.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skia/gn/codesign_ios.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,7 +23,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Find the signing identity.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- identity = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for line in subprocess.check_output(['security', 'find-identity']).split('\n'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+for line in subprocess.check_output([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'security', 'find-identity']).decode('utf-8').split('\n'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = re.match(r'''.*\) (.*) "''' + identstr + '"', line)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if m:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- identity = m.group(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- skia/gn/compile_ib_files.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skia/gn/compile_ib_files.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,9 +40,9 @@ def main():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ibtool_section_re = re.compile(r'/\*.*\*/')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ibtool_re = re.compile(r'.*note:.*is clipping its content')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- stdout = subprocess.check_output(ibtool_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ stdout = subprocess.check_output(ibtool_args).decode('utf-8')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except subprocess.CalledProcessError as e:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- print(e.output)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print(e.output.decode('utf-8'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raise
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- current_section_header = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for line in stdout.splitlines():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- skia/gn/compile_sksl_tests.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skia/gn/compile_sksl_tests.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,11 +28,12 @@ def executeWorklist(input, worklist):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Invoke skslc, passing in the worklist.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worklist.close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- output = subprocess.check_output([skslc, worklist.name], stderr=subprocess.STDOUT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ output = subprocess.check_output([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ skslc, worklist.name], stderr=subprocess.STDOUT).decode('utf-8')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except subprocess.CalledProcessError as err:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if err.returncode != 1:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print("### " + input + " skslc error:\n")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- print("\n".join(err.output.splitlines()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print("\n".join(err.output.decode('utf-8').splitlines()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.exit(err.returncode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass # Compile errors (exit code 1) are expected and normal in test code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- skia/gn/copy_git_directory.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skia/gn/copy_git_directory.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,8 @@ def copy_git_directory(src, dst, out=None):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raise Exception('Directory "%s" does not exist.' % src)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not os.path.isdir(dst):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.makedirs(dst)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ls_files = subprocess.check_output(['git', 'ls-files', '-z', '.'], cwd=src)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ls_files = subprocess.check_output([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'git', 'ls-files', '-z', '.'], cwd=src).decode('utf-8')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src_files = set(p for p in ls_files.split('\0') if p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- abs_src = os.path.abspath(src)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cwd = os.getcwd()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- skia/gn/dehydrate_sksl.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skia/gn/dehydrate_sksl.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not os.path.isdir(targetDir):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.mkdir(targetDir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target = os.path.join(targetDir, tail)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- subprocess.check_output([skslc, inc, target + ".dehydrated.sksl"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ subprocess.check_output([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ skslc, inc, target + ".dehydrated.sksl"]).decode('utf-8')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except subprocess.CalledProcessError as err:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print("### Error compiling " + inc + ":")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print(err.output)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- skia/gn/find_headers.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skia/gn/find_headers.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,9 +34,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- desc_json_txt = ''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- desc_json_txt = subprocess.check_output(gn_desc_cmd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ desc_json_txt = subprocess.check_output(gn_desc_cmd).decode('utf-8')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except subprocess.CalledProcessError as e:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- print(e.output)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print(e.output.decode('utf-8'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raise
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- desc_json = {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- skia/gn/find_xcode_sysroot.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ skia/gn/find_xcode_sysroot.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,4 +12,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (sdk,) = sys.argv[1:]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--print(subprocess.check_output(['xcrun', '--sdk', sdk, '--show-sdk-path']))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+print(subprocess.check_output([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'xcrun', '--sdk', sdk, '--show-sdk-path']).decode('utf-8'))
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 83007c86f17..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Don't muck with the stdlib. MacPorts already sets it the way we want.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/aseprite/aseprite/commit/be7c26da5eb29dd50705babc4277cb8ebce9af91
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aseprite/CMakeLists.txt.orig 2022-01-12 08:10:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aseprite/CMakeLists.txt 2022-01-30 22:43:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,12 +30,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Aseprite project
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- project(aseprite C CXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # As we compile with CMAKE_OSX_DEPLOYMENT_TARGET=10.9, 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
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # libstdc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
</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;'>- # Check repository status
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/laf/CMakeLists.txt)
</span></pre><pre style='margin:0'>
</pre>