public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/polkit/files/, sys-auth/polkit/
Date: Wed,  7 Dec 2022 13:23:17 +0000 (UTC)	[thread overview]
Message-ID: <1670419241.57c54478ee91f5dd76c0d0a47f93b160bb0b49c3.sam@gentoo> (raw)

commit:     57c54478ee91f5dd76c0d0a47f93b160bb0b49c3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 13:20:34 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 13:20:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57c54478

sys-auth/polkit: fix install w/ USE=-daemon

Closes: https://bugs.gentoo.org/884701
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/polkit-122-libs-only-postinstall.patch   | 39 ++++++++++++++++++++++
 sys-auth/polkit/polkit-122.ebuild                  |  7 +++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/sys-auth/polkit/files/polkit-122-libs-only-postinstall.patch b/sys-auth/polkit/files/polkit-122-libs-only-postinstall.patch
new file mode 100644
index 000000000000..d96b4bc4bde1
--- /dev/null
+++ b/sys-auth/polkit/files/polkit-122-libs-only-postinstall.patch
@@ -0,0 +1,39 @@
+https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/149
+
+From bef75fb8291b3871894d8ffe19f7242448cdb4a8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 7 Dec 2022 13:18:09 +0000
+Subject: [PATCH] meson.build: fix install with libs_only
+
+Bug: https://bugs.gentoo.org/884701
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/meson.build
++++ b/meson.build
+@@ -360,14 +360,17 @@ configure_file(
+   configuration: config_h,
+ )
+ 
+-meson.add_install_script(
+-  'meson_post_install.py',
+-  get_option('bindir'),
+-  pk_pkgdatadir,
+-  pk_libprivdir,
+-  pk_pkgsysconfdir,
+-  polkitd_user,
+-)
++
++if not libs_only
++  meson.add_install_script(
++    'meson_post_install.py',
++    get_option('bindir'),
++    pk_pkgdatadir,
++    pk_libprivdir,
++    pk_pkgsysconfdir,
++    polkitd_user,
++  )
++endif
+ 
+ output = '\n        ' + meson.project_name() + ' ' + meson.project_version() + '\n'
+ output += '        ============\n\n'
+-- 
+GitLab

diff --git a/sys-auth/polkit/polkit-122.ebuild b/sys-auth/polkit/polkit-122.ebuild
index 249ac83bdeb0..cb84fcb2f9f2 100644
--- a/sys-auth/polkit/polkit-122.ebuild
+++ b/sys-auth/polkit/polkit-122.ebuild
@@ -85,7 +85,12 @@ DOCS=( docs/TODO HACKING.md NEWS.md README.md )
 
 QA_MULTILIB_PATHS="
 	usr/lib/polkit-1/polkit-agent-helper-1
-	usr/lib/polkit-1/polkitd"
+	usr/lib/polkit-1/polkitd
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-122-libs-only-postinstall.patch
+)
 
 python_check_deps() {
 	python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&


             reply	other threads:[~2022-12-07 13:23 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-07 13:23 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-10 13:12 [gentoo-commits] repo/gentoo:master commit in: sys-auth/polkit/files/, sys-auth/polkit/ Sam James
2024-11-01 14:23 Andreas K. Hüttel
2024-10-29  5:13 Eli Schwartz
2023-08-18 10:37 Sam James
2023-03-22 19:47 Mike Gilbert
2022-05-11  5:26 Sam James
2022-05-04  2:33 Sam James
2022-01-19 19:08 Mike Gilbert
2019-06-09 11:37 Andreas Sturmlechner
2018-12-06 23:11 Mike Gilbert
2016-01-02 10:14 Gilles Dartiguelongue

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1670419241.57c54478ee91f5dd76c0d0a47f93b160bb0b49c3.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox