diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
commit | d162ba1860a88062f4cd61f8b52fc303ba0b2991 (patch) | |
tree | 24cd2cf57f3932a24b96e4a0f6666489447e43ba /sys-apps/fwupd/files | |
parent | 590b9b7b03bf4651e099949e318755af7cfa81b8 (diff) |
gentoo resync : 07.08.2021
Diffstat (limited to 'sys-apps/fwupd/files')
-rw-r--r-- | sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch | 27 | ||||
-rw-r--r-- | sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch | 24 |
2 files changed, 51 insertions, 0 deletions
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 new file mode 100644 index 000000000000..99434fe226f8 --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch @@ -0,0 +1,27 @@ +From 196cc6d9b445ee4246c7ff18d98d616aef286550 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann <whissi@gentoo.org> +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 new file mode 100644 index 000000000000..162cc194a2ad --- /dev/null +++ b/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch @@ -0,0 +1,24 @@ +From 4f5961a389698844117e70601ccf4c9e3ae1cb86 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann <whissi@gentoo.org> +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 |