@@ -53,13 +53,13 @@ finish-args:
5353 - --filesystem=/tmp
5454 # libGL needs this
5555 - --device=dri
56+rename-desktop-file: bloom.desktop
57+rename-appdata-file: bloom.appdata.xml
5658command: bloom
5759
5860modules:
5961 - name: BloomDesktop
6062 buildsystem: simple
61− only-arches:
62− - x86_64
6363 build-options:
6464 append-path: /usr/lib/sdk/node16/bin
6565 env:
@@ -118,7 +118,7 @@ modules:
118118 install -m 644 debian/bloom.png ${INSTALLATION_PREFIX}/share/icons/hicolor/48x48/mimetypes/org.sil.Bloom.png
119119 install -m 644 debian/bloom.svg ${INSTALLATION_PREFIX}/share/icons/hicolor/scalable/mimetypes/org.sil.Bloom.svg
120120 install -d ${INSTALLATION_PREFIX}/share/applications
121− desktop-file-install --dir ${INSTALLATION_PREFIX}/share/applications ../local-extra/org.sil.Bloom.desktop
121+ desktop-file-install --dir ${INSTALLATION_PREFIX}/share/applications --set-icon=org.sil.Bloom debian/bloom.desktop
122122 # Install icon for our mime type so that it shows up as icon for a bloompack
123123 install -m 644 debian/BloomPack.png ${INSTALLATION_PREFIX}/share/icons/hicolor/48x48/mimetypes/application-bloom.png
124124 install -m 644 debian/BloomPack.svg ${INSTALLATION_PREFIX}/share/icons/hicolor/scalable/mimetypes/application-bloom.svg
@@ -129,8 +129,8 @@ modules:
129129 install -m 644 debian/JoinBloomTC.png ${INSTALLATION_PREFIX}/share/icons/hicolor/48x48/mimetypes/application-bloom-join-team.png
130130 install -m 644 debian/JoinBloomTC.svg ${INSTALLATION_PREFIX}/share/icons/hicolor/scalable/mimetypes/application-bloom-join-team.svg
131131 # Add AppStream metadata file
132− install -d ${INSTALLATION_PREFIX}/share/metainfo
133− install -m 644 ../local-extra/org.sil.Bloom.metainfo.xml ${INSTALLATION_PREFIX}/share/metainfo
132+ install -d ${INSTALLATION_PREFIX}/share/appdata
133+ install -m 644 debian/bloom.appdata.xml ${INSTALLATION_PREFIX}/share/appdata
134134 # Remove unwanted files
135135 cd ${BLOOMLIB} && rm -rf AxInterop* BloomTests* Interop* Moq* nunit* NUnit* AndikaNewBasic ffmpeg ghostscript
136136 find ${BLOOMLIB} -name '*.map' -print0 | xargs -0 rm -f
@@ -165,7 +165,7 @@ modules:
165165 - type: git
166166 dest: BloomDesktop
167167 url: https://github.com/BloomBooks/BloomDesktop.git
168− commit: 75c7f09b17f24ac514994c45b9d1736b37362f32
168+ commit: 06bd25f037bafad0cef3e74081801a72ca982d97
169169 # Bloom nuget dependencies
170170 # To regenerate bloom-build-sources-nuget.yml:
171171 # ./compose-nuget-sources bloom-build-sources-nuget.yml . ./buildPackages.config
@@ -550,8 +550,6 @@ modules:
550550 url: https://packages.sil.org/ubuntu/pool/main/a/art-of-reading3/art-of-reading3_3.3.1+bionic1_all.deb
551551 sha256: 96d99d60c1838aaac8461e3568185cc287206d2852bd3e11d94eef5d9d6a3f15
552552 buildsystem: simple
553− only-arches:
554− - x86_64
555553 build-commands:
556554 # Extract art-of-reading3 images into /app instead of /usr
557555 - |