commit fc27eb3f745a833a3ec41b877d07479e11d45ec9
Author: Jan Palus <[email protected]>
Date: Wed Sep 9 22:43:37 2020 +0200
up to 1.4.6
fwupd-qmi.patch | 44 --------------------------------------------
fwupd.spec | 7 ++-----
2 files changed, 2 insertions(+), 49 deletions(-)
---
diff --git a/fwupd.spec b/fwupd.spec
index 938093b..8e93f2f 100644
--- a/fwupd.spec
+++ b/fwupd.spec
@@ -12,15 +12,14 @@
Summary: System daemon for installing device firmware
Summary(pl.UTF-8): Demon systemowy do instalowania firmware'u urządzeń
Name: fwupd
-Version: 1.4.4
+Version: 1.4.6
Release: 1
License: LGPL v2.1+
Group: Applications/System
Source0:
https://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
-# Source0-md5: b506e291f5baedc49ce4ace6569fc952
+# Source0-md5: 2e5ae3c97c955cc0cb7d1c53323279e5
Patch0: %{name}-bashcomp.patch
Patch1: %{name}-flashrom.patch
-Patch2: %{name}-qmi.patch
URL: https://github.com/hughsie/fwupd
%{?with_modemmanager:BuildRequires: ModemManager-devel >= 1.10.0}
%{?with_cairo:BuildRequires: cairo-devel}
@@ -187,7 +186,6 @@ API języka Vala do biblioteki fwupd.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%ifarch x32
# -m64 is needed to build x64 EFI
@@ -289,7 +287,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_thelio_io.so
%if %{with thunderbolt}
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_thunderbolt.so
-%attr(755,root,root)
%{_libdir}/fwupd-plugins-3/libfu_plugin_thunderbolt_power.so
%endif
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_tpm.so
%attr(755,root,root) %{_libdir}/fwupd-plugins-3/libfu_plugin_tpm_eventlog.so
diff --git a/fwupd-qmi.patch b/fwupd-qmi.patch
deleted file mode 100644
index fe79c73..0000000
--- a/fwupd-qmi.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- fwupd-1.4.4/plugins/modem-manager/fu-qmi-pdc-updater.c.orig
2020-06-10 16:43:14.270352000 +0200
-+++ fwupd-1.4.4/plugins/modem-manager/fu-qmi-pdc-updater.c 2020-07-07
06:24:20.714166201 +0200
-@@ -226,11 +226,13 @@
- guint token;
- } WriteContext;
-
-+#if (QMI_MAJOR_VERSION < 1) || ((QMI_MAJOR_VERSION == 1) &&
(QMI_MINOR_VERSION < 26))
- #pragma clang diagnostic push
- #pragma clang diagnostic ignored "-Wunused-function"
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(QmiMessagePdcLoadConfigInput,
qmi_message_pdc_load_config_input_unref)
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(QmiMessagePdcLoadConfigOutput,
qmi_message_pdc_load_config_output_unref)
- #pragma clang diagnostic pop
-+#endif
-
- static void fu_qmi_pdc_updater_load_config (WriteContext *ctx);
-
-@@ -435,11 +437,13 @@
- guint token;
- } ActivateContext;
-
-+#if (QMI_MAJOR_VERSION < 1) || ((QMI_MAJOR_VERSION == 1) &&
(QMI_MINOR_VERSION < 26))
- #pragma clang diagnostic push
- #pragma clang diagnostic ignored "-Wunused-function"
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(QmiMessagePdcActivateConfigInput,
qmi_message_pdc_activate_config_input_unref)
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(QmiMessagePdcActivateConfigOutput,
qmi_message_pdc_activate_config_output_unref)
- #pragma clang diagnostic pop
-+#endif
-
- static gboolean
- fu_qmi_pdc_updater_activate_config_timeout (gpointer user_data)
-@@ -540,11 +544,13 @@
-
fu_qmi_pdc_updater_activate_config_ready, ctx);
- }
-
-+#if (QMI_MAJOR_VERSION < 1) || ((QMI_MAJOR_VERSION == 1) &&
(QMI_MINOR_VERSION < 26))
- #pragma clang diagnostic push
- #pragma clang diagnostic ignored "-Wunused-function"
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(QmiMessagePdcSetSelectedConfigInput,
qmi_message_pdc_set_selected_config_input_unref)
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(QmiMessagePdcSetSelectedConfigOutput,
qmi_message_pdc_set_selected_config_output_unref)
- #pragma clang diagnostic pop
-+#endif
-
- static gboolean
- fu_qmi_pdc_updater_set_selected_config_timeout (gpointer user_data)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fwupd.git/commitdiff/fc27eb3f745a833a3ec41b877d07479e11d45ec9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
