[neon/kde/plasma-workspace/Neon/release] debian/patches: sperate the patches

[Carlos De Maine]

Git commit b04cf9cbdb22cc5709b18e3bc8220256c446cf85 by Carlos De Maine.
Committed on 15/09/2023 at 14:26.
Pushed by carlosdem into branch 'Neon/release'.

sperate  the patches

M  +0    -23   debian/patches/0001_kf5_appstream_1
A  +20   -0    debian/patches/0002_kf5_appstream_2
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/kde/plasma-workspace/-/commit/b04cf9cbdb22cc5709b18e3bc8220256c446cf85

diff --git a/debian/patches/0001_kf5_appstream_1 b/debian/patches/0001_kf5_appstream_1
index 6dc2fa9..44fe79e 100644
--- a/debian/patches/0001_kf5_appstream_1
+++ b/debian/patches/0001_kf5_appstream_1
@@ -131,26 +131,3 @@ index 18197ab08b05c4b202b946c4450bf83de44e9c51..b585f55c36f680d5b83202892a35effd
  #include <KRunner/AbstractRunner>
  #include <QMutex>
 
-diff --git a/runners/appstream/appstreamrunner.cpp b/runners/appstream/appstreamrunner.cpp
-index 7d0c646c18c909041adb0e7324dc70c073640da2..31ef6580248c77ab46b3ed068fe1829593a3f137 100644
---- a/runners/appstream/appstreamrunner.cpp
-+++ b/runners/appstream/appstreamrunner.cpp
-@@ -150,12 +150,12 @@ QList<AppStream::Component> InstallerRunner::findComponentsByString(const QStrin
-     QMutexLocker locker(&m_appstreamMutex);
-     QString error;
-     static bool warnedOnce = false;
--    static bool opened = m_db.load(&error);
-+    static bool opened = m_db.load();
-     if (!opened) {
-         if (warnedOnce) {
--            qCDebug(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << error;
-+            qCDebug(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << m_db.lastError();
-         } else {
--            qCWarning(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << error;
-+            qCWarning(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << m_db.lastError();
-             warnedOnce = true;
-         }
-     }
-
-
- 
diff --git a/debian/patches/0002_kf5_appstream_2 b/debian/patches/0002_kf5_appstream_2
new file mode 100644
index 0000000..dcd7a5d
--- /dev/null
+++ b/debian/patches/0002_kf5_appstream_2
@@ -0,0 +1,20 @@
+diff --git a/runners/appstream/appstreamrunner.cpp b/runners/appstream/appstreamrunner.cpp
+index 7d0c646c18c909041adb0e7324dc70c073640da2..31ef6580248c77ab46b3ed068fe1829593a3f137 100644
+--- a/runners/appstream/appstreamrunner.cpp
++++ b/runners/appstream/appstreamrunner.cpp
+@@ -150,12 +150,12 @@ QList<AppStream::Component> InstallerRunner::findComponentsByString(const QStrin
+     QMutexLocker locker(&m_appstreamMutex);
+     QString error;
+     static bool warnedOnce = false;
+-    static bool opened = m_db.load(&error);
++    static bool opened = m_db.load();
+     if (!opened) {
+         if (warnedOnce) {
+-            qCDebug(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << error;
++            qCDebug(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << m_db.lastError();
+         } else {
+-            qCWarning(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << error;
++            qCWarning(RUNNER_APPSTREAM) << "Had errors when loading AppStream metadata pool" << m_db.lastError();
+             warnedOnce = true;
+         }
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 2cdcb2b..e93f5f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001_kf5_appstream_1
+0002_kf5_appstream_2