accountsservice: upgrade 0.6.55 -> 22.08.8

* backported patch can go
* adjust systemd options

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andreas Müller 2022-04-03 19:35:53 +02:00 committed by Khem Raj
parent 3497386ae4
commit 8eb7e5c1d0
3 changed files with 15 additions and 43 deletions

View File

@ -1,29 +0,0 @@
From bedec82615ca6858c3e9494650a5bbf33c710ebb Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Sun, 31 Oct 2021 12:29:14 +0000
Subject: [PATCH] Fix build with meson 0.60
Positional parameters to merge_file() were never allowed and always
ignored, so just drop it.
See: https://github.com/mesonbuild/meson/issues/9441
Fixes #97
Upstream-Status: Backport
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
data/meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/data/meson.build b/data/meson.build
index 4987937..ed0e2c4 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -29,7 +29,6 @@ configure_file(
policy = act_namespace.to_lower() + '.policy'
i18n.merge_file(
- policy,
input: policy + '.in',
output: policy,
po_dir: po_dir,

View File

@ -4,19 +4,20 @@ Date: Sun, 8 Dec 2019 23:42:00 +0100
Subject: [PATCH] musl: Hack to fix configure
---
meson.build | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
meson.build | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 4465a26..726c9fe 100644
index 075776f..dfd7421 100644
--- a/meson.build
+++ b/meson.build
@@ -82,8 +82,14 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURC
elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
@@ -101,9 +101,14 @@ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
config_h.set('PATH_WTMP', '_PATH_WTMPX')
else
- assert(run_command('test', '-e', '/var/log/utx.log').returncode() == 0, 'Do not know which filename to watch for wtmp changes')
- config_h.set_quoted('PATH_WTMP', '/var/log/utx.log')
- path_wtmp = '/var/log/utx.log'
- assert(run_command('test', '-e', path_wtmp).returncode() == 0, 'Do not know which filename to watch for wtmp changes')
- config_h.set_quoted('PATH_WTMP', path_wtmp)
+ # musl: This is just a build fix hack.
+ # As usual they know better, consider all other projects crap and offer zero
+ # alternatives: So wtmp is a dead stub only [1] (= /dev/null/wtmp - taken
@ -28,3 +29,6 @@ index 4465a26..726c9fe 100644
endif
# compiler flags
--
2.34.1

View File

@ -8,24 +8,21 @@ DEPENDS = " \
polkit \
"
inherit meson gobject-introspection gtk-doc features_check systemd
inherit meson gobject-introspection gtk-doc features_check systemd vala
REQUIRED_DISTRO_FEATURES = "polkit"
SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \
file://0001-Fix-build-with-meson-0.60.patch \
"
SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz"
SRC_URI:append:libc-musl = " \
file://0001-musl-Hack-to-fix-build.patch \
file://0002-musl-add-missing-fgetspent_r.patch \
"
SRC_URI[md5sum] = "6e4c6fbd490260cfe17de2e76f5d803a"
SRC_URI[sha256sum] = "ff2b2419a7e06bd9cb335ffe391c7409b49a0f0130b890bd54692a3986699c9b"
SRC_URI[sha256sum] = "909997a76919fe7dc138a9a01cea70bd622d5a932dbc9fb13010113023a7a391"
GTKDOC_MESON_OPTION = "gtk_doc"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false -Dsystemdsystemunitdir='no', systemd"
PACKAGECONFIG[systemd] = ", -Dsystemdsystemunitdir='no', systemd"
SYSTEMD_SERVICE:${PN} = "accounts-daemon.service"