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

[Sam James]

commit:     7ad43fe5d48d4deb2c3a2a3e9dfb6af7c62dc2af
Author:     James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sat Oct 30 07:02:29 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 02:45:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad43fe5

sys-apps/fwupd: fix configure with USE=test,-gnutls

See: https://github.com/fwupd/fwupd/pull/3921

Closes: https://bugs.gentoo.org/791760
Signed-off-by: James Beddek <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/22756
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../fwupd/files/fwupd-1.7.0-fix-test-configure.patch | 20 ++++++++++++++++++++
 sys-apps/fwupd/fwupd-1.7.0.ebuild                    |  1 +
 2 files changed, 21 insertions(+)

diff --git a/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch b/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch
new file mode 100644
index 00000000000..4974a82bdf5
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch
@@ -0,0 +1,20 @@
+# https://bugs.gentoo.org/791760
+# https://github.com/fwupd/fwupd/pull/3921
+
+diff --git a/plugins/synaptics-rmi/meson.build b/plugins/synaptics-rmi/meson.build
+index acbb6b92..10ac3047 100644
+--- a/plugins/synaptics-rmi/meson.build
++++ b/plugins/synaptics-rmi/meson.build
+@@ -38,7 +38,6 @@ shared_module('fu_plugin_synaptics_rmi',
+     fwupdplugin,
+   ],
+ )
+-endif
+ 
+ if get_option('tests')
+   e = executable(
+@@ -67,3 +66,4 @@ if get_option('tests')
+   )
+   test('synaptics-rmi-self-test', e)
+ endif
++endif

diff --git a/sys-apps/fwupd/fwupd-1.7.0.ebuild b/sys-apps/fwupd/fwupd-1.7.0.ebuild
index 4cf8e1b87b6..aa0388af005 100644
--- a/sys-apps/fwupd/fwupd-1.7.0.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.0.ebuild
@@ -91,6 +91,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
 	"${FILESDIR}"/${P}-elanfp-requires-gusb.patch
+	"${FILESDIR}"/${P}-fix-test-configure.patch # bug 791760
 )
 
 pkg_setup() {