PackageKit backend: patch to force refreshCache [release 6.0.3-4mamba;Fri Apr 12 2024]

discover-5.93.0-KNSCore-build-fix.patch

@@ -1,128 +0,0 @@
-diff -Nru discover-5.93.0/.clang-format discover-5.93.0.patched/.clang-format
---- discover-5.93.0/.clang-format	1970-01-01 01:00:00.000000000 +0100
-+++ discover-5.93.0.patched/.clang-format	2024-02-03 16:39:00.425891505 +0100
-@@ -0,0 +1,88 @@
-+---
-+# SPDX-FileCopyrightText: 2019 Christoph Cullmann <cullmann@kde.org>
-+# SPDX-FileCopyrightText: 2019 Gernot Gebhard <gebhard@absint.com>
-+#
-+# SPDX-License-Identifier: MIT
-+
-+# This file got automatically created by ECM, do not edit
-+# See https://clang.llvm.org/docs/ClangFormatStyleOptions.html for the config options
-+# and https://community.kde.org/Policies/Frameworks_Coding_Style#Clang-format_automatic_code_formatting
-+# for clang-format tips & tricks
-+---
-+Language: JavaScript
-+DisableFormat: true
-+---
-+
-+# Style for C++
-+Language: Cpp
-+
-+# base is WebKit coding style: https://webkit.org/code-style-guidelines/
-+# below are only things set that diverge from this style!
-+BasedOnStyle: WebKit
-+
-+# enforce C++11 (e.g. for std::vector<std::vector<lala>>
-+Standard: Cpp11
-+
-+# 4 spaces indent
-+TabWidth: 4
-+
-+# 2 * 80 wide lines
-+ColumnLimit: 160
-+
-+# sort includes inside line separated groups
-+SortIncludes: true
-+
-+# break before braces on function, namespace and class definitions.
-+BreakBeforeBraces: Linux
-+
-+# CrlInstruction *a;
-+PointerAlignment: Right
-+
-+# horizontally aligns arguments after an open bracket.
-+AlignAfterOpenBracket: Align
-+
-+# don't move all parameters to new line
-+AllowAllParametersOfDeclarationOnNextLine: false
-+
-+# no single line functions
-+AllowShortFunctionsOnASingleLine: None
-+
-+# always break before you encounter multi line strings
-+AlwaysBreakBeforeMultilineStrings: true
-+
-+# don't move arguments to own lines if they are not all on the same
-+BinPackArguments: false
-+
-+# don't move parameters to own lines if they are not all on the same
-+BinPackParameters: false
-+
-+# In case we have an if statement with multiple lines the operator should be at the beginning of the line
-+# but we do not want to break assignments
-+BreakBeforeBinaryOperators: NonAssignment
-+
-+# format C++11 braced lists like function calls
-+Cpp11BracedListStyle: true
-+
-+# do not put a space before C++11 braced lists
-+SpaceBeforeCpp11BracedList: false
-+
-+# remove empty lines
-+KeepEmptyLinesAtTheStartOfBlocks: false
-+
-+# no namespace indentation to keep indent level low
-+NamespaceIndentation: None
-+
-+# we use template< without space.
-+SpaceAfterTemplateKeyword: false
-+
-+# Always break after template declaration
-+AlwaysBreakTemplateDeclarations: true
-+
-+# macros for which the opening brace stays attached.
-+ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE , wl_resource_for_each, wl_resource_for_each_safe ]
-+
-+# keep lambda formatting multi-line if not empty
-+AllowShortLambdasOnASingleLine: Empty
-+
-+# We do not want clang-format to put all arguments on a new line
-+AllowAllArgumentsOnNextLine: false
-diff -Nru discover-5.93.0/libdiscover/backends/KNSBackend/KNSBackend.cpp discover-5.93.0.patched/libdiscover/backends/KNSBackend/KNSBackend.cpp
---- discover-5.93.0/libdiscover/backends/KNSBackend/KNSBackend.cpp	2024-01-31 12:20:25.000000000 +0100
-+++ discover-5.93.0.patched/libdiscover/backends/KNSBackend/KNSBackend.cpp	2024-02-03 17:15:20.729134687 +0100
-@@ -335,7 +335,7 @@
-     resourceForEntry(entry);
- }
- 
--void KNSBackend::slotErrorCode(const KNSCore::ErrorCode::ErrorCode &errorCode, const QString &message, const QVariant &metadata)
-+void KNSBackend::slotErrorCode(const KNSCore::ErrorCode &errorCode, const QString &message, const QVariant &metadata)
- {
-     QString error = message;
-     qWarning() << "KNS error in" << m_displayName << ":" << errorCode << message << metadata;
-diff -Nru discover-5.93.0/libdiscover/backends/KNSBackend/KNSBackend.h discover-5.93.0.patched/libdiscover/backends/KNSBackend/KNSBackend.h
---- discover-5.93.0/libdiscover/backends/KNSBackend/KNSBackend.h	2024-01-31 12:20:25.000000000 +0100
-+++ discover-5.93.0.patched/libdiscover/backends/KNSBackend/KNSBackend.h	2024-02-03 17:14:35.139045837 +0100
-@@ -78,7 +78,7 @@
- public Q_SLOTS:
-     void statusChanged(const KNSCore::Entry &entry);
-     void detailsLoaded(const KNSCore::Entry &entry);
--    void slotErrorCode(const KNSCore::ErrorCode::ErrorCode &errorCode, const QString &message, const QVariant &metadata);
-+    void slotErrorCode(const KNSCore::ErrorCode &errorCode, const QString &message, const QVariant &metadata);
-     void slotEntryEvent(const KNSCore::Entry &entry, KNSCore::Entry::EntryEvent event);
- 
- private:
-diff -Nru discover-5.93.0/libdiscover/backends/KNSBackend/KNSTransaction.cpp discover-5.93.0.patched/libdiscover/backends/KNSBackend/KNSTransaction.cpp
---- discover-5.93.0/libdiscover/backends/KNSBackend/KNSTransaction.cpp	2024-01-31 12:20:25.000000000 +0100
-+++ discover-5.93.0.patched/libdiscover/backends/KNSBackend/KNSTransaction.cpp	2024-02-03 17:16:15.188240885 +0100
-@@ -59,7 +59,7 @@
-                 setStatus(DoneStatus);
-             }
-         });
--        connect(knsTransaction, &KNSCore::Transaction::signalErrorCode, this, [this](KNSCore::ErrorCode::ErrorCode /*errorCode*/, const QString &message) {
-+        connect(knsTransaction, &KNSCore::Transaction::signalErrorCode, this, [this](KNSCore::ErrorCode /*errorCode*/, const QString &message) {
-             Q_EMIT passiveMessage(message);
-         });
-     });

discover-6.0.3-pk-force-refresh-cache.patch

@@ -0,0 +1,24 @@
+diff -Nru discover-6.0.3/libdiscover/backends/PackageKitBackend.orig/PackageKitBackend.cpp discover-6.0.3/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
+--- discover-6.0.3/libdiscover/backends/PackageKitBackend.orig/PackageKitBackend.cpp	2024-03-26 16:01:57.000000000 +0100
++++ discover-6.0.3/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp	2024-04-13 12:11:09.438548905 +0200
+@@ -559,7 +559,7 @@
+     if (!m_refresher) {
+         acquireFetching(true);
+         m_updater->clearDistroUpgrade();
+-        m_refresher = PackageKit::Daemon::refreshCache(false);
++        m_refresher = PackageKit::Daemon::refreshCache(true);
+         // Limit the cache-age so that we actually download new caches if necessary
+         m_refresher->setHints(globalHints() << QStringLiteral("cache-age=300" /* 5 minutes */));
+ 
+diff -Nru discover-6.0.3/libdiscover/backends/PackageKitBackend.orig/PackageKitNotifier.cpp discover-6.0.3/libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp
+--- discover-6.0.3/libdiscover/backends/PackageKitBackend.orig/PackageKitNotifier.cpp	2024-04-12 12:17:05.311399312 +0200
++++ discover-6.0.3/libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp	2024-04-13 12:10:52.479511634 +0200
+@@ -293,7 +293,7 @@
+     }
+ 
+     if (!m_refresher) {
+-        m_refresher = PackageKit::Daemon::refreshCache(false);
++        m_refresher = PackageKit::Daemon::refreshCache(true);
+         // Limit the cache-age so that we actually download new caches if necessary
+         m_refresher->setHints(QStringLiteral("cache-age=300" /* 5 minutes */));
+         connect(m_refresher.data(), &PackageKit::Transaction::finished, this, &PackageKitNotifier::recheckSystemUpdateNeeded);

discover.spec

@@ -2,7 +2,7 @@
 
 Name:          discover
 Version:       6.0.3
-Release:       3mamba
+Release:       4mamba
 Summary:       KDE Plasma application installer
 Group:         Graphical Desktop/Applications/Administration
 Vendor:        openmamba
@@ -10,8 +10,8 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://kde.org/it/plasma-desktop/
 Source:        https://download.kde.org/%{stable_kf6}/plasma/%{plasmaver}/discover-%{version}.tar.xz
-Patch0:        discover-5.93.0-KNSCore-build-fix.patch
+Patch0:        discover-6.0.3-pk-refresh-timer-12h.patch
-Patch1:        discover-6.0.3-pk-refresh-timer-12h.patch
+Patch1:        discover-6.0.3-pk-force-refresh-cache.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -86,7 +86,8 @@ Notifier for the KDE Frameworks application installer.
 
 %prep
 %setup -q
-%patch 1 -p1 -b .pk-refresh-timer-12h
+%patch 0 -p1 -b .pk-refresh-timer-12h
+%patch 1 -p1
 
 %build
 %cmake_kf6
@@ -149,6 +150,9 @@ Notifier for the KDE Frameworks application installer.
 %{_datadir}/knotifications6/discoverabstractnotifier.notifyrc
 
 %changelog
+* Fri Apr 12 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.3-4mamba
+- PackageKit backend: patch to force refreshCache
+
 * Sun Apr 07 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 6.0.3-3mamba
 - add a patch to set 12h instead of 24h for daily refresh