diff options
| author |   Sam James <sam@gentoo.org> | 2024-01-19 06:58:45 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-01-19 06:59:18 +0000 |
| commit | e1a7e1d191e7b98df09ec9be6ff8e4d17e65a127 (patch) | |
| tree | 43b1b9a72d076eec1a49f71c5e50b27324c3bcb9 /sys-auth/polkit | |
| parent | x11-terms/kitty: add 0.32.0 (diff) | |
| download | gentoo-e1a7e1d191e7b98df09ec9be6ff8e4d17e65a127.tar.gz gentoo-e1a7e1d191e7b98df09ec9be6ff8e4d17e65a127.tar.bz2 gentoo-e1a7e1d191e7b98df09ec9be6ff8e4d17e65a127.zip | |
sys-auth/polkit: more non-systemd fixes
Bug: https://bugs.gentoo.org/922458
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-auth/polkit')
| -rw-r--r-- | sys-auth/polkit/files/polkit-124-systemd-fixup.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sys-auth/polkit/files/polkit-124-systemd-fixup.patch b/sys-auth/polkit/files/polkit-124-systemd-fixup.patch index fceb33d31afd..a4dd7eafcf92 100644 --- a/sys-auth/polkit/files/polkit-124-systemd-fixup.patch +++ b/sys-auth/polkit/files/polkit-124-systemd-fixup.patch @@ -2,7 +2,7 @@ https://bugs.gentoo.org/922458 https://github.com/polkit-org/polkit/pull/417/files#r1458416421 --- a/meson.build +++ b/meson.build -@@ -212,11 +212,14 @@ if enable_logind +@@ -212,14 +212,17 @@ if enable_logind config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) # systemd unit / service files @@ -11,16 +11,18 @@ https://github.com/polkit-org/polkit/pull/417/files#r1458416421 - if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' - # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used - systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') +- endif + if session_tracking == 'libsystemd-login' + systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') -+ + +- systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') + if systemd_systemdsystemunitdir == '' + # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used + systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') + endif - endif ++ ++ systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') ++ endif + endif + config_h.set('HAVE_LIBSYSTEMD', enable_logind) - systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') --- -2.43.0 - |