From da3cb6ebe4ef40e11192db79925bb5f3dd8defef Mon Sep 17 00:00:00 2001
From: blt__ <63462729+blt-r@users.noreply.github.com>
Date: Thu, 16 Feb 2023 03:11:49 +0400
Subject: [PATCH] dist: use valid application id in nvim.appdata.xml #22046

According to [AppStream spec](https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-id-generic),
the <id> element should contain a reverse-DNS scheme:

    {tld}.{vendor}.{product}

Since the flathub requires that, the flatpak build replaces `<id>nvim</id>` with
`<id>io.neovim.nvim</id>`. That results in ID mismatch between flatpak version
and version from distribution's repositories. Because of that, software stores
are displaying two different neovims, instead of one neovim with options to
download it either from flatpak or from distribution's repos. We can use the
`<provides><id>nvim</id></provides>`, for everyone who was expecting the id to
be `nvim`.
---
 runtime/nvim.appdata.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/runtime/nvim.appdata.xml b/runtime/nvim.appdata.xml
index 7d2ea49df4..1fe672b80b 100644
--- a/runtime/nvim.appdata.xml
+++ b/runtime/nvim.appdata.xml
@@ -7,7 +7,7 @@
     https://github.com/flathub/io.neovim.nvim
 -->
 <component type="desktop-application">
-  <id>nvim</id>
+  <id>io.neovim.nvim</id>
   <translation type="gettext">nvim</translation>
   <project_license>Apache-2.0</project_license>
   <metadata_license>CC0-1.0</metadata_license>
@@ -61,5 +61,6 @@
   <url type="translate">https://github.com/neovim/neovim/tree/master/src/nvim/po</url>
   <provides>
     <binary>nvim</binary>
+    <id>nvim</id>
   </provides>
 </component>