automatic version update by autodist [release 6.2.1-1mamba;Wed Oct 16 2024]
This commit is contained in:
parent
2119a80fdd
commit
367eca1008
62
discover-6.2.0-fwupd-2.0.1.patch
Normal file
62
discover-6.2.0-fwupd-2.0.1.patch
Normal file
@ -0,0 +1,62 @@
|
||||
From 554e9b6b2f7317ca431691e887dc6ffda5b7deb5 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Hughes <richard@hughsie.com>
|
||||
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 7c18a7d56..daf2bf5ae 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 a75f6ab89..c3230303a 100644
|
||||
--- a/libdiscover/backends/FwupdBackend/FwupdResource.h
|
||||
+++ b/libdiscover/backends/FwupdBackend/FwupdResource.h
|
||||
@@ -102,11 +102,6 @@ class FwupdResource : public AbstractResource
|
||||
return m_isDeviceLocked;
|
||||
}
|
||||
|
||||
- bool isOnlyOffline() const
|
||||
- {
|
||||
- return m_isOnlyOffline;
|
||||
- }
|
||||
-
|
||||
bool isLiveUpdatable() const
|
||||
{
|
||||
return m_isLiveUpdatable;
|
||||
@@ -146,7 +141,6 @@ class FwupdResource : public AbstractResource
|
||||
|
||||
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);
|
@ -1,7 +1,7 @@
|
||||
%define plasmaver %(echo %version | cut -d. -f1-3)
|
||||
|
||||
Name: discover
|
||||
Version: 6.2.0
|
||||
Version: 6.2.1
|
||||
Release: 1mamba
|
||||
Summary: KDE Plasma application installer
|
||||
Group: Graphical Desktop/Applications/Administration
|
||||
@ -12,9 +12,19 @@ URL: https://kde.org/it/plasma-desktop/
|
||||
Source: https://download.kde.org/%{stable_kf6}/plasma/%{plasmaver}/discover-%{version}.tar.xz
|
||||
Patch0: discover-6.0.3-pk-refresh-timer-12h.patch
|
||||
Patch1: discover-6.0.3-pk-force-refresh-cache.patch
|
||||
Patch2: discover-6.2.0-fwupd-2.0.1.patch
|
||||
License: GPL
|
||||
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: libQt6Concurrent
|
||||
BuildRequires: libQt6Core
|
||||
BuildRequires: libQt6DBus
|
||||
BuildRequires: libQt6Gui
|
||||
BuildRequires: libQt6Network
|
||||
BuildRequires: libQt6OpenGL
|
||||
BuildRequires: libQt6Widgets
|
||||
BuildRequires: libQt6Xml
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libappstream-qt-devel
|
||||
BuildRequires: libflatpak-devel
|
||||
@ -26,12 +36,14 @@ BuildRequires: libglib-devel
|
||||
BuildRequires: libglvnd-devel
|
||||
BuildRequires: libkf6-attica-devel
|
||||
BuildRequires: libkf6-karchive-devel
|
||||
BuildRequires: libkf6-kauth-devel
|
||||
BuildRequires: libkf6-kcmutils-devel
|
||||
BuildRequires: libkf6-kconfig-devel
|
||||
BuildRequires: libkf6-kcoreaddons-devel
|
||||
BuildRequires: libkf6-kcrash-devel
|
||||
BuildRequires: libkf6-kdbusaddons-devel
|
||||
BuildRequires: libkf6-ki18n-devel
|
||||
BuildRequires: libkf6-kiconthemes-devel
|
||||
BuildRequires: libkf6-kidletime-devel
|
||||
BuildRequires: libkf6-kio-devel
|
||||
BuildRequires: libkf6-kjobwidgets-devel
|
||||
@ -44,14 +56,18 @@ BuildRequires: libkf6-kwindowsystem-devel
|
||||
BuildRequires: libmarkdown-devel
|
||||
BuildRequires: libostree-devel
|
||||
BuildRequires: libpackagekitqt6-devel
|
||||
BuildRequires: libqcoro-qt6-devel
|
||||
BuildRequires: libsnapd-qt-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
BuildRequires: qt6-qtbase-devel
|
||||
BuildRequires: qt6-qtdeclarative-devel
|
||||
BuildRequires: qt6-qtwebview-devel
|
||||
## AUTOBUILDREQ-END
|
||||
BuildRequires: cmake
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: kf6-rpm-macros
|
||||
%ifnarch arm aarch64
|
||||
BuildRequires: libfwupd-devel >= 2.0.1
|
||||
%endif
|
||||
BuildRequires: libkf6-purpose-devel
|
||||
BuildRequires: librpm-ostree-devel
|
||||
BuildRequires: libsnapd-qt-devel
|
||||
@ -87,8 +103,8 @@ Notifier for the KDE Frameworks application installer.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
#%patch 0 -p1 -b .pk-refresh-timer-12h
|
||||
%patch 1 -p1
|
||||
%patch 2 -p1 -b .fwupd-2.0.1
|
||||
|
||||
%build
|
||||
%cmake_kf6
|
||||
@ -151,6 +167,12 @@ Notifier for the KDE Frameworks application installer.
|
||||
%{_datadir}/knotifications6/discoverabstractnotifier.notifyrc
|
||||
|
||||
%changelog
|
||||
* Wed Oct 16 2024 Automatic Build System <autodist@openmamba.org> 6.2.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Wed Oct 16 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 6.2.0-2mamba
|
||||
- rebuilt with libfwupd 2.0.1
|
||||
|
||||
* Tue Oct 08 2024 Automatic Build System <autodist@openmamba.org> 6.2.0-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user