[gthumb: 1/2] Add release notes to appdata file in the tarball




commit 8316a4631d3b4d96d0d41577d2257708938b57d8
Author: Federico Bruni <fede inventati org>
Date:   Fri Apr 15 10:30:48 2022 +0200

    Add release notes to appdata file in the tarball
    
    The flatpak build is failing because appstreamcli is not
    included in GNOME flatpak SDK. appstreamcli should be
    run before creating the tarball.
    
    Closes #224

 data/appdata/meson.build                  | 30 ++++++++++++++++++++++--------
 data/appdata/metainfo-releases-tarball.sh |  3 +++
 meson_options.txt                         |  6 ++++++
 3 files changed, 31 insertions(+), 8 deletions(-)
---
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
index 19d4f4ec..5a303087 100644
--- a/data/appdata/meson.build
+++ b/data/appdata/meson.build
@@ -2,20 +2,32 @@
 ascli = find_program('appstreamcli')
 
 # NOTE: Release notes are not translated on purpose.
+# This target should not be run when building from tarball, see metainfo-releases-tarball.sh script.
 metainfo_with_relinfo = custom_target('gen-output',
   input : ['../../NEWS', 'org.gnome.gThumb.appdata.xml.in'],
   output : ['nol10n_withrelinfo_org.gnome.gThumb.appdata.xml'],
   command : [ascli, 'news-to-metainfo', '--limit=6', '@INPUT0@', '@INPUT1@', '@OUTPUT@']
 )
 
-metainfo_i18n = i18n.merge_file(
-  input : metainfo_with_relinfo,
-  output : 'org.gnome.gThumb.appdata.xml',
-  type : 'xml',
-  po_dir : po_dir,
-  install : true,
-  install_dir : join_paths(datadir, 'metainfo')
-)
+if get_option('tarball-appdata') == true
+  metainfo_i18n = i18n.merge_file(
+    input : 'org.gnome.gThumb.appdata.xml.in',
+    output : 'org.gnome.gThumb.appdata.xml',
+    type : 'xml',
+    po_dir : po_dir,
+    install : true,
+    install_dir : join_paths(datadir, 'metainfo')
+  )
+else
+  metainfo_i18n = i18n.merge_file(
+    input : metainfo_with_relinfo,
+    output : 'org.gnome.gThumb.appdata.xml',
+    type : 'xml',
+    po_dir : po_dir,
+    install : true,
+    install_dir : join_paths(datadir, 'metainfo')
+  )
+endif
 
 test('as-validate-metainfo',
   ascli,
@@ -24,3 +36,5 @@ test('as-validate-metainfo',
          '--no-net',
          metainfo_i18n]
 )
+
+meson.add_dist_script('metainfo-releases-tarball.sh')
diff --git a/data/appdata/metainfo-releases-tarball.sh b/data/appdata/metainfo-releases-tarball.sh
new file mode 100755
index 00000000..a69650a4
--- /dev/null
+++ b/data/appdata/metainfo-releases-tarball.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+appstreamcli news-to-metainfo --limit=1 $MESON_DIST_ROOT/NEWS 
$MESON_DIST_ROOT/data/appdata/org.gnome.gThumb.appdata.xml.in 
$MESON_DIST_ROOT/data/appdata/org.gnome.gThumb.appdata.xml.in
+
diff --git a/meson_options.txt b/meson_options.txt
index a6863433..21d524ec 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -99,3 +99,9 @@ option('libbrasero',
   value : true,
   description : 'Use libbrasero to save images and metadata to discs'
 )
+
+option('tarball-appdata',
+  type : 'boolean',
+  value : false,
+  description: 'Only merge translations, as tarball appdata already has release notes'
+)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]