From e9d044d4b9b71200a96adfa280848858c0f468c9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Nov 2021 13:10:00 +0000 Subject: gentoo resync : 13.11.2021 --- ...-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch | 27 ---------------------- .../fwupd-1.6.2-dell-dock-requires-gusb.patch | 24 ------------------- .../files/fwupd-1.7.0-elanfp-requires-gusb.patch | 22 ------------------ .../files/fwupd-1.7.0-fix-test-configure.patch | 20 ---------------- 4 files changed, 93 deletions(-) delete mode 100644 sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch delete mode 100644 sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch delete mode 100644 sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch delete mode 100644 sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch (limited to 'sys-apps/fwupd/files') diff --git a/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch b/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch deleted file mode 100644 index 99434fe226f8..000000000000 --- a/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 196cc6d9b445ee4246c7ff18d98d616aef286550 Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann -Date: Wed, 4 Aug 2021 15:38:59 +0200 -Subject: [PATCH] plugin modem-manager: XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY is - only available in >=libxmlb-0.2.2 - -Closes: https://github.com/fwupd/fwupd/issues/3600 ---- - plugins/modem-manager/fu-firehose-updater.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/plugins/modem-manager/fu-firehose-updater.c b/plugins/modem-manager/fu-firehose-updater.c -index 00fcdf607..076aa79cc 100644 ---- a/plugins/modem-manager/fu-firehose-updater.c -+++ b/plugins/modem-manager/fu-firehose-updater.c -@@ -630,7 +630,11 @@ fu_firehose_updater_run_action (FuFirehoseUpdater *self, XbNode *node, guint max - - action = xb_node_get_element (node); - -+#if LIBXMLB_CHECK_VERSION(0,2,2) - cmd_str = xb_node_export (node, XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY, error); -+#else -+ cmd_str = xb_node_export (node, XB_NODE_EXPORT_FLAG_NONE, error); -+#endif - if (cmd_str == NULL) - return FALSE; - cmd_bytearray = g_byte_array_new_take ((guint8 *)cmd_str, strlen (cmd_str)); diff --git a/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch deleted file mode 100644 index 162cc194a2ad..000000000000 --- a/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4f5961a389698844117e70601ccf4c9e3ae1cb86 Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann -Date: Wed, 4 Aug 2021 15:11:26 +0200 -Subject: [PATCH] dell-dock plugin requires gusb - -Closes: https://github.com/fwupd/fwupd/issues/3598 ---- - plugins/dell-dock/meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/plugins/dell-dock/meson.build b/plugins/dell-dock/meson.build -index 829771de1..ae8f67f33 100644 ---- a/plugins/dell-dock/meson.build -+++ b/plugins/dell-dock/meson.build -@@ -1,3 +1,4 @@ -+if get_option('gusb') - cargs = ['-DG_LOG_DOMAIN="FuPluginDellDock"'] - - install_data(['dell-dock.quirk'], -@@ -34,3 +35,4 @@ shared_module('fu_plugin_dell_dock', - gudev, - ], - ) -+endif diff --git a/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch deleted file mode 100644 index fec6aab4a3ce..000000000000 --- a/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit fa403db414301c247aef1bc895795a04b06d9298 -Author: Thomas Deutschmann -AuthorDate: Fri Oct 15 15:45:55 2021 +0200 -Commit: Thomas Deutschmann -CommitDate: Fri Oct 15 15:45:55 2021 +0200 - - elanfp plugin requires gusb - -diff --git a/plugins/elanfp/meson.build b/plugins/elanfp/meson.build -index e8bb8255..2b5d7fde 100644 ---- a/plugins/elanfp/meson.build -+++ b/plugins/elanfp/meson.build -@@ -1,3 +1,4 @@ -+if get_option('gusb') - cargs = ['-DG_LOG_DOMAIN="FuPluginElanfp"'] - - install_data(['elanfp.quirk'], -@@ -27,3 +28,4 @@ shared_module('fu_plugin_elanfp', - plugin_deps, - ], - ) -+endif 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 deleted file mode 100644 index 4974a82bdf52..000000000000 --- a/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch +++ /dev/null @@ -1,20 +0,0 @@ -# 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 -- cgit v1.2.3