Fix desktop and metainfo files translation.

Author: patrickfournier

data/meson.build

@@ -10,20 +10,29 @@ gorfector_resources = gnome.compile_resources(
     c_name: 'gorfector_resources',
 )
 
+msgfmt = find_program('msgfmt')
+
 desktop_conf = configuration_data()
 desktop_conf.set('icon', app_id)
 desktop_conf.set('version', meson.project_version())
-desktop_file = i18n.merge_file(
-    type: 'desktop',
+desktop_file = custom_target(
+    'desktop_file',
     input: configure_file(
         input: 'com.patrickfournier.gorfector.desktop.in.in',
         output: '@BASENAME@',
         configuration: desktop_conf
     ),
     output: '@0@.desktop'.format(app_id),
-    po_dir: podir,
+    command: [
+        msgfmt,
+        '--desktop',
+        '-d', 'po',
+        '--template=@INPUT@',
+        '--output-file=@OUTPUT@',
+    ],
     install: true,
-    install_dir: join_paths(datadir, 'applications')
+    install_dir: join_paths(datadir, 'applications'),
+    depends: update_all_po,
 )
 
 subdir('metainfo')

data/metainfo/meson.build

@@ -1,18 +1,24 @@
 metainfo_conf = configuration_data()
 metainfo_conf.set('APP_ID', app_id)
 
-metainfo_file = 'com.patrickfournier.gorfector.metainfo.xml.in.in'
-metainfo_file = i18n.merge_file(
+metainfo_file = custom_target(
+    'metainfo_file',
     input: configure_file(
         input: 'com.patrickfournier.gorfector.metainfo.xml.in.in',
-        output: 'com.patrickfournier.gorfector.metainfo.xml.in',
-        configuration: metainfo_conf,
+        output: '@BASENAME@',
+        configuration: metainfo_conf
     ),
     output: app_id + '.metainfo.xml',
-    type: 'xml',
-    po_dir: podir,
+    command: [
+        msgfmt,
+        '--xml',
+        '-d', 'po',
+        '--template=@INPUT@',
+        '--output-file=@OUTPUT@',
+    ],
     install: true,
-    install_dir: join_paths (get_option ('datadir'), 'metainfo')
+    install_dir: join_paths (get_option ('datadir'), 'metainfo'),
+    depends: update_all_po,
 )
 
 # Validate MetaInfo file

meson.build

@@ -11,7 +11,6 @@ project('gorfector',
 )
 
 gnome = import('gnome')
-i18n  = import('i18n')
 
 cx = meson.get_compiler('cpp')
 
@@ -22,7 +21,6 @@ else
 endif
 
 gettext_package = meson.project_name()
-podir = join_paths(meson.project_source_root(), 'po')
 
 datadir = join_paths(get_option('prefix'), get_option('datadir'))
 
@@ -56,9 +54,9 @@ cxxflags = [
 ]
 
 subdir('scanners')
-subdir('data')
 subdir('help')
 subdir('po')
+subdir('data')
 subdir('src')
 
 gnome.post_install(

po/meson.build

@@ -146,7 +146,7 @@ update_pot = custom_target(
 update_all_po = custom_target(
     'update_all_po',
     input: update_pot,
-    output: po_files,
+    output: ['LINGUAS', po_files],
     command: [
         'meson_helpers/update_all_po.sh',
         '@CURRENT_SOURCE_DIR@',

po/meson_helpers/compile_all_mo.sh

@@ -2,7 +2,8 @@
 
 out_dir=$1
 package_name=$2
-shift 2
+# linguas_file=$3
+shift 3
 
 echo "Info: Compiling .po files to .mo files"
 

po/meson_helpers/update_all_po.sh

@@ -5,8 +5,9 @@ build_dir=$2
 pot_file=$3
 
 shift 3
+langs=$*
 
-for lang in "$@"; do
+for lang in ${langs}; do
     if [[ -f "${build_dir}/${lang}.po" ]]; then
         rm "${build_dir}/${lang}.po"
     fi
@@ -20,3 +21,5 @@ for lang in "$@"; do
     mv "${build_dir}/${lang}.po" "${src_dir}/${lang}.po"
     ln -rs "${src_dir}/${lang}.po" "${build_dir}/${lang}.po"
 done
+
+printf "%s\n" $langs > "${build_dir}/LINGUAS"