diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2021-06-15 14:20:33 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2021-06-15 14:21:18 +0200 |
| commit | fa0b9e87f41366e6cdaf517e7ebcc6df76300f7c (patch) | |
| tree | 1a5b27470e33eca83524b7e71023a8f19b1a1b3c /sys-apps | |
| parent | app-admin/ansible-base: add 2.11.1 (diff) | |
| download | gentoo-fa0b9e87f41366e6cdaf517e7ebcc6df76300f7c.tar.gz gentoo-fa0b9e87f41366e6cdaf517e7ebcc6df76300f7c.tar.bz2 gentoo-fa0b9e87f41366e6cdaf517e7ebcc6df76300f7c.zip | |
sys-apps/fwupd: fix Python detection
Bug: https://bugs.gentoo.org/796143
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch | 25 | ||||
| -rw-r--r-- | sys-apps/fwupd/fwupd-1.6.1.ebuild | 3 |
2 files changed, 27 insertions, 1 deletions
diff --git a/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch b/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch new file mode 100644 index 000000000000..d1c1b1408303 --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch @@ -0,0 +1,25 @@ +commit 72a470fd607a40e8f23c1f2407faf69e91350783 +Author: Thomas Deutschmann <whissi@gentoo.org> +AuthorDate: Tue Jun 15 14:11:24 2021 +0200 +Commit: Thomas Deutschmann <whissi@gentoo.org> +CommitDate: Tue Jun 15 14:11:24 2021 +0200 + + Revert "meson.build: Change python version check order" + + This reverts commit 1b396215d9396680b1b6b5c14c6f57f2226ff0a9. + + This is causing a regression for Gentoo, https://bugs.gentoo.org/796143. + +diff --git a/meson.build b/meson.build +index 5d507515..1e0e350a 100644 +--- a/meson.build ++++ b/meson.build +@@ -252,7 +252,7 @@ libm = cc.find_library('m', required: false) + libgcab = dependency('libgcab-1.0', version : '>= 1.0', fallback : ['gcab', 'gcab_dep']) + gcab = find_program('gcab', required : get_option('tests')) + bashcomp = dependency('bash-completion', required: false) +-python3 = find_program('python3.8', 'python3', 'python3.9') ++python3 = find_program('python3') + + if get_option('gnutls') + gnutls = dependency('gnutls', version : '>= 3.6.0') diff --git a/sys-apps/fwupd/fwupd-1.6.1.ebuild b/sys-apps/fwupd/fwupd-1.6.1.ebuild index e0f4a52cfe55..5468692f74bd 100644 --- a/sys-apps/fwupd/fwupd-1.6.1.ebuild +++ b/sys-apps/fwupd/fwupd-1.6.1.ebuild @@ -86,7 +86,8 @@ DEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-1.5.7-logind_plugin.patch" + "${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch + "${FILESDIR}"/${PN}-1.6.1-revert-Change-python-version-check-order.patch ) pkg_setup() { |