From f7dfbcceda470f9f4c6eb8e514b8bd376578f47c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Sat, 29 Apr 2023 14:52:35 +0200 Subject: [PATCH] build: Set flatpak version the same as in-app version --- data/meson.build | 11 +++++++++++ data/org.gnome.Fractal.metainfo.xml.in.in | 2 +- meson.build | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/data/meson.build b/data/meson.build index 282da6bf..7876001e 100644 --- a/data/meson.build +++ b/data/meson.build @@ -26,9 +26,20 @@ if desktop_file_validate.found() endif # Appdata +if is_release + development_release = '' +else + development_release = ''' + + +

Development release.

+
+
'''.format(version.replace('-', '~'), release_date) +endif appdata_conf = configuration_data() appdata_conf.set('app-id', application_id) appdata_conf.set('gettext-package', gettext_package) +appdata_conf.set('development-release', development_release) appdata_file = i18n.merge_file( input: configure_file( input: '@0@.metainfo.xml.in.in'.format(base_id), diff --git a/data/org.gnome.Fractal.metainfo.xml.in.in b/data/org.gnome.Fractal.metainfo.xml.in.in index 7b3ae3bd..efe87d69 100644 --- a/data/org.gnome.Fractal.metainfo.xml.in.in +++ b/data/org.gnome.Fractal.metainfo.xml.in.in @@ -50,7 +50,7 @@ intense - + @development-release@

Fractal 5.alpha1 is the first release since Fractal has been diff --git a/meson.build b/meson.build index db9565ca..fada686c 100644 --- a/meson.build +++ b/meson.build @@ -66,6 +66,7 @@ endif if is_release version = base_version + release_date = '' # should be unused with released versions application_id = base_id else vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip() @@ -74,6 +75,7 @@ else else version = '@0@-@1@'.format(base_version, vcs_tag) endif + release_date = run_command('git', 'show', '-s', '--format=%cI').stdout().strip() application_id = '@0@.@1@'.format(base_id, profile) endif