diff options
| author | Ondrej Holy <oholy@redhat.com> | 2018-04-13 14:08:53 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2018-04-17 12:57:06 +0200 |
| commit | 5e2ff6885240f929f067322707e45aa64c23107f (patch) | |
| tree | 1b090831a5b6f1e6c15b1694198a9aac6ab705c4 | |
| parent | 3a7bb06be72fc62b4ec524afe67febf0f529066d (diff) | |
| download | gvfs-5e2ff6885240f929f067322707e45aa64c23107f.tar.gz | |
gettext: Remove embedded polkit rules
polkit.its and polkit.loc has been embedded in our project by
Bug 768707 so we could push gettext port. Those files are already
part of recent gettext release, so we can remove them.
| -rw-r--r-- | daemon/meson.build | 1 | ||||
| -rw-r--r-- | gettext/its/polkit.its | 8 | ||||
| -rw-r--r-- | gettext/its/polkit.loc | 6 | ||||
| -rw-r--r-- | meson.build | 3 |
4 files changed, 1 insertions, 17 deletions
diff --git a/daemon/meson.build b/daemon/meson.build index 1744f740..e4cc9735 100644 --- a/daemon/meson.build +++ b/daemon/meson.build @@ -395,7 +395,6 @@ if enable_admin input: policy_in, output: policy, po_dir: po_dir, - data_dirs: its_dir, install: true, install_dir: join_paths(gvfs_datadir, 'polkit-1', 'actions') ) diff --git a/gettext/its/polkit.its b/gettext/its/polkit.its deleted file mode 100644 index 1c37e6be..00000000 --- a/gettext/its/polkit.its +++ /dev/null @@ -1,8 +0,0 @@ -<?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/gettext/its/polkit.loc b/gettext/its/polkit.loc deleted file mode 100644 index c7427ec6..00000000 --- a/gettext/its/polkit.loc +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<locatingRules> - <locatingRule name="polkit policy" pattern="*.policy"> - <documentRule localName="policyconfig" target="polkit.its"/> - </locatingRule> -</locatingRules> diff --git a/meson.build b/meson.build index c8ae4521..2b6b3506 100644 --- a/meson.build +++ b/meson.build @@ -298,7 +298,7 @@ config_h.set('HAVE_GCR', enable_gcr) enable_admin = get_option('admin') if enable_admin libcap_dep = dependency('libcap') - polkit_gobject_dep = dependency('polkit-gobject-1') + polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.114') endif # *** Check if we should build with http backend *** @@ -477,7 +477,6 @@ pkg = import('pkgconfig') service_conf = configuration_data() service_conf.set('libexecdir', gvfs_libexecdir) -its_dir = join_paths(meson.source_root(), 'gettext') po_dir = join_paths(meson.source_root(), 'po') top_inc = include_directories('.') |