email-client

commit 3498e1af0c19996835b0cffc2bf0212d2c9557ff
parent 6c79438ba65ba46c7026cd47eb43dc34576554a9
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sun, 19 Feb 2023 19:12:28 +0100

Simplify desktop file, Fix metadata_license, add verification steps to meson and fix serde issue

Diffstat:
M
Cargo.toml
 | 
2
+-
M
data/dev.nordgedanken.Email.desktop
 | 
15
++++++++-------
M
data/dev.nordgedanken.Email.metainfo.xml
 | 
2
+-
M
data/meson.build
 | 
32
+++++++++++++++++++++++++++++---

4 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ tracing-subscriber = "0.3.16"
 tracing = "0.1.37"
 tokio = { version = "1.25.0", features = ["full"] }
 sequoia-openpgp = "1.13.0"
-notify-rust = { version = "4.7.1", default-features = false, features = ["d", "images", "serde"] }
+notify-rust = { version = "4.7.1", default-features = false, features = ["d", "images"] }
 
 [dependencies.imap]
 version = "2.4.1"
diff --git a/data/dev.nordgedanken.Email.desktop b/data/dev.nordgedanken.Email.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
+Version=1.0
+Type=Application
+
 Name=Email Client
 Comment=A Rust GTK4 email client
-Type=Application
-# should be the same as the Cargo project name
+Categories=Network;Email;
+
+Icon=dev.nordgedanken.Email
 Exec=mail-client
-Terminal=false
-Categories=Network;GTK;Email;
-Keywords=Rust;Flatpak;GTK;Email;Network;
-# Icon=dev.nordgedanken.Email
-StartupNotify=true
+Terminal=false
+\ No newline at end of file
diff --git a/data/dev.nordgedanken.Email.metainfo.xml b/data/dev.nordgedanken.Email.metainfo.xml
@@ -2,7 +2,7 @@
 <!-- Bilal Elmoussaoui 2020 <bilal.elmoussaoui@gnome.org> -->
 <component type="desktop-application">
     <id>dev.nordgedanken.Email</id>
-    <metadata_license>CC0</metadata_license>
+    <metadata_license>CC0-1.0</metadata_license>
     <project_license>AGPL-3.0-or-later</project_license>
     <name>Email Client</name>
     <summary>A Rust GTK4 email client</summary>
diff --git a/data/meson.build b/data/meson.build
@@ -1,13 +1,39 @@
 application_id = 'dev.nordgedanken.Email'
-# Read more <https://mesonbuild.com/Reference-manual.html#install_data>
+metainfo_file = '@0@.metainfo.xml'.format(application_id)
+desktop_file = '@0@.desktop'.format(application_id)
+
+appstream_util = find_program('appstream-util', required: false)
+desktop_file_validate = find_program('desktop-file-validate', required: false)
+
+# Validate Desktop file
+if desktop_file_validate.found()
+  test(
+    'validate-desktop',
+    desktop_file_validate,
+    args: [
+      desktop_file
+    ]
+  )
+endif
+
 
 install_data(
-    '@0@.desktop'.format(application_id),
+    desktop_file,
     install_dir: datadir / 'applications'
 )
 
+# Validate Appdata
+if appstream_util.found()
+  test(
+    'validate-appdata', appstream_util,
+    args: [
+      'validate', '--nonet', metainfo_file
+    ]
+  )
+endif
+
 install_data(
-    '@0@.metainfo.xml'.format(application_id),
+    metainfo_file,
     install_dir: datadir / 'metainfo'
 )