Make it build

.gitlab-ci.yml

@@ -14,9 +14,8 @@ flatpak:
   script:
   - apk update && apk add flatpak-builder appstream-compose
   - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-  - flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
-  - flatpak install -y gnome-nightly org.gnome.Platform master
-  - flatpak install -y gnome-nightly org.gnome.Sdk master
+  - flatpak install -y flathub org.gnome.Platform 47
+  - flatpak install -y flathub org.gnome.Sdk 47
   - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
   - flatpak build app meson setup --prefix=/app ${MESON_ARGS} _build
   - flatpak build app meson install -C _build

data/meson.build

-# SPDX-FileCopyrightText: 2016-2023 Bruce Cowan <bruce@bcowan.me.uk>
+# SPDX-FileCopyrightText: 2016-2024 Bruce Cowan <bruce@bcowan.me.uk>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -17,10 +17,6 @@ resources = gnome.compile_resources('gen-resources',
                                     source_dir: 'data',
                                     dependencies: blueprints)
 
-install_data('uk.me.bcowan.Rugby.desktop',
-  install_dir: join_paths(get_option('datadir'), 'applications')
-)
-
 install_data(
   'uk.me.bcowan.Rugby.gschema.xml',
   install_dir: datadir / 'glib-2.0' / 'schemas',
@@ -31,13 +27,13 @@ install_data(
   install_dir: datadir / 'metainfo',
 )
 
-desktop_file_validate = find_program('desktop-file-validate', required: false)
-if desktop_file_validate.found()
-	test(
-		'validate-desktop',
-		desktop_file_validate,
-		args: [
-			'uk.me.bcowan.Rugby.desktop'
-		]
-	)
-endif
+# Create desktop-entry file from metainfo
+metainfo_file = 'uk.me.bcowan.Rugby.metainfo.xml'
+ascli_exe = find_program('appstreamcli')
+custom_target('gen-desktop-entry',
+    input : [metainfo_file],
+    output : ['uk.me.bcowan.Rugby.desktop'],
+    command : [ascli_exe, 'make-desktop-file', '@INPUT@', '@OUTPUT@'],
+    install: true,
+    install_dir: join_paths(get_option('datadir'), 'applications')
+)

data/uk.me.bcowan.Rugby.desktop

-# SPDX-FileCopyrightText: 2020-2021 Bruce Cowan <bruce@bcowan.me.uk>
-#
-# SPDX-License-Identifier: CC0-1.0
-
-[Desktop Entry]
-Name=Rugby
-Exec=rugby
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Sports;Calculator;Utility
-StartupNotify=true

data/uk.me.bcowan.Rugby.metainfo.xml

@@ -16,6 +16,12 @@ SPDX-License-Identifier: CC0-1.0
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
 
+  <supports>
+    <control>pointing</control>
+    <control>keyboard</control>
+    <control>touch</control>
+  </supports>
+
   <description>
     <p>
       A program to determine possible combinations of scoring for rugby matches.
@@ -23,4 +29,15 @@ SPDX-License-Identifier: CC0-1.0
   </description>
 
   <launchable type="desktop-id">uk.me.bcowan.Rugby.desktop</launchable>
+
+  <icon type="stock">rugby</icon>
+
+  <categories>
+    <category>Utility</category>
+    <category>GNOME</category>
+  </categories>
+
+  <provides>
+    <binary>rugby</binary>
+  </provides>
 </component>

uk.me.bcowan.Rugby.json

 {
     "app-id": "uk.me.bcowan.Rugby",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
+    "runtime-version": "47",
     "sdk": "org.gnome.Sdk",
     "command": "rugby",
     "finish-args": [
@@ -32,7 +32,7 @@
                     "path": "."
                 }
             ],
-            "config_opts": [
+            "config-opts": [
                 "-Dprofile=development"
             ]
         }