<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/a0a2b766afbff400aeef4d0ab5f5d069b615f56e">https://github.com/macports/macports-ports/commit/a0a2b766afbff400aeef4d0ab5f5d069b615f56e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a0a2b766afbff400aeef4d0ab5f5d069b615f56e
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sun Jan 26 05:06:08 2025 -0600
<span style='display:block; white-space:pre;color:#404040;'> Aseprite: Add maintainer option to avoid extra fetching
</span>---
graphics/Aseprite/Portfile | 86 ++++++++++++++++++++++++++++------------------
1 file changed, 52 insertions(+), 34 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 8ccee4161b6..6ae319e2591 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;'>@@ -57,6 +57,12 @@ set depot_tools_commit 090b7be49149a3045a01838df94af192c4e570cd
</span> set skia_branch m102
set skia_commit 857111b32703e9e8cb14053e25f56b21d636a3c2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Also fetch extra code not in distfiles. The maintainer can use "sudo port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -dn checksum fetch.extra=no" and "sudo port -dn patch fetch.extra=no" to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid unnecessary fetching when preparing a port update.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options fetch.extra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default fetch.extra yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> homepage https://aseprite.org
github.tarball_from releases
distname ${name}-v${version}-Source
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,17 +94,19 @@ set python_branch 3.12
</span> set python_version [string map {. {}} ${python_branch}]
configure.python ${prefix}/bin/python${python_branch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: Don't use git to fetch depot_tools or skia's dependencies.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 14} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set git_dep port:git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set git_dep bin:git:git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${fetch.extra}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: Don't use git to fetch depot_tools or skia's dependencies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set git_dep port:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set git_dep bin:git:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_fetch-append ${git_dep}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_fetch-append ${git_dep}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_extract-append ${git_dep} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract-append ${git_dep} \
</span> port:python${python_version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
depends_build-append path:bin/pkg-config:pkgconfig \
port:python${python_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,29 +169,37 @@ proc quoted_shellescape {arg} {
</span> worksrcdir ${github.project}
extract.mkdir yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # depot_tools is hosted on googlesource.com which doesn't generate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # deterministic tarballs. https://github.com/google/gitiles/issues/84
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${workpath}/depot_tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath}/depot_tools "\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- git -c init.defaultBranch=main init &&\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- git remote add origin https://chromium.googlesource.com/chromium/tools/depot_tools &&\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- git fetch --depth 1 origin ${depot_tools_commit} &&\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- git -c advice.detachedHead=false checkout FETCH_HEAD\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${fetch.extra}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # depot_tools is hosted on googlesource.com which doesn't generate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # deterministic tarballs. https://github.com/google/gitiles/issues/84
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${workpath}/depot_tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath}/depot_tools "\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git -c init.defaultBranch=main init &&\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git remote add origin https://chromium.googlesource.com/chromium/tools/depot_tools &&\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git fetch --depth 1 origin ${depot_tools_commit} &&\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ git -c advice.detachedHead=false checkout FETCH_HEAD\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
set user_notified no
proc one_moment_please {} {
global user_notified
if {!${user_notified}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "The extract, configure, and build phases may each take several minutes to complete."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option fetch.extra]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "The extract, configure, and build phases may each take several minutes to complete."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "The configure and build phases may each take several minutes to complete."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> set user_notified yes
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- one_moment_please
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${fetch.extra}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ one_moment_please
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -203,23 +219,25 @@ post-extract {
</span> move {*}[glob ${workpath}/[file tail ${submodule}]-*] ${worksrcpath}/${submodule}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Various skia gn scripts run "python" but are compatible with python 3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${configure.python} ${workpath}/depot_tools/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${fetch.extra}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Various skia gn scripts run "python" but are compatible with python 3.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${configure.python} ${workpath}/depot_tools/python
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # depot_tools runs "python3".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${configure.python} ${workpath}/depot_tools/python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # depot_tools runs "python3".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${configure.python} ${workpath}/depot_tools/python3
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Avoid fetching unnecessary dependencies.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath} "${patch.cmd} ${patch.pre_args} < [shellescape ${filespath}/DEPS.patch]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Avoid fetching unnecessary dependencies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} "${patch.cmd} ${patch.pre_args} < [shellescape ${filespath}/DEPS.patch]"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Avoid fetching unnecessary data for necessary dependencies.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath} "${patch.cmd} ${patch.pre_args} < [shellescape ${filespath}/git-sync-deps.patch]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Avoid fetching unnecessary data for necessary dependencies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} "${patch.cmd} ${patch.pre_args} < [shellescape ${filespath}/git-sync-deps.patch]"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fetch skia's dependencies.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: Fetch these as distfiles instead, maybe using a strategy similar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to the one formerly used by the MoltenVK port. Many of them aren't even
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # needed since we're using MacPorts deps rather than bundled versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath}/skia "${configure.python} tools/git-sync-deps"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fetch skia's dependencies.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: Fetch these as distfiles instead, maybe using a strategy similar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to the one formerly used by the MoltenVK port. Many of them aren't even
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # needed since we're using MacPorts deps rather than bundled versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath}/skia "${configure.python} tools/git-sync-deps"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
patch.dir ${workpath}
</pre><pre style='margin:0'>
</pre>