0003-build-Remove-redundant-computation-of-dbus-data-directory.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435
  1. From 9fa097f4dde92a0c1675400228b4cb965ed3e123 Mon Sep 17 00:00:00 2001
  2. From: Simon McVittie <smcv@debian.org>
  3. Date: Thu, 3 Jun 2021 18:55:29 +0100
  4. Subject: [PATCH] build: Remove redundant computation of dbus data directory
  5. We were asking pkg-config "if I define ${datadir} to pk_prefix/pk_datadir,
  6. what would ${datadir} be?" but the answer is obviously always going to be
  7. pk_prefix/pk_datadir.
  8. Signed-off-by: Simon McVittie <smcv@debian.org>
  9. [Retrieved (and slightly updated for duktape fork) from:
  10. https://gitlab.freedesktop.org/polkit/polkit/-/commit/9fa097f4dde92a0c1675400228b4cb965ed3e123]
  11. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  12. ---
  13. meson.build | 3 +--
  14. 1 file changed, 1 insertion(+), 2 deletions(-)
  15. diff --git a/meson.build b/meson.build
  16. index 6a6799e..03a7683 100644
  17. --- a/meson.build
  18. +++ b/meson.build
  19. @@ -136,8 +136,7 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin
  20. endif
  21. dbus_dep = dependency('dbus-1')
  22. -dbus_confdir = dbus_dep.get_pkgconfig_variable('datadir', define_variable: ['datadir', pk_prefix / pk_datadir]) #changed from sysconfdir with respect to commit#8eada3836465838
  23. -dbus_policydir = dbus_confdir / 'dbus-1/system.d'
  24. +dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d'
  25. dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir])
  26. # check OS
  27. --
  28. GitLab