elogind: update to 246.10.

This commit is contained in:
André Cerqueira 2022-07-28 23:15:17 +01:00 committed by Michal Vasilek
parent b796639e28
commit aacf5ad951
2 changed files with 32 additions and 5 deletions

View file

@ -0,0 +1,27 @@
commit 2b09e13f7aec13105380d9d9fddc96ae51911b0c
Author: Daniel Kolesa <daniel@octaforge.org>
Date: Sat Dec 18 02:53:26 2021 +0100
reenable polkit
diff --git a/meson.build b/meson.build
index 72825a2..b14cb64 100644
--- a/meson.build
+++ b/meson.build
@@ -1155,15 +1155,6 @@ if want_polkit != 'false' and not skip_deps
message('Old polkit detected, will install pkla files')
install_polkit_pkla = true
endif
-#if 1 /// Disable polkit completely if libpolkit is not there. See elogind issue #167
- if not libpolkit.found()
- if want_polkit != 'auto'
- error('Polkit requested but libpolkit was not found.')
- endif
- install_polkit = false
- want_polkit = false
- endif
-#endif // 1
endif
conf.set10('ENABLE_POLKIT', install_polkit)

View file

@ -1,13 +1,13 @@
# Template file for 'elogind' # Template file for 'elogind'
pkgname=elogind pkgname=elogind
reverts="246.10_1" version=246.10
version=246.9.2 revision=1
revision=3
build_style=meson build_style=meson
configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt configure_args="-Dcgroup-controller=elogind -Dhalt-path=/usr/bin/halt
-Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot -Drootlibexecdir=/usr/libexec/elogind -Dreboot-path=/usr/bin/reboot
-Dkexec-path=/usr/bin/kexec -Ddefault-hierarchy=legacy -Dkexec-path=/usr/bin/kexec -Ddefault-hierarchy=legacy
-Ddefault-kill-user-processes=false -Dman=true" -Ddefault-kill-user-processes=false -Dman=true
-Dpolkit=true"
hostmakedepends="docbook-xsl gettext-devel gperf intltool libxslt m4 hostmakedepends="docbook-xsl gettext-devel gperf intltool libxslt m4
pkg-config shadow glib-devel" pkg-config shadow glib-devel"
makedepends="acl-devel eudev-libudev-devel gettext-devel libglib-devel libcap-devel makedepends="acl-devel eudev-libudev-devel gettext-devel libglib-devel libcap-devel
@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.0-or-later" license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://github.com/elogind/elogind" homepage="https://github.com/elogind/elogind"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
checksum=dd2fcf22a89a078cad22e633d2f14a4cc9f4a9c8bae25c0e39fc4aec3e273bc9 checksum=c490dc158c8f5bca8d00ecfcc7ad5af24d1c7b9e59990a0b3b1323996221a922
conf_files="/etc/elogind/*.conf" conf_files="/etc/elogind/*.conf"
# tests fail differently due to containerization and kernel features # tests fail differently due to containerization and kernel features
make_check=ci-skip make_check=ci-skip