diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2022-01-19 14:06:56 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2022-01-19 14:06:56 -0500 |
| commit | c1afa82590f689552afd2a242557a250f7a83cba (patch) | |
| tree | 8a2c8001fa288e657e18531513a5a51852c86851 | |
| parent | sys-process/fcron: version bump to 3.3.1_beta (diff) | |
| download | gentoo-c1afa825.tar.gz gentoo-c1afa825.tar.bz2 gentoo-c1afa825.zip | |
sys-auth/polkit: fix build with meson-0.61
Closes: https://bugs.gentoo.org/831459
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rw-r--r-- | sys-auth/polkit/files/polkit-0.120-meson.patch | 42 | ||||
| -rw-r--r-- | sys-auth/polkit/polkit-0.120-r1.ebuild | 5 |
2 files changed, 46 insertions, 1 deletions
diff --git a/sys-auth/polkit/files/polkit-0.120-meson.patch b/sys-auth/polkit/files/polkit-0.120-meson.patch new file mode 100644 index 000000000000..5e144688d374 --- /dev/null +++ b/sys-auth/polkit/files/polkit-0.120-meson.patch @@ -0,0 +1,42 @@ +From e7f3d9e8341df64e2abc3910dafb1113a84bff07 Mon Sep 17 00:00:00 2001 +From: Simon McVittie <smcv@debian.org> +Date: Mon, 25 Oct 2021 20:21:27 +0100 +Subject: [PATCH] Don't pass positional parameters to i18n.merge_file + +These were always ignored, and Meson 0.60.0 disallowed them. + +Resolves: https://gitlab.freedesktop.org/polkit/polkit/-/issues/160 +Reference: https://github.com/mesonbuild/meson/pull/9445 +Signed-off-by: Simon McVittie <smcv@debian.org> +--- + actions/meson.build | 1 - + src/examples/meson.build | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/actions/meson.build b/actions/meson.build +index 2abaaf3..1e3f370 100644 +--- a/actions/meson.build ++++ b/actions/meson.build +@@ -1,7 +1,6 @@ + policy = 'org.freedesktop.policykit.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: '@BASENAME@', + po_dir: po_dir, +diff --git a/src/examples/meson.build b/src/examples/meson.build +index c6305ab..8c18de5 100644 +--- a/src/examples/meson.build ++++ b/src/examples/meson.build +@@ -1,7 +1,6 @@ + policy = 'org.freedesktop.policykit.examples.pkexec.policy' + + i18n.merge_file( +- policy, + input: policy + '.in', + output: '@BASENAME@', + po_dir: po_dir, +-- +GitLab + diff --git a/sys-auth/polkit/polkit-0.120-r1.ebuild b/sys-auth/polkit/polkit-0.120-r1.ebuild index 0f0f2900683f..3ec998fa6f02 100644 --- a/sys-auth/polkit/polkit-0.120-r1.ebuild +++ b/sys-auth/polkit/polkit-0.120-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -61,6 +61,9 @@ QA_MULTILIB_PATHS=" usr/lib/polkit-1/polkitd" src_prepare() { + local PATCHES=( + "${FILESDIR}/polkit-0.120-meson.patch" + ) default sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513 |