[gentoo-commits] repo/gentoo:master commit in: sys-apps/fwupd/files/, sys-apps/fwupd/

[Thomas Deutschmann]

commit:     663a25c8d581d31ef58930aea642af90bbf1bdc8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 22:45:53 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 22:53:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663a25c8

sys-apps/fwupd: switch to upstream patch

Bug: https://bugs.gentoo.org/796143
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../files/fwupd-1.6.1-fix-python-detection.patch   | 51 ++++++++++++++++++++++
 ...-revert-Change-python-version-check-order.patch | 25 -----------
 sys-apps/fwupd/fwupd-1.6.1-r1.ebuild               |  2 +-
 3 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/sys-apps/fwupd/files/fwupd-1.6.1-fix-python-detection.patch b/sys-apps/fwupd/files/fwupd-1.6.1-fix-python-detection.patch
new file mode 100644
index 00000000000..b5da660e643
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.6.1-fix-python-detection.patch
@@ -0,0 +1,51 @@
+From 1a53fc57e8b5cd2de571ad5f1119c90ac8082f7a Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <superm1@×××××.com>
+Date: Tue, 15 Jun 2021 08:10:06 -0500
+Subject: [PATCH 1/2] Revert "meson.build: Change python version check order"
+
+This reverts commit 1b396215d9396680b1b6b5c14c6f57f2226ff0a9.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 1f89e6070..0ae12a1a7 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')
+
+From f4ef486da80a3b5916f8a58f10a70f30cf05f756 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <superm1@×××××.com>
+Date: Tue, 15 Jun 2021 08:13:17 -0500
+Subject: [PATCH 2/2] trivial: fix a regression in Gentoo detecting python
+ versions
+
+---
+ meson.build | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 0ae12a1a7..6e09ac69b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -252,7 +252,11 @@ 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')
++if host_machine.system() != 'freebsd'
++  python3 = find_program('python3')
++else
++  python3 = find_program('python3.8', 'python3', 'python3.9')
++endif
+ 
+ if get_option('gnutls')
+   gnutls = dependency('gnutls', version : '>= 3.6.0')

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
deleted file mode 100644
index d1c1b140830..00000000000
--- a/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 72a470fd607a40e8f23c1f2407faf69e91350783
-Author:     Thomas Deutschmann <whissi@g.o>
-AuthorDate: Tue Jun 15 14:11:24 2021 +0200
-Commit:     Thomas Deutschmann <whissi@g.o>
-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-r1.ebuild b/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
index cad45969bcb..e258342be62 100644
--- a/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.6.1-r1.ebuild
@@ -87,7 +87,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
-	"${FILESDIR}"/${PN}-1.6.1-revert-Change-python-version-check-order.patch
+	"${FILESDIR}"/${P}-fix-python-detection.patch
 )
 
 pkg_setup() {