commit c1208b887b68ff9e668a6aca9b4f21494145c24d Author: Tim Biermann <tbier@posteo.de> Date: Sun Oct 31 18:21:34 2021 +0100 polkit: patched for meson 0.60 diff --git a/polkit/.signature b/polkit/.signature index aab264945..412587642 100644 --- a/polkit/.signature +++ b/polkit/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VGO9x9ClZqmxgVMG++XquIKqZiNcPSpw9SzJemsFkD9KvVseYcwzAgGcl8GDxyZRlb7llGTgTEmDc0GrbNL1wc= -SHA256 (Pkgfile) = 8744adebbd84c54feee9e4b1ecb9b1cff20e6396421d724e485db47b4349a8b2 +RWSE3ohX2g5d/Rw84KMLAEMJnMuFubZf34af78qsvRl1zkkTMPDoh9RPPw4TXv70WixN6nNFYeXC+KWjS/EOQ7QnaSN/He6kHQE= +SHA256 (Pkgfile) = c7e291ebf0f1f74582be59faeeabe2b661413b3587e90ff4d219827d0c78c9b4 SHA256 (.footprint) = 7ae3e87d2e0379db60e118c5b79938e87319b3460d1907ef73524cbdad79db15 SHA256 (polkit-0.120.tar.gz) = ee7a599a853117bf273548725719fa92fabd2f136915c7a4906cee98567aee03 SHA256 (polkit-1) = 9045eb2a1e2e403b0144d14a5cfe903dc97cfef979c956815a56777c0eb1bf1a +SHA256 (99.patch) = 9a84b59d38b3f86c70c5fc3a28cbfe8d7a22cf190eb20ff433f7f53f5ff73a9a diff --git a/polkit/99.patch b/polkit/99.patch new file mode 100644 index 000000000..5e144688d --- /dev/null +++ b/polkit/99.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/polkit/Pkgfile b/polkit/Pkgfile index 63c866599..b8bdf9dad 100644 --- a/polkit/Pkgfile +++ b/polkit/Pkgfile @@ -5,11 +5,13 @@ name=polkit version=0.120 -release=1 +release=2 source=(https://freedesktop.org/software/polkit/releases/$name-$version.tar.gz - polkit-1) + polkit-1 99.patch) build() { + patch -Np1 -d $name-$version -i $SRC/99.patch + meson setup $name-$version build \ --prefix=/usr \ --buildtype=plain \