summaryrefslogtreecommitdiffstats
path: root/source/l/polkit/polkit-124-systemd-fixup.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2024-04-11 21:36:28 +0000
committer Eric Hameleers <alien@slackware.com>2024-04-12 00:10:09 +0200
commit79267f6e54a1227ee4db836d4cf36c100ec8d5b7 (patch)
tree98d87f1bc63b3b9faeb2128fe8c811988319668d /source/l/polkit/polkit-124-systemd-fixup.patch
parent66d9bc3f90f149c803da3816bfa8e5d6140dd1e4 (diff)
downloadcurrent-79267f6e54a1227ee4db836d4cf36c100ec8d5b7.tar.gz
current-79267f6e54a1227ee4db836d4cf36c100ec8d5b7.tar.xz
Thu Apr 11 21:36:28 UTC 202420240411213628
d/cmake-3.29.2-x86_64-1.txz: Upgraded. l/polkit-124-x86_64-1.txz: Upgraded. Thanks to marav for the patches.
Diffstat (limited to 'source/l/polkit/polkit-124-systemd-fixup.patch')
-rw-r--r--source/l/polkit/polkit-124-systemd-fixup.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/source/l/polkit/polkit-124-systemd-fixup.patch b/source/l/polkit/polkit-124-systemd-fixup.patch
new file mode 100644
index 000000000..a4dd7eafc
--- /dev/null
+++ b/source/l/polkit/polkit-124-systemd-fixup.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/922458
+https://github.com/polkit-org/polkit/pull/417/files#r1458416421
+--- a/meson.build
++++ b/meson.build
+@@ -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
+- systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
+ systemd_systemdsystemunitdir = get_option('systemdsystemunitdir')
+- 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
++
++ systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d')
++ endif
+ endif
+ config_h.set('HAVE_LIBSYSTEMD', enable_logind)
+