[gvfs] gettext: Remove embedded polkit rules



commit 5e2ff6885240f929f067322707e45aa64c23107f
Author: Ondrej Holy <oholy redhat com>
Date:   Fri Apr 13 14:08:53 2018 +0200

    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.

 daemon/meson.build     |    1 -
 gettext/its/polkit.its |    8 --------
 gettext/its/polkit.loc |    6 ------
 meson.build            |    3 +--
 4 files changed, 1 insertions(+), 17 deletions(-)
---
diff --git a/daemon/meson.build b/daemon/meson.build
index 1744f74..e4cc973 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/meson.build b/meson.build
index c8ae452..2b6b350 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('.')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]