diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-03 16:17:22 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-03 16:17:22 +0000 |
commit | 4cd2370bed609c118b6edfde5d3f116e5c35b897 (patch) | |
tree | ec58f2c41f49754e41521d5ebc9dce4597ddd0a5 /sys-apps/fwupd/files | |
parent | f443475c824b4b5c086e6d040961cb35ad81bc60 (diff) |
gentoo resync : 03.12.2017
Diffstat (limited to 'sys-apps/fwupd/files')
-rw-r--r-- | sys-apps/fwupd/files/fwupd-0.9-polkit_its_files.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/sys-apps/fwupd/files/fwupd-0.9-polkit_its_files.patch b/sys-apps/fwupd/files/fwupd-0.9-polkit_its_files.patch deleted file mode 100644 index 999df1cba252..000000000000 --- a/sys-apps/fwupd/files/fwupd-0.9-polkit_its_files.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 797e5672e64acd4f90cd52afca3bb192b28b4636 Mon Sep 17 00:00:00 2001 -From: Julian Liu <liu.julian@gmail.com> -Date: Fri, 28 Apr 2017 18:09:20 +0800 -Subject: [PATCH] Add polkit's ITS files as Ubuntu doesn't not ship with it. - -Call msgfmt with custom_target for now as data_dir kargs for i18n.merge_file() not merged into master yet. -(https://github.com/mesonbuild/meson/issues/1565) ---- - its/polkit.its | 8 ++++++++ - its/polkit.loc | 6 ++++++ - policy/meson.build | 12 ++++++++---- - 3 files changed, 22 insertions(+), 4 deletions(-) - create mode 100644 its/polkit.its - create mode 100644 its/polkit.loc - -diff --git a/its/polkit.its b/its/polkit.its -new file mode 100644 -index 0000000..1c37e6b ---- /dev/null -+++ b/its/polkit.its -@@ -0,0 +1,8 @@ -+<?xml version="1.0"?> -+<its:rules xmlns:its="http://www.w3.org/2005/11/its" -+ version="2.0"> -+ <its:translateRule selector="//*" translate="no"/> -+ <its:translateRule selector="//action/description | -+ //action/message" -+ translate="yes"/> -+</its:rules> -diff --git a/its/polkit.loc b/its/polkit.loc -new file mode 100644 -index 0000000..c7427ec ---- /dev/null -+++ b/its/polkit.loc -@@ -0,0 +1,6 @@ -+<?xml version="1.0"?> -+<locatingRules> -+ <locatingRule name="polkit policy" pattern="*.policy"> -+ <documentRule localName="policyconfig" target="polkit.its"/> -+ </locatingRule> -+</locatingRules> -diff --git a/policy/meson.build b/policy/meson.build -index def8976..41da2db 100644 ---- a/policy/meson.build -+++ b/policy/meson.build -@@ -1,11 +1,15 @@ - install_data('org.freedesktop.fwupd.rules', - install_dir : 'share/polkit-1/rules.d') - --i18n.merge_file( -- input: 'org.freedesktop.fwupd.policy.in', -+envbin = find_program('env') -+gettext_data_dir = 'GETTEXTDATADIRS=' + meson.source_root() -+custom_target('org.freedesktop.fwupd.policy', - output: 'org.freedesktop.fwupd.policy', -- type: 'xml', -- po_dir: join_paths(meson.source_root(), 'po'), -+ input: 'org.freedesktop.fwupd.policy.in', -+ command: [envbin, gettext_data_dir, 'msgfmt', '--xml', -+ '--template', '@INPUT@', -+ '-d', join_paths(meson.source_root(), 'po'), -+ '-o', '@OUTPUT@'], - install: true, - install_dir: join_paths(get_option('datadir'), 'polkit-1', 'actions') - ) |