<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/221b4643c787d16fe6352f20327f5bf2997ef1a2">https://github.com/macports/macports-ports/commit/221b4643c787d16fe6352f20327f5bf2997ef1a2</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 221b4643c78 app pg: attempt to handle spaces in app.icon
</span>221b4643c78 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 221b4643c787d16fe6352f20327f5bf2997ef1a2
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Jan 1 17:29:28 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> app pg: attempt to handle spaces in app.icon
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64325
</span>---
_resources/port1.0/group/app-1.0.tcl | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/app-1.0.tcl b/_resources/port1.0/group/app-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b8fd3683a64..5750555201a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/app-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/app-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -255,14 +255,14 @@ platform macosx {
</span>
if {${app.icon} ne ""} {
# Turn relative app.icon paths into absolute ones.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set icon ${app.icon}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set icon [join ${app.icon}]
</span> if {[string index ${icon} 0] ne "/"} {
set icon ${worksrcpath}/${icon}
}
# Ensure app.icon exists.
if {![file exists ${icon}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "app.icon ${app.icon} does not exist"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "app.icon '${icon}' does not exist"
</span> }
# If app.icon is an .icns file, copy it.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,8 +275,8 @@ platform macosx {
</span> foreach w {16 32 128 256 512} {
lappend makeicnsargs -$w ${worksrcpath}/${w}.png
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {system -W ${worksrcpath} "${prefix}/bin/rsvg-convert -w $w -h $w ${icon} > ${worksrcpath}/$w.png" }]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "app.icon ${app.icon} could not be converted to png: $::errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {system -W ${worksrcpath} "${prefix}/bin/rsvg-convert -w $w -h $w '${icon}' > ${worksrcpath}/$w.png" }]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "app.icon '${icon}' could not be converted to png: $::errorInfo"
</span> }
}
if {[catch {system -W ${worksrcpath} "${prefix}/bin/makeicns $makeicnsargs -out \"${destroot}${applications_dir}/${app.name}.app/Contents/Resources/${app.name}.icns\" 2>&1"}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -285,8 +285,8 @@ platform macosx {
</span>
# If app.icon is another type of image file, convert it.
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {system -W ${worksrcpath} "${prefix}/bin/makeicns -in ${icon} -out \"${destroot}${applications_dir}/${app.name}.app/Contents/Resources/${app.name}.icns\" 2>&1"}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "app.icon ${app.icon} could not be converted to ${app.name}.icns: $::errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {system -W ${worksrcpath} "${prefix}/bin/makeicns -in '${icon}' -out \"${destroot}${applications_dir}/${app.name}.app/Contents/Resources/${app.name}.icns\" 2>&1"}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "app.icon '${icon}' could not be converted to ${app.name}.icns: $::errorInfo"
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -406,12 +406,12 @@ trace variable app.icon w app._icon_trace
</span> proc app._icon_trace {optionName unusedIndex unusedOperation} {
global depends_build
upvar ${optionName} option
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set needs_dep [expr {[file extension ${option}] ne ".icns"}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set needs_dep [expr {[file extension [join ${option}]] ne ".icns"}]
</span> if {${needs_dep}} {
depends_build-delete port:makeicns
depends_build-append port:makeicns
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set needs_dep [expr {[file extension ${option}] eq ".svg"}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set needs_dep [expr {[file extension [join ${option}]] eq ".svg"}]
</span> if {${needs_dep}} {
depends_build-delete port:librsvg
depends_build-append port:librsvg
</pre><pre style='margin:0'>
</pre>