fix Windows fixtures and Flatpak CI packaging

flatpak/build.sh

@@ -18,11 +18,14 @@ runtime_version=$(sed -n "s/^runtime-version: *'\(.*\)'/\1/p" "$id.yml")
 # --user so nothing here needs root, and --if-not-exists so a second run is free.
 flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 flatpak install --user --noninteractive flathub \
+  org.flatpak.Builder \
   "org.gnome.Platform//$runtime_version" \
   "org.gnome.Sdk//$runtime_version"
 
 rm -rf build repo
-flatpak-builder --user --disable-rofiles-fuse --force-clean --repo=repo build "$id.yml"
+# Ubuntu 22.04's builder calls appstream-compose, which GNOME 48 no longer ships.
+# Use the Flathub builder for its current AppStream support on CI and local builds alike.
+flatpak run org.flatpak.Builder --user --disable-rofiles-fuse --force-clean --repo=repo build "$id.yml"
 flatpak build-bundle repo "$bundle" "$id"
 
 echo "Wrote $bundle"

flatpak/studio.margin.mail.metainfo.xml

@@ -5,7 +5,7 @@
   <summary>A calm, keyboard-first mail client for Gmail</summary>
 
   <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LicenseRef-proprietary=https://github.com/priyanshujain/margin-mail/blob/main/LICENSE</project_license>
+  <project_license>LicenseRef-FSL-1.1-MIT=https://github.com/priyanshujain/margin-mail/blob/main/LICENSE</project_license>
 
   <developer id="studio.margin">
     <name>Margin</name>

flatpak/studio.margin.mail.yml

@@ -39,9 +39,13 @@ modules:
       # after the product and the binary, so both are renamed on the way in.
       - install -Dm644 "deb/usr/share/applications/Margin Mail.desktop" /app/share/applications/studio.margin.mail.desktop
       - desktop-file-edit --set-icon=studio.margin.mail /app/share/applications/studio.margin.mail.desktop
+      # Only the plainly named sizes. Tauri also writes a `256x256@2` directory, and hicolor spells
+      # a scaled one `256x256@2x`, so flatpak would be exporting an icon at a size that is not a
+      # size.
       - |
-        for src in deb/usr/share/icons/hicolor/*/apps/margin-mail.png; do
-          size=$(basename "$(dirname "$(dirname "$src")")")
+        for size in 32x32 128x128; do
+          src="deb/usr/share/icons/hicolor/$size/apps/margin-mail.png"
+          [ -f "$src" ] || continue
           install -Dm644 "$src" "/app/share/icons/hicolor/$size/apps/studio.margin.mail.png"
         done