summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Beddek <telans@posteo.de>2021-10-30 20:02:29 +1300
committerSam James <sam@gentoo.org>2021-10-31 02:45:34 +0000
commit7ad43fe5d48d4deb2c3a2a3e9dfb6af7c62dc2af (patch)
tree8062f15b5a2c6c531860e789c6a29b2ae16bdc56 /sys-apps
parentkde-apps/umbrello: fix configure with tests (diff)
downloadgentoo-7ad43fe5d48d4deb2c3a2a3e9dfb6af7c62dc2af.tar.gz
gentoo-7ad43fe5d48d4deb2c3a2a3e9dfb6af7c62dc2af.tar.bz2
gentoo-7ad43fe5d48d4deb2c3a2a3e9dfb6af7c62dc2af.zip
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@posteo.de> Closes: https://github.com/gentoo/gentoo/pull/22756 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch20
-rw-r--r--sys-apps/fwupd/fwupd-1.7.0.ebuild1
2 files changed, 21 insertions, 0 deletions
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 000000000000..4974a82bdf52
--- /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 4cf8e1b87b63..aa0388af0054 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() {