PolicyKit: Branch 'master' - 2 commits

[GitLab Mirror]

 meson.build |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 4bb2157adae620c8b07caf5a24b177d1f90f2fbb
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jun 3 18:57:00 2021 +0100

    build: Don't require dbus development files
    
    We don't actually need libdbus, only the dbus-daemon's installation
    directory for system services, which in practice is always going to be
    /usr/share/dbus-1/system-services.
    
    Signed-off-by: Simon McVittie <smcv at debian.org>

diff --git a/meson.build b/meson.build
index 03a7683..539ec7a 100644
--- a/meson.build
+++ b/meson.build
@@ -135,9 +135,14 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin
 
 mozjs_dep = dependency('mozjs-78')
 
-dbus_dep = dependency('dbus-1')
+dbus_dep = dependency('dbus-1', required: false)
 dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d'
-dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir])
+if dbus_dep.found()
+  dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir])
+else
+  # libdbus development files not installed, assume a standard layout
+  dbus_system_bus_services_dir = pk_prefix / pk_datadir / 'dbus-1' / 'system-services'
+endif
 
 # check OS
 host_system = host_machine.system()
commit 9fa097f4dde92a0c1675400228b4cb965ed3e123
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jun 3 18:55:29 2021 +0100

    build: Remove redundant computation of dbus data directory
    
    We were asking pkg-config "if I define ${datadir} to pk_prefix/pk_datadir,
    what would ${datadir} be?" but the answer is obviously always going to be
    pk_prefix/pk_datadir.
    
    Signed-off-by: Simon McVittie <smcv at debian.org>

diff --git a/meson.build b/meson.build
index 6a6799e..03a7683 100644
--- a/meson.build
+++ b/meson.build
@@ -136,8 +136,7 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin
 mozjs_dep = dependency('mozjs-78')
 
 dbus_dep = dependency('dbus-1')
-dbus_confdir = dbus_dep.get_pkgconfig_variable('datadir', define_variable: ['datadir', pk_prefix / pk_datadir])   #changed from sysconfdir with respect to commit#8eada3836465838
-dbus_policydir = dbus_confdir / 'dbus-1/system.d'
+dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d'
 dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir])
 
 # check OS