From 2f20f83d5eaec8340451132a33bb612055219126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Fri, 21 Jul 2023 11:57:10 -0700
Subject: [PATCH] Metainfo Improvements (#713)

---
 .github/workflows/build-deb.yml               |  2 +-
 ...pdata.xml.in => installer.metainfo.xml.in} | 72 +++++++++++--------
 data/meson.build                              | 10 +--
 meson.build                                   |  1 +
 po/extra/POTFILES                             |  2 +-
 po/extra/meson.build                          |  2 +-
 po/meson.build                                |  2 +-
 7 files changed, 54 insertions(+), 37 deletions(-)
 rename data/{installer.appdata.xml.in => installer.metainfo.xml.in} (80%)

diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml
index 06255e520..106d8538c 100644
--- a/.github/workflows/build-deb.yml
+++ b/.github/workflows/build-deb.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/elementary/docker:odin-unstable
+      image: ghcr.io/elementary/docker:horus-unstable
 
     steps:
       - name: Install dependencies
diff --git a/data/installer.appdata.xml.in b/data/installer.metainfo.xml.in
similarity index 80%
rename from data/installer.appdata.xml.in
rename to data/installer.metainfo.xml.in
index 7b1cb7986..c3ac09716 100644
--- a/data/installer.appdata.xml.in
+++ b/data/installer.metainfo.xml.in
@@ -1,15 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2021 elementary, Inc. <contact@elementary.io> -->
-<component>
+<component type="desktop-application">
   <id>io.elementary.installer</id>
+  <translation type="gettext">io.elementary.installer</translation>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
+
   <name>Installer</name>
   <summary>Install elementary OS</summary>
   <description>
     <p>Step by step installer for elementary OS itself.</p>
   </description>
 
+  <screenshots>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/elementary/installer/1.0.7/data/screenshot-language.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-keyboard.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-try-install.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-custom.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-encrypt.png</image>
+    </screenshot>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-progress.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-success.png</image>
+    </screenshot>
+  </screenshots>
+
+  <content_rating type="oars-1.1" />
+
+  <provides>
+    <binary>io.elementary.installer</binary>
+    <binary>io.elementary.installer-daemon</binary>
+  </provides>
+
+  <url type="bugtracker">https://github.com/elementary/installer/issues</url>
+  <url type="donation">https://elementary.io/get-involved#funding</url>
+  <url type="help">https://github.com/elementary/installer/discussions</url>
+  <url type="homepage">https://elementary.io/</url>
+  <url type="translate">https://l10n.elementary.io/projects/installer</url>
+
+  <developer_name>elementary, Inc.</developer_name>
+  <project_group>elementary</project_group>
+  <update_contact>contact_at_elementary.io</update_contact>
+
   <releases>
     <release version="1.0.7" date="2023-01-11" urgency="medium">
       <description>
@@ -68,31 +111,4 @@
       </description>
     </release>
   </releases>
-
-  <screenshots>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/1.0.7/data/screenshot-language.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-keyboard.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-try-install.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-custom.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-encrypt.png</image>
-    </screenshot>
-    <screenshot>
-      <image type="default">https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-progress.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-success.png</image>
-    </screenshot>
-  </screenshots>
-  <developer_name>elementary, Inc.</developer_name>
-  <url type="homepage">https://elementary.io</url>
-  <url type="bugtracker">https://github.com/elementary/installer/issues</url>
 </component>
diff --git a/data/meson.build b/data/meson.build
index 19a5cd9ac..7aa6d42b5 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -4,19 +4,19 @@ schemadir = join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
 i18n.merge_file(
     input: meson.project_name() + '.desktop.in',
     output: meson.project_name() + '.desktop',
-    po_dir: join_paths(meson.source_root (), 'po', 'extra'),
+    po_dir: meson.project_source_root() / 'po' / 'extra',
     type: 'desktop',
     install_dir: join_paths(get_option('datadir'), 'applications'),
     install: true
 )
 
 i18n.merge_file(
-    input: 'installer.appdata.xml.in',
-    output: meson.project_name() + '.appdata.xml',
-    po_dir: join_paths(meson.source_root (), 'po', 'extra'),
+    input: 'installer.metainfo.xml.in',
+    output: meson.project_name() + '.metainfo.xml',
+    po_dir: meson.project_source_root() / 'po' / 'extra',
     type: 'xml',
     install: true,
-    install_dir: join_paths(get_option('datadir'), 'metainfo'),
+    install_dir: get_option('datadir') / 'metainfo',
 )
 
 install_data(
diff --git a/meson.build b/meson.build
index 31f88c528..fb428c517 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,7 @@
 project(
     'io.elementary.installer',
     'vala', 'c',
+    meson_version : '>= 0.56.0',
     version: '1.0.7'
 )
 
diff --git a/po/extra/POTFILES b/po/extra/POTFILES
index 72f699bda..8e7e316d0 100644
--- a/po/extra/POTFILES
+++ b/po/extra/POTFILES
@@ -1,2 +1,2 @@
-data/installer.appdata.xml.in
+data/installer.metainfo.xml.in
 data/io.elementary.installer.desktop.in
diff --git a/po/extra/meson.build b/po/extra/meson.build
index c296095a9..c5bd751e5 100644
--- a/po/extra/meson.build
+++ b/po/extra/meson.build
@@ -1,5 +1,5 @@
 i18n.gettext('extra',
-    args: '--directory=' + meson.source_root(),
+    args: '--directory=' + meson.project_source_root(),
     preset: 'glib',
     install: false
 )
diff --git a/po/meson.build b/po/meson.build
index b370f7945..023d52da5 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,5 +1,5 @@
 i18n.gettext(meson.project_name(),
-    args: '--directory=' + meson.source_root(),
+    args: '--directory=' + meson.project_source_root(),
     preset: 'glib'
 )
 subdir('extra')