0001-remove-sysd.patch 2.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. diff --git a/data/meson.build b/data/meson.build
  2. index 651d2cf..c4d2f79 100644
  3. --- a/data/meson.build
  4. +++ b/data/meson.build
  5. @@ -26,16 +26,6 @@ if enable_pam
  6. )
  7. endif
  8. -if session_tracking == 'libsystemd-login'
  9. - configure_file(
  10. - input: 'polkit.service.in',
  11. - output: '@BASENAME@',
  12. - configuration: service_conf,
  13. - install: true,
  14. - install_dir: systemd_systemdsystemunitdir,
  15. - )
  16. -endif
  17. -
  18. install_data(
  19. 'policyconfig-1.dtd',
  20. install_dir: pk_datadir / 'polkit-1'
  21. diff --git a/meson.build b/meson.build
  22. index 3b96562..7a6f0a9 100644
  23. --- a/meson.build
  24. +++ b/meson.build
  25. @@ -207,13 +207,6 @@ if enable_logind
  26. func = 'sd_uid_get_display'
  27. config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep))
  28. - # systemd unit / service files
  29. - systemd_systemdsystemunitdir = get_option('systemdsystemunitdir')
  30. - if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login'
  31. - systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
  32. - # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used
  33. - systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
  34. - endif
  35. endif
  36. config_h.set('HAVE_LIBSYSTEMD', enable_logind)
  37. diff --git a/meson.build b/meson.build
  38. index 7a6f0a9..4abc73e 100644
  39. --- a/meson.build
  40. +++ b/meson.build
  41. @@ -386,9 +386,6 @@ output += ' introspection: ' + enable_introspection.to_string(
  42. output += ' Distribution/OS: ' + os_type + '\n'
  43. output += ' Authentication framework: ' + auth_fw + '\n'
  44. output += ' Session tracking: ' + session_tracking + '\n'
  45. -if enable_logind
  46. - output += ' systemdsystemunitdir: ' + systemd_systemdsystemunitdir + '\n'
  47. -endif
  48. output += ' polkitd user: ' + polkitd_user + ' \n'
  49. output += ' Javascript engine: ' + js_engine + '\n'
  50. output += ' PAM support: ' + enable_pam.to_string() + '\n\n'