Skip to content

Commit ac44175

Browse files
committed
Install the real application icons into share/icons
The komodoNN.edit.png icons come from Komodo's own top-level "bk build" output (build/release/main/), not from Mozilla's ko-rel dist tree, so make-komodo-layout.sh never picked them up -- share/icons only ever got the unrelated updater.png. install_desktop_entry's Icon= path (share/icons/komodo48.png) pointed at a file that never existed.
1 parent 8cbc721 commit ac44175

1 file changed

Lines changed: 13 additions & 0 deletions

File tree

make-komodo-layout.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,19 @@ if [ -d "$ROOT/mozilla/build/moz3500-ko12.10/mozilla/ko-rel/dist/bin/icons" ]; t
4141
copy_tree "$ROOT/mozilla/build/moz3500-ko12.10/mozilla/ko-rel/dist/bin/icons" "$OUT/share/icons"
4242
fi
4343

44+
# The actual application icons (komodo16/32/48/64/128/256.edit.png) come
45+
# from Komodo's own top-level "bk build" output (build/release/main/),
46+
# not from the Mozilla ko-rel tree -- install_desktop_entry expects them
47+
# as share/icons/komodoNN.png (no ".edit" product-type infix).
48+
if [ -d "$ROOT/build/release/main" ]; then
49+
mkdir -p "$OUT/share/icons"
50+
for f in "$ROOT"/build/release/main/komodo*.edit.png; do
51+
[ -f "$f" ] || continue
52+
base=$(basename "$f")
53+
cp -aL "$f" "$OUT/share/icons/$(echo "$base" | sed 's/\.edit\././')"
54+
done
55+
fi
56+
4457
# The siloed Python's "relocatable" build leaves some extension modules
4558
# (and libpython itself) with a hardcoded absolute RPATH pointing back at
4659
# the build-tree ko-rel/dist/lib, instead of a portable $ORIGIN-relative

0 commit comments

Comments
 (0)