From 73d7f70ff668b8cf682fc85bf1e7ced6eafe0586 Mon Sep 17 00:00:00 2001
From: Aidan Harris <me@aidanharr.is>
Date: Wed, 10 Jul 2024 18:51:08 +0000
Subject: [PATCH] Flatpak fixes (#14083)

The Flatpak was failing to build because of AppStream metadata linting
errors. It also complained about the hyphen in the cid.

Release Notes:

     * N/A
---
 .../zed/resources/flatpak/zed.metainfo.xml.in   | 17 +++++++++++------
 script/flatpak/bundle-flatpak                   |  6 +++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/crates/zed/resources/flatpak/zed.metainfo.xml.in b/crates/zed/resources/flatpak/zed.metainfo.xml.in
index b0f669af52..15a5055961 100644
--- a/crates/zed/resources/flatpak/zed.metainfo.xml.in
+++ b/crates/zed/resources/flatpak/zed.metainfo.xml.in
@@ -54,27 +54,32 @@
     <screenshots>
         <screenshot type="default">
             <caption>Zed with a large project open, showing language server and gitblame support</caption>
-            <image type="source" width="1122" height="859" xml:lang="en">https://zed.dev/img/flatpak/flatpak-1.png</image>
+            <image>https://zed.dev/img/flatpak/flatpak-1.png</image>
         </screenshot>
         <screenshot>
             <caption>Zed with a file open and a channel message thread in the right sidebar</caption>
-            <image type="source" width="1122" height="859" xml:lang="en">https://zed.dev/img/flatpak/flatpak-2.png</image>
+            <image>https://zed.dev/img/flatpak/flatpak-2.png</image>
         </screenshot>
         <screenshot>
             <caption>Example of a channel's shared document</caption>
-            <image type="source" width="1122" height="859" xml:lang="en">https://zed.dev/img/flatpak/flatpak-3.png</image>
+            <image>https://zed.dev/img/flatpak/flatpak-3.png</image>
         </screenshot>
         <screenshot>
             <caption>Zed's extension list</caption>
-            <image type="source" width="1122" height="859" xml:lang="en">https://zed.dev/img/flatpak/flatpak-4.png</image>
+            <image>https://zed.dev/img/flatpak/flatpak-4.png</image>
         </screenshot>
         <screenshot>
             <caption>Theme switcher UI and example theme</caption>
-            <image type="source" width="1122" height="859" xml:lang="en">https://zed.dev/img/flatpak/flatpak-5.png</image>
+            <image>https://zed.dev/img/flatpak/flatpak-5.png</image>
         </screenshot>
     </screenshots>
 
     <releases>
-        @release_info@
+		@release_info@
+		<release version="0.0.0" date="1970-01-01">
+			<description>
+				<p>Dummy release to keep flatpak-builder AppStream metadata validation from complaining</p>
+			</description>
+		</release>
     </releases>
 </component>
diff --git a/script/flatpak/bundle-flatpak b/script/flatpak/bundle-flatpak
index effaa7bdfa..28a4538040 100755
--- a/script/flatpak/bundle-flatpak
+++ b/script/flatpak/bundle-flatpak
@@ -12,19 +12,19 @@ channel=$(<crates/zed/RELEASE_CHANNEL)
 export CHANNEL="$channel"
 export ARCHIVE="$archive"
 if [[ "$channel" == "dev" ]]; then
-    export APP_ID="dev.zed.Zed-Dev"
+    export APP_ID="dev.zed.ZedDev"
     export APP_NAME="Zed Devel"
     export BRANDING_LIGHT="#99c1f1"
     export BRANDING_DARK="#1a5fb4"
     export ICON_FILE="app-icon-dev"
 elif [[ "$channel" == "nightly" ]]; then
-    export APP_ID="dev.zed.Zed-Nightly"
+    export APP_ID="dev.zed.ZedNightly"
     export APP_NAME="Zed Nightly"
     export BRANDING_LIGHT="#e9aa6a"
     export BRANDING_DARK="#1a5fb4"
     export ICON_FILE="app-icon-nightly"
 elif [[ "$channel" == "preview" ]]; then
-    export APP_ID="dev.zed.Zed-Preview"
+    export APP_ID="dev.zed.ZedPreview"
     export APP_NAME="Zed Preview"
     export BRANDING_LIGHT="#99c1f1"
     export BRANDING_DARK="#1a5fb4"