From 53d80c14742b8dd387aa449360e2b68bc0291e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 27 Jan 2020 19:53:36 +0100
Subject: [PATCH] build: Use gettext to translate policy file with meson

Recent versions of gettext can merge translations in xml files,
so use it and remove the intltool dependency for meson builds.
---
 .gitlab-ci.yml                               |  2 +-
 data/meson.build                             | 11 ++---------
 data/net.reactivated.fprint.device.policy.in | 12 ++++++------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a540cff..0deb902 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ image: fedora:rawhide
 
 variables:
   DEPENDENCIES: dbus-glib-devel pam-devel polkit-devel
-                gtk-doc meson intltool autoconf automake libtool
+                gtk-doc meson gettext intltool autoconf automake libtool
                 gcc gcc-c++ glibc-devel make python3-dbusmock python3-libpamtest systemd-devel
   DEPENDENCIES_STABLE: $DEPENDENCIES libfprint-devel
   DEPENDENCIES_DEV: $DEPENDENCIES git
diff --git a/data/meson.build b/data/meson.build
index b007b46..bada139 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -22,17 +22,10 @@ configure_file(
 )
 
 polkit_policy = 'net.reactivated.fprint.device.policy'
-polkit_policy_target = custom_target(polkit_policy,
+polkit_policy_target = i18n.merge_file(polkit_policy,
     input: '@0@.in'.format(polkit_policy),
     output: polkit_policy,
-    command: [
-        find_program('intltool-merge'),
-        '-x',
-        '-u',
-        meson.source_root() / 'po',
-        '@INPUT@',
-        '@OUTPUT@',
-    ],
+    po_dir: meson.source_root() / 'po',
     install: true,
     install_dir: polkit_policy_directory,
 )
diff --git a/data/net.reactivated.fprint.device.policy.in b/data/net.reactivated.fprint.device.policy.in
index bf49192..541426a 100644
--- a/data/net.reactivated.fprint.device.policy.in
+++ b/data/net.reactivated.fprint.device.policy.in
@@ -10,8 +10,8 @@
   <icon_name>fprint</icon_name>
 
   <action id="net.reactivated.fprint.device.verify">
-    <_description>Verify a fingerprint</_description>
-    <_message>Privileges are required to verify fingerprints.</_message>
+    <description>Verify a fingerprint</description>
+    <message>Privileges are required to verify fingerprints.</message>
     <defaults>
       <allow_any>no</allow_any>
       <allow_inactive>no</allow_inactive>
@@ -20,8 +20,8 @@
   </action>
 
   <action id="net.reactivated.fprint.device.enroll">
-    <_description>Enroll new fingerprints</_description>
-    <_message>Privileges are required to enroll new fingerprints.</_message>
+    <description>Enroll new fingerprints</description>
+    <message>Privileges are required to enroll new fingerprints.</message>
     <defaults>
       <allow_any>no</allow_any>
       <allow_inactive>no</allow_inactive>
@@ -30,8 +30,8 @@
   </action>
 
   <action id="net.reactivated.fprint.device.setusername">
-    <_description>Select a user to enroll</_description>
-    <_message>Privileges are required to enroll new fingerprints for other users.</_message>
+    <description>Select a user to enroll</description>
+    <message>Privileges are required to enroll new fingerprints for other users.</message>
     <defaults>
       <allow_any>no</allow_any>
       <allow_inactive>no</allow_inactive>