SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i18n: drop intltool use, use meson's merge_file directly

Browse Source 
This didn't work during the initial conversion to meson, but should now.
A sufficiently new polkit is also required, for the .its rules files.

Note that https://github.com/mesonbuild/meson/blob/master/docs/markdown/i18n-module.md
says that 'install' argument was added in meson 0.43.0. If this is accurate,
warnigs might be generated with older mesons. Fedora has 0.43.0 across the
board, but other distros probably don't, but I guess that a warning is
prefereable to having to update do latest meson.

The advantages are:
- one less dependency (intltool)
- using the generic implementation instead of our open-coded calls
- we don't need to use the fake "_" prefixes in XML

Replaces #1609, fixes #7300.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2017-11-13 21:35:28 +01:00
parent f38326f21a
commit c81217920e
16 changed files with 131 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/machine/meson.build
+2 -2
View File
@@ -27,11 +27,11 @@ if conf.get('ENABLE_MACHINED') == 1
install_data('org.freedesktop.machine1.service',
install_dir : dbussystemservicedir)
custom_target(
i18n.merge_file(
'org.freedesktop.machine1.policy',
input : 'org.freedesktop.machine1.policy.in',
output : 'org.freedesktop.machine1.policy',
command : intltool_command,
po_dir : po_dir,
install : install_polkit,
install_dir : polkitpolicydir)
endif
src/machine/org.freedesktop.machine1.policy.in
+16 -16
View File
@@ -17,8 +17,8 @@
<vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
<action id="org.freedesktop.machine1.login">
<_description>Log into a local container</_description>
<_message>Authentication is required to log into a local container.</_message>
<description>Log into a local container</description>
<message>Authentication is required to log into a local container.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -27,8 +27,8 @@
</action>
<action id="org.freedesktop.machine1.host-login">
<_description>Log into the local host</_description>
<_message>Authentication is required to log into the local host.</_message>
<description>Log into the local host</description>
<message>Authentication is required to log into the local host.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -37,8 +37,8 @@
</action>
<action id="org.freedesktop.machine1.shell">
<_description>Acquire a shell in a local container</_description>
<_message>Authentication is required to acquire a shell in a local container.</_message>
<description>Acquire a shell in a local container</description>
<message>Authentication is required to acquire a shell in a local container.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -48,8 +48,8 @@
</action>
<action id="org.freedesktop.machine1.host-shell">
<_description>Acquire a shell on the local host</_description>
<_message>Authentication is required to acquire a shell on the local host.</_message>
<description>Acquire a shell on the local host</description>
<message>Authentication is required to acquire a shell on the local host.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -59,8 +59,8 @@
</action>
<action id="org.freedesktop.machine1.open-pty">
<_description>Acquire a pseudo TTY in a local container</_description>
<_message>Authentication is required to acquire a pseudo TTY in a local container.</_message>
<description>Acquire a pseudo TTY in a local container</description>
<message>Authentication is required to acquire a pseudo TTY in a local container.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -69,8 +69,8 @@
</action>
<action id="org.freedesktop.machine1.host-open-pty">
<_description>Acquire a pseudo TTY on the local host</_description>
<_message>Authentication is required to acquire a pseudo TTY on the local host.</_message>
<description>Acquire a pseudo TTY on the local host</description>
<message>Authentication is required to acquire a pseudo TTY on the local host.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -79,8 +79,8 @@
</action>
<action id="org.freedesktop.machine1.manage-machines">
<_description>Manage local virtual machines and containers</_description>
<_message>Authentication is required to manage local virtual machines and containers.</_message>
<description>Manage local virtual machines and containers</description>
<message>Authentication is required to manage local virtual machines and containers.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
@@ -90,8 +90,8 @@
</action>
<action id="org.freedesktop.machine1.manage-images">
<_description>Manage local virtual machine and container images</_description>
<_message>Authentication is required to manage local virtual machine and container images.</_message>
<description>Manage local virtual machine and container images</description>
<message>Authentication is required to manage local virtual machine and container images.</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>