fwupd: Update to v2.0.1

packages/d/discover/abi_used_libs

@@ -31,7 +31,7 @@ libQt6WebView.so.6
 libQt6Widgets.so.6
 libc.so.6
 libflatpak.so.0
-libfwupd.so.2
+libfwupd.so.3
 libgcc_s.so.1
 libgio-2.0.so.0
 libglib-2.0.so.0

packages/d/discover/abi_used_symbols

@@ -1443,55 +1443,54 @@ libflatpak.so.0:flatpak_transaction_progress_get_progress
 libflatpak.so.0:flatpak_transaction_progress_get_start_time
 libflatpak.so.0:flatpak_transaction_progress_set_update_frequency
 libflatpak.so.0:flatpak_transaction_run
-libfwupd.so.2:fwupd_checksum_get_by_kind
-libfwupd.so.2:fwupd_client_connect
-libfwupd.so.2:fwupd_client_get_details
-libfwupd.so.2:fwupd_client_get_devices
-libfwupd.so.2:fwupd_client_get_devices_async
-libfwupd.so.2:fwupd_client_get_devices_finish
-libfwupd.so.2:fwupd_client_get_percentage
-libfwupd.so.2:fwupd_client_get_releases
-libfwupd.so.2:fwupd_client_get_remote_by_id
-libfwupd.so.2:fwupd_client_get_remotes
-libfwupd.so.2:fwupd_client_get_remotes_async
-libfwupd.so.2:fwupd_client_get_remotes_finish
-libfwupd.so.2:fwupd_client_get_upgrades
-libfwupd.so.2:fwupd_client_get_user_agent
-libfwupd.so.2:fwupd_client_install
-libfwupd.so.2:fwupd_client_modify_remote
-libfwupd.so.2:fwupd_client_new
-libfwupd.so.2:fwupd_client_refresh_remote2_async
-libfwupd.so.2:fwupd_client_refresh_remote_finish
-libfwupd.so.2:fwupd_client_set_user_agent_for_package
-libfwupd.so.2:fwupd_client_unlock
-libfwupd.so.2:fwupd_device_add_release
-libfwupd.so.2:fwupd_device_get_created
-libfwupd.so.2:fwupd_device_get_description
-libfwupd.so.2:fwupd_device_get_icons
-libfwupd.so.2:fwupd_device_get_id
-libfwupd.so.2:fwupd_device_get_name
-libfwupd.so.2:fwupd_device_get_release_default
-libfwupd.so.2:fwupd_device_get_summary
-libfwupd.so.2:fwupd_device_get_vendor
-libfwupd.so.2:fwupd_device_get_version
-libfwupd.so.2:fwupd_device_has_flag
-libfwupd.so.2:fwupd_error_quark
-libfwupd.so.2:fwupd_release_get_appstream_id
-libfwupd.so.2:fwupd_release_get_checksums
-libfwupd.so.2:fwupd_release_get_description
-libfwupd.so.2:fwupd_release_get_homepage
-libfwupd.so.2:fwupd_release_get_license
-libfwupd.so.2:fwupd_release_get_locations
-libfwupd.so.2:fwupd_release_get_remote_id
-libfwupd.so.2:fwupd_release_get_size
-libfwupd.so.2:fwupd_release_get_summary
-libfwupd.so.2:fwupd_release_get_vendor
-libfwupd.so.2:fwupd_release_get_version
-libfwupd.so.2:fwupd_remote_get_agreement
-libfwupd.so.2:fwupd_remote_get_id
-libfwupd.so.2:fwupd_remote_get_kind
-libfwupd.so.2:fwupd_remote_get_title
-libfwupd.so.2:fwupd_remote_has_flag
+libfwupd.so.3:fwupd_checksum_get_by_kind
+libfwupd.so.3:fwupd_client_connect
+libfwupd.so.3:fwupd_client_get_details
+libfwupd.so.3:fwupd_client_get_devices
+libfwupd.so.3:fwupd_client_get_devices_async
+libfwupd.so.3:fwupd_client_get_devices_finish
+libfwupd.so.3:fwupd_client_get_percentage
+libfwupd.so.3:fwupd_client_get_releases
+libfwupd.so.3:fwupd_client_get_remote_by_id
+libfwupd.so.3:fwupd_client_get_remotes
+libfwupd.so.3:fwupd_client_get_remotes_async
+libfwupd.so.3:fwupd_client_get_remotes_finish
+libfwupd.so.3:fwupd_client_get_upgrades
+libfwupd.so.3:fwupd_client_get_user_agent
+libfwupd.so.3:fwupd_client_install
+libfwupd.so.3:fwupd_client_modify_remote
+libfwupd.so.3:fwupd_client_new
+libfwupd.so.3:fwupd_client_refresh_remote_async
+libfwupd.so.3:fwupd_client_refresh_remote_finish
+libfwupd.so.3:fwupd_client_set_user_agent_for_package
+libfwupd.so.3:fwupd_client_unlock
+libfwupd.so.3:fwupd_device_add_release
+libfwupd.so.3:fwupd_device_get_created
+libfwupd.so.3:fwupd_device_get_icons
+libfwupd.so.3:fwupd_device_get_id
+libfwupd.so.3:fwupd_device_get_name
+libfwupd.so.3:fwupd_device_get_release_default
+libfwupd.so.3:fwupd_device_get_summary
+libfwupd.so.3:fwupd_device_get_vendor
+libfwupd.so.3:fwupd_device_get_version
+libfwupd.so.3:fwupd_device_has_flag
+libfwupd.so.3:fwupd_error_quark
+libfwupd.so.3:fwupd_release_get_appstream_id
+libfwupd.so.3:fwupd_release_get_checksums
+libfwupd.so.3:fwupd_release_get_description
+libfwupd.so.3:fwupd_release_get_homepage
+libfwupd.so.3:fwupd_release_get_license
+libfwupd.so.3:fwupd_release_get_locations
+libfwupd.so.3:fwupd_release_get_remote_id
+libfwupd.so.3:fwupd_release_get_size
+libfwupd.so.3:fwupd_release_get_summary
+libfwupd.so.3:fwupd_release_get_vendor
+libfwupd.so.3:fwupd_release_get_version
+libfwupd.so.3:fwupd_remote_get_agreement
+libfwupd.so.3:fwupd_remote_get_id
+libfwupd.so.3:fwupd_remote_get_kind
+libfwupd.so.3:fwupd_remote_get_title
+libfwupd.so.3:fwupd_remote_has_flag
 libgcc_s.so.1:_Unwind_Resume
 libgio-2.0.so.0:g_cancellable_cancel
 libgio-2.0.so.0:g_cancellable_is_cancelled

packages/d/discover/files/0001-PackageKitBackend-Add-the-Drivers-menu-filtered-by-t.patch → packages/d/discover/files/0001-Allow-to-install-hardware-drivers.patch

@@ -1,7 +1,7 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From dc8c3d1626dad3406ef6acba144820112fdb76fe Mon Sep 17 00:00:00 2001
 From: Fabio Forni <[email protected]>
 Date: Wed, 5 Jun 2024 15:39:19 -0500
-Subject: [PATCH] Allow to install hardware drivers
+Subject: [PATCH 1/3] Allow to install hardware drivers
 
 ---
  libdiscover/Category/Category.cpp             | 10 ++++--
@@ -13,10 +13,10 @@ Subject: [PATCH] Allow to install hardware drivers
  6 files changed, 80 insertions(+), 14 deletions(-)
 
 diff --git a/libdiscover/Category/Category.cpp b/libdiscover/Category/Category.cpp
-index c40844a78..3422cbeda 100644
+index 034b33a4b..a171c7099 100644
 --- a/libdiscover/Category/Category.cpp
 +++ b/libdiscover/Category/Category.cpp
-@@ -33,7 +33,8 @@ Category::Category(const QString &name,
+@@ -62,7 +62,8 @@ Category::Category(const QString &name,
                     const CategoryFilter &filter,
                     const QSet<QString> &pluginName,
                     const QVector<Category *> &subCategories,
@@ -26,7 +26,7 @@ index c40844a78..3422cbeda 100644
      : QObject(nullptr)
      , m_name(name)
      , m_iconString(iconName)
-@@ -41,7 +42,8 @@ Category::Category(const QString &name,
+@@ -70,7 +71,8 @@ Category::Category(const QString &name,
      , m_subCategories(subCategories)
      , m_plugins(pluginName)
      , m_isAddons(isAddons)
@@ -36,7 +36,7 @@ index c40844a78..3422cbeda 100644
  {
      setObjectName(m_name);
 
-@@ -82,6 +84,10 @@ void Category::parseData(const QString &path, QXmlStreamReader *xml)
+@@ -109,6 +111,10 @@ void Category::parseData(const QString &path, QXmlStreamReader *xml, Localizatio
              m_isAddons = true;
              m_priority = 5;
              xml->readNext();
@@ -48,10 +48,10 @@ index c40844a78..3422cbeda 100644
              m_iconString = xml->readElementText();
          } else if (xml->name() == QLatin1String("Include") || xml->name() == QLatin1String("Categories")) {
 diff --git a/libdiscover/Category/Category.h b/libdiscover/Category/Category.h
-index 9b12d7a28..0598c2094 100644
+index caa8b4cf3..16d036fc6 100644
 --- a/libdiscover/Category/Category.h
 +++ b/libdiscover/Category/Category.h
-@@ -60,7 +60,8 @@ public:
+@@ -68,7 +68,8 @@ public:
               const CategoryFilter &filters,
               const QSet<QString> &pluginName,
               const QVector<Category *> &subCategories,
@@ -61,7 +61,7 @@ index 9b12d7a28..0598c2094 100644
      ~Category() override;
 
      QString name() const;
-@@ -87,6 +88,10 @@ public:
+@@ -95,6 +96,10 @@ public:
      {
          return m_isAddons;
      }
@@ -72,7 +72,7 @@ index 9b12d7a28..0598c2094 100644
      qint8 priority() const
      {
          return m_priority;
-@@ -119,6 +124,7 @@ private:
+@@ -129,6 +134,7 @@ private:
      CategoryFilter parseIncludes(QXmlStreamReader *xml);
      QSet<QString> m_plugins;
      bool m_isAddons = false;
@@ -81,7 +81,7 @@ index 9b12d7a28..0598c2094 100644
      QTimer *m_subCategoriesChanged;
  };
 diff --git a/libdiscover/appstream/AppStreamUtils.cpp b/libdiscover/appstream/AppStreamUtils.cpp
-index 82193691f..052b28849 100644
+index 865c7d205..76e479cbb 100644
 --- a/libdiscover/appstream/AppStreamUtils.cpp
 +++ b/libdiscover/appstream/AppStreamUtils.cpp
 @@ -7,6 +7,7 @@
@@ -92,7 +92,7 @@ index 82193691f..052b28849 100644
  #include <AppStreamQt/pool.h>
  #include <AppStreamQt/release.h>
  #include <AppStreamQt/screenshot.h>
-@@ -260,8 +261,12 @@ static void kRemoveDuplicates(AppStream::ComponentBox &input, AppStream::Bundle:
+@@ -266,8 +267,12 @@ static void kRemoveDuplicates(AppStream::ComponentBox &input, AppStream::Bundle:
  AppStream::ComponentBox AppStreamUtils::componentsByCategories(AppStream::Pool *pool, Category *cat, AppStream::Bundle::Kind kind)
  {
      AppStream::ComponentBox ret(AppStream::ComponentBox::FlagNoChecks);
@@ -247,3 +247,6 @@ index ff1a922f2..385d83c4e 100644
    <Menu>
      <Name>Plasma Addons</Name>
      <Icon>plasma</Icon>
+-- 
+2.47.0
+

packages/d/discover/files/0002-FwupdBackend-Do-not-use-useless-API-now-removed-in-f.patch

@@ -0,0 +1,25 @@
+From f39e088aeb3944bdb6c679c7cb61afd9e420eafa Mon Sep 17 00:00:00 2001
+From: Richard Hughes <[email protected]>
+Date: Wed, 29 May 2024 12:26:57 +0100
+Subject: [PATCH 2/3] 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 6df5d9c7b..47cc122f2 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!
+-- 
+2.47.0
+

packages/d/discover/files/0003-FwupdBackend-Do-not-use-more-API-now-removed-in-fwup.patch

@@ -0,0 +1,66 @@
+From bd6a3fa4f7a18a4020fcb69f90e8faf461503ffb Mon Sep 17 00:00:00 2001
+From: Richard Hughes <[email protected]>
+Date: Fri, 4 Oct 2024 15:45:46 +0100
+Subject: [PATCH 3/3] 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 47cc122f2..bb67c1a46 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 db25328ac..98dde6212 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 f20b9ab58..44232f18d 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);
+-- 
+2.47.0
+

packages/d/discover/package.yml

@@ -1,6 +1,6 @@
 name       : discover
 version    : 6.1.5
-release    : 18
+release    : 19
 source     :
     - https://download.kde.org/stable/plasma/6.1.5/discover-6.1.5.tar.xz : 6e2cf59fac2cb792420ed6df653f80307d6e33d6e6ae9c1af2827a93bae3cb8d
 homepage   : https://apps.kde.org/discover/
@@ -41,7 +41,10 @@ clang      : yes
 optimize   : thin-lto
 setup      : |
     # https://github.com/getsolus/discover/commit/61ddf4e7b0ef774bf79b69dd4ea964cb1ddc2554
-    %patch -p1 -i $pkgfiles/0001-PackageKitBackend-Add-the-Drivers-menu-filtered-by-t.patch
+    %patch -p1 -i $pkgfiles/0001-Allow-to-install-hardware-drivers.patch
+    # Fwupd 2.0 compatibility
+    %patch -p1 -i $pkgfiles/0002-FwupdBackend-Do-not-use-useless-API-now-removed-in-f.patch
+    %patch -p1 -i $pkgfiles/0003-FwupdBackend-Do-not-use-more-API-now-removed-in-fwup.patch
 
     %cmake_kf6 DPACKAGEKIT_AUTOREMOVE=ON
 build      : |

packages/d/discover/pspec_x86_64.xml

@@ -3,8 +3,8 @@
         <Name>discover</Name>
         <Homepage>https://apps.kde.org/discover/</Homepage>
         <Packager>
-            <Name>Reilly Brogan</Name>
-            <Email>[email protected]</Email>
+            <Name>Silke Hofstra</Name>
+            <Email>[email protected]</Email>
         </Packager>
         <License>GPL-2.0-or-later</License>
         <PartOf>desktop.kde</PartOf>
@@ -289,12 +289,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="18">
-            <Date>2024-09-10</Date>
+        <Update release="19">
+            <Date>2024-10-23</Date>
             <Version>6.1.5</Version>
             <Comment>Packaging update</Comment>
-            <Name>Reilly Brogan</Name>
-            <Email>[email protected]</Email>
+            <Name>Silke Hofstra</Name>
+            <Email>[email protected]</Email>
         </Update>
     </History>
 </PISI>

packages/f/fwupd/abi_libs

@@ -10,11 +10,11 @@ dbxtool
 elantp-self-test
 fu-dfu-self-test
 fwupd
-fwupdoffline
+fwupdplugin-self-test
 fwupdtool
 libfu_plugin_flashrom.so
 libfu_plugin_modem_manager.so
-libfwupd.so.2
+libfwupd.so.3
 libfwupdengine.so
 libfwupdplugin.so
 libfwupdutil.so