main/*: rebuild against libfwupd.so.3

main/discover/patches/fwupd-1.patch

@@ -0,0 +1,27 @@
+Patch-Source: https://invent.kde.org/plasma/discover/-/commit/8a84672d1d47450df098ca4e54eda5e06e65edbc
+--
+From 8a84672d1d47450df098ca4e54eda5e06e65edbc Mon Sep 17 00:00:00 2001
+From: Richard Hughes <[email protected]>
+Date: Wed, 29 May 2024 12:26:57 +0100
+Subject: [PATCH] FwupdBackend: Do not use useless API now removed in fwupd
+ 2.0.x
+
+---
+ libdiscover/backends/FwupdBackend/FwupdResource.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libdiscover/backends/FwupdBackend/FwupdResource.cpp b/libdiscover/backends/FwupdBackend/FwupdResource.cpp
+index 6df5d9c7b6..47cc122f29 100644
+--- a/libdiscover/backends/FwupdBackend/FwupdResource.cpp
++++ b/libdiscover/backends/FwupdBackend/FwupdResource.cpp
+@@ -188,7 +188,6 @@ void FwupdResource::setDeviceDetails(FwupdDevice *dev)
+     m_vendor = QString::fromUtf8(fwupd_device_get_vendor(dev));
+     m_releaseDate = QDateTime::fromSecsSinceEpoch(fwupd_device_get_created(dev)).date();
+     m_availableVersion = QString::fromUtf8(fwupd_device_get_version(dev));
+-    m_description = QString::fromUtf8((fwupd_device_get_description(dev)));
+
+     if (fwupd_device_get_icons(dev)->len >= 1)
+         m_iconName = QString::fromUtf8((const gchar *)g_ptr_array_index(fwupd_device_get_icons(dev), 0)); // Check whether given icon exists or not!
+-- 
+GitLab
+

main/discover/patches/fwupd-2.patch

@@ -0,0 +1,67 @@
+Patch-Source: https://invent.kde.org/plasma/discover/-/merge_requests/952/diffs
+--
+From 55acd450718863fcda468914283a21bbac6dbbe6 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <[email protected]>
+Date: Fri, 4 Oct 2024 15:45:46 +0100
+Subject: [PATCH] FwupdBackend: Do not use more API now removed in fwupd 2.0.0
+
+---
+ libdiscover/backends/FwupdBackend/FwupdResource.cpp    | 1 -
+ libdiscover/backends/FwupdBackend/FwupdResource.h      | 6 ------
+ libdiscover/backends/FwupdBackend/FwupdTransaction.cpp | 4 ----
+ 3 files changed, 11 deletions(-)
+
+diff --git a/libdiscover/backends/FwupdBackend/FwupdResource.cpp b/libdiscover/backends/FwupdBackend/FwupdResource.cpp
+index 7c18a7d568..daf2bf5aeb 100644
+--- a/libdiscover/backends/FwupdBackend/FwupdResource.cpp
++++ b/libdiscover/backends/FwupdBackend/FwupdResource.cpp
+@@ -173,7 +173,6 @@ void FwupdResource::setReleaseDetails(FwupdRelease *release)
+ void FwupdResource::setDeviceDetails(FwupdDevice *dev)
+ {
+     m_isLiveUpdatable = fwupd_device_has_flag(dev, FWUPD_DEVICE_FLAG_UPDATABLE);
+-    m_isOnlyOffline = fwupd_device_has_flag(dev, FWUPD_DEVICE_FLAG_ONLY_OFFLINE);
+     m_needsReboot = fwupd_device_has_flag(dev, FWUPD_DEVICE_FLAG_NEEDS_REBOOT);
+
+     if (fwupd_device_get_name(dev)) {
+diff --git a/libdiscover/backends/FwupdBackend/FwupdResource.h b/libdiscover/backends/FwupdBackend/FwupdResource.h
+index a75f6ab898..c3230303ad 100644
+--- a/libdiscover/backends/FwupdBackend/FwupdResource.h
++++ b/libdiscover/backends/FwupdBackend/FwupdResource.h
+@@ -102,11 +102,6 @@ public:
+         return m_isDeviceLocked;
+     }
+
+-    bool isOnlyOffline() const
+-    {
+-        return m_isOnlyOffline;
+-    }
+-
+     bool isLiveUpdatable() const
+     {
+         return m_isLiveUpdatable;
+@@ -146,7 +141,6 @@ private:
+
+     QString m_updateURI;
+     bool m_isDeviceLocked = false; // True if device is locked!
+-    bool m_isOnlyOffline = false; // True if only offline updates
+     bool m_isLiveUpdatable = false; // True if device is live updatable
+     bool m_needsReboot = false; // True if device needs Reboot
+     QString m_origin;
+diff --git a/libdiscover/backends/FwupdBackend/FwupdTransaction.cpp b/libdiscover/backends/FwupdBackend/FwupdTransaction.cpp
+index f20b9ab58c..44232f18de 100644
+--- a/libdiscover/backends/FwupdBackend/FwupdTransaction.cpp
++++ b/libdiscover/backends/FwupdBackend/FwupdTransaction.cpp
+@@ -83,10 +83,6 @@ void FwupdTransaction::fwupdInstall(const QString &file)
+     FwupdInstallFlags install_flags = FWUPD_INSTALL_FLAG_NONE;
+     g_autoptr(GError) error = nullptr;
+
+-    /* only offline supported */
+-    if (m_app->isOnlyOffline())
+-        install_flags = static_cast<FwupdInstallFlags>(install_flags | FWUPD_INSTALL_FLAG_OFFLINE);
+-
+     if (!fwupd_client_install(m_backend->client, m_app->deviceId().toUtf8().constData(), file.toUtf8().constData(), install_flags, nullptr, &error)) {
+         m_backend->handleError(error);
+         setStatus(DoneWithErrorStatus);
+-- 
+GitLab
+

main/discover/template.py

@@ -1,6 +1,6 @@
 pkgname = "discover"
 pkgver = "6.1.5"
-pkgrel = 0
+pkgrel = 1
 build_style = "cmake"
 # fails in chroot env, needs some testdata
 make_check_args = ["-E", "flatpaktest|CategoriesTest"]

main/gnome-software/patches/fwupd-2.patch

@@ -0,0 +1,47 @@
+Patch-Source: https://gitlab.gnome.org/GNOME/gnome-software/-/commit/bdfe5c691a1c3302cf61da0781b290c67f88ba6b
+--
+From bdfe5c691a1c3302cf61da0781b290c67f88ba6b Mon Sep 17 00:00:00 2001
+From: Richard Hughes <[email protected]>
+Date: Tue, 1 Oct 2024 12:24:09 +0100
+Subject: [PATCH] fwupd: Do not use API removed from fwupd 2.0.x
+
+All the systemd-offline logic was unused, and so removed.
+---
+ plugins/fwupd/gs-fwupd-app.c    | 5 -----
+ plugins/fwupd/gs-plugin-fwupd.c | 4 ----
+ 2 files changed, 9 deletions(-)
+
+diff --git a/plugins/fwupd/gs-fwupd-app.c b/plugins/fwupd/gs-fwupd-app.c
+index bad97420ab..e4376b2656 100644
+--- a/plugins/fwupd/gs-fwupd-app.c
++++ b/plugins/fwupd/gs-fwupd-app.c
+@@ -117,11 +117,6 @@ gs_fwupd_app_set_from_device (GsApp *app,
+ 	    )
+ 		gs_app_set_state (app, GS_APP_STATE_UPDATABLE_LIVE);
+
+-	/* only can be applied in systemd-offline */
+-	if (fwupd_device_has_flag (dev, FWUPD_DEVICE_FLAG_ONLY_OFFLINE))
+-		gs_app_set_metadata (app, "fwupd::OnlyOffline", "");
+-
+-
+ 	/* reboot required to apply update */
+ 	if (fwupd_device_has_flag (dev, FWUPD_DEVICE_FLAG_NEEDS_REBOOT))
+ 		gs_app_add_quirk (app, GS_APP_QUIRK_NEEDS_REBOOT);
+diff --git a/plugins/fwupd/gs-plugin-fwupd.c b/plugins/fwupd/gs-plugin-fwupd.c
+index fd60490554..8e3d8ab2c8 100644
+--- a/plugins/fwupd/gs-plugin-fwupd.c
++++ b/plugins/fwupd/gs-plugin-fwupd.c
+@@ -1430,10 +1430,6 @@ gs_plugin_fwupd_install_async (GsPluginFwupd                      *self,
+ 	 * https://github.com/fwupd/fwupd/issues/5522. */
+ 	g_set_object (&self->app_current, app);
+
+-	/* only offline supported */
+-	if (gs_app_get_metadata_item (app, "fwupd::OnlyOffline") != NULL)
+-		install_flags |= FWUPD_INSTALL_FLAG_OFFLINE;
+-
+ 	gs_app_set_state (app, GS_APP_STATE_INSTALLING);
+
+ 	fwupd_client_install_async (self->client, data->device_id,
+-- 
+GitLab
+

main/gnome-software/template.py

@@ -1,6 +1,6 @@
 pkgname = "gnome-software"
 pkgver = "47.0"
-pkgrel = 0
+pkgrel = 1
 build_style = "meson"
 configure_args = [
     "-Dtests=false",