From d4d7d35c3e137804d583c1b33c2c0116d796fbb6 Mon Sep 17 00:00:00 2001
From: Oleg Shparber <oleg@zealdocs.org>
Date: Sun, 20 Sep 2020 00:47:02 -0400
Subject: [PATCH] fix(assets): update AppStream ID to org.zealdocs.zeal

AppStream specification strongly encourages lowercase ID.
Flatpak documentation recommends to avoid .desktop suffix in the ID.
---
 .gitignore                                             |  2 +-
 assets/freedesktop/CMakeLists.txt                      | 10 +++++-----
 ...appdata.xml.in => org.zealdocs.zeal.appdata.xml.in} |  2 +-
 ...zealdocs.Zeal.desktop => org.zealdocs.zeal.desktop} |  0
 pkg/appimage/appimage-amd64.yml                        |  2 +-
 src/app/main.cpp                                       |  2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename assets/freedesktop/{org.zealdocs.Zeal.appdata.xml.in => org.zealdocs.zeal.appdata.xml.in} (99%)
 rename assets/freedesktop/{org.zealdocs.Zeal.desktop => org.zealdocs.zeal.desktop} (100%)

diff --git a/.gitignore b/.gitignore
index d5a1e13..d96e5eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,4 @@ squashfs-root/
 .vscode/
 
 # Linux appdata
-/assets/freedesktop/org.zealdocs.Zeal.appdata.xml
+/assets/freedesktop/org.zealdocs.zeal.appdata.xml
diff --git a/assets/freedesktop/CMakeLists.txt b/assets/freedesktop/CMakeLists.txt
index 6e19e09..bccccc9 100644
--- a/assets/freedesktop/CMakeLists.txt
+++ b/assets/freedesktop/CMakeLists.txt
@@ -12,16 +12,16 @@ if(UNIX AND NOT APPLE)
                       DESTINATION ${KDE_INSTALL_ICONDIR}
     )
 
-    configure_file( 
-        org.zealdocs.Zeal.appdata.xml.in 
-        org.zealdocs.Zeal.appdata.xml
+    configure_file(
+        org.zealdocs.zeal.appdata.xml.in
+        org.zealdocs.zeal.appdata.xml
     )
 
-    install(FILES ${CMAKE_BINARY_DIR}/assets/freedesktop/org.zealdocs.Zeal.appdata.xml
+    install(FILES ${CMAKE_BINARY_DIR}/assets/freedesktop/org.zealdocs.zeal.appdata.xml
             DESTINATION ${KDE_INSTALL_METAINFODIR}
     )
 
-    install(FILES "org.zealdocs.Zeal.desktop"
+    install(FILES "org.zealdocs.zeal.desktop"
             DESTINATION ${KDE_INSTALL_APPDIR}
     )
 endif()
diff --git a/assets/freedesktop/org.zealdocs.Zeal.appdata.xml.in b/assets/freedesktop/org.zealdocs.zeal.appdata.xml.in
similarity index 99%
rename from assets/freedesktop/org.zealdocs.Zeal.appdata.xml.in
rename to assets/freedesktop/org.zealdocs.zeal.appdata.xml.in
index daf57ad..7689d27 100644
--- a/assets/freedesktop/org.zealdocs.Zeal.appdata.xml.in
+++ b/assets/freedesktop/org.zealdocs.zeal.appdata.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.zealdocs.Zeal</id>
+  <id>org.zealdocs.zeal</id>
   <name>Zeal</name>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
diff --git a/assets/freedesktop/org.zealdocs.Zeal.desktop b/assets/freedesktop/org.zealdocs.zeal.desktop
similarity index 100%
rename from assets/freedesktop/org.zealdocs.Zeal.desktop
rename to assets/freedesktop/org.zealdocs.zeal.desktop
diff --git a/pkg/appimage/appimage-amd64.yml b/pkg/appimage/appimage-amd64.yml
index 7e129b2..e23c94f 100644
--- a/pkg/appimage/appimage-amd64.yml
+++ b/pkg/appimage/appimage-amd64.yml
@@ -9,7 +9,7 @@ AppDir:
   path: build.appimage/AppDir
 
   app_info:
-    id: org.zealdocs.Zeal
+    id: org.zealdocs.zeal
     name: zeal
     icon: zeal
     version: 0.6.1 # TODO: Use version from CMake.
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 3efe39a..db9b05b 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
     }
 
     // Set application-wide window icon. All message boxes and other windows will use it by default.
-    qapp->setDesktopFileName(QStringLiteral("org.zealdocs.Zeal.desktop"));
+    qapp->setDesktopFileName(QStringLiteral("org.zealdocs.zeal.desktop"));
     qapp->setWindowIcon(QIcon::fromTheme(QStringLiteral("zeal"),
                                          QIcon(QStringLiteral(":/zeal.ico"))));