[neon/kde/plasma-discover/Neon/unstable] debian/patches: more patchiness

Thu Sep 14 10:52:14 BST 2023

Git commit e6fb7664472ba8fd1a18615ee7baa52f0d5a2c2a by Carlos De Maine.
Committed on 14/09/2023 at 11:52.
Pushed by carlosdem into branch 'Neon/unstable'.

more patchiness

M  +276  -1    debian/patches/0001_appstreamqt6

https://invent.kde.org/neon/kde/plasma-discover/-/commit/e6fb7664472ba8fd1a18615ee7baa52f0d5a2c2a

diff --git a/debian/patches/0001_appstreamqt6 b/debian/patches/0001_appstreamqt6
index 161835e..a1c3a0d 100644
--- a/debian/patches/0001_appstreamqt6
+++ b/debian/patches/0001_appstreamqt6
@@ -19,4 +19,279 @@ index 7a817c523f7384cae0cd598c02ec6311e81fda00..b4f07e06c544bc7e581a5343fb098860
 +set_package_properties(AppStreamQt6 PROPERTIES
      DESCRIPTION "Library that lists Appstream resources"
      URL "https://www.freedesktop.org"
-     PURPOSE "Required to build the PackageKit, Flatpak and Snap backends"
\ No newline at end of file
+     PURPOSE "Required to build the PackageKit, Flatpak and Snap backends"
+
+diff --git a/libdiscover/appstream/AppStreamIntegration.cpp b/libdiscover/appstream/AppStreamIntegration.cpp
+index 95e066b076aad700fc29c6d9b3d27993e9d83701..9e3703d21af37eda09525d310784c3a6fdec6c62 100644
+--- a/libdiscover/appstream/AppStreamIntegration.cpp
++++ b/libdiscover/appstream/AppStreamIntegration.cpp
+@@ -6,8 +6,8 @@
+ 
+ #include "AppStreamIntegration.h"
+ 
+-#include <AppStreamQt/utils.h>
+-#include <AppStreamQt/version.h>
++#include <AppstreamQt6/utils.h>
++#include <AppstreamQt6/version.h>
+ #include <KConfigGroup>
+ #include <KSharedConfig>
+ #include <QDebug>
+diff --git a/libdiscover/appstream/AppStreamIntegration.h b/libdiscover/appstream/AppStreamIntegration.h
+index 78454b944da12c660bbcaaf036afe58a5e974056..c275ec65a3b447cc96a1ca33f37b9f9f0b741521 100644
+--- a/libdiscover/appstream/AppStreamIntegration.h
++++ b/libdiscover/appstream/AppStreamIntegration.h
+@@ -8,8 +8,8 @@
+ 
+ #include "discovercommon_export.h"
+ 
+-#include <AppStreamQt/pool.h>
+-#include <AppStreamQt/release.h>
++#include <AppstreamQt6/pool.h>
++#include <AppstreamQt6/release.h>
+ #include <KOSRelease>
+ #include <QObject>
+ 
+diff --git a/libdiscover/appstream/AppStreamUtils.cpp b/libdiscover/appstream/AppStreamUtils.cpp
+index 6fbe8de6e6ce81dee680f738faeb85399812f9a0..d9231c18b44f6e6c52f6e0cc623d024e633eb808 100644
+--- a/libdiscover/appstream/AppStreamUtils.cpp
++++ b/libdiscover/appstream/AppStreamUtils.cpp
+@@ -7,11 +7,11 @@
+ #include "AppStreamUtils.h"
+ 
+ #include "utils.h"
+-#include <AppStreamQt/pool.h>
+-#include <AppStreamQt/release.h>
+-#include <AppStreamQt/screenshot.h>
+-#include <AppStreamQt/spdx.h>
+-#include <AppStreamQt/version.h>
++#include <AppstreamQt6/pool.h>
++#include <AppstreamQt6/release.h>
++#include <AppstreamQt6/screenshot.h>
++#include <AppstreamQt6/spdx.h>
++#include <AppstreamQt6/version.h>
+ #include <Category/Category.h>
+ #include <KLocalizedString>
+ #include <QDebug>
+diff --git a/libdiscover/appstream/AppStreamUtils.h b/libdiscover/appstream/AppStreamUtils.h
+index 45a7a0392d920a083e31515b62b6c6e3f1965bdd..dde3a2c55e3504a06daa47a997fb9ce92cf12460 100644
+--- a/libdiscover/appstream/AppStreamUtils.h
++++ b/libdiscover/appstream/AppStreamUtils.h
+@@ -6,9 +6,9 @@
+ 
+ #pragma once
+ 
+-#include <AppStreamQt/component.h>
+-#include <AppStreamQt/image.h>
+-#include <AppStreamQt/pool.h>
++#include <AppstreamQt6/component.h>
++#include <AppstreamQt6/image.h>
++#include <AppstreamQt6/pool.h>
+ #include <QColor>
+ #include <QList>
+ #include <QUrl>
+diff --git a/libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp b/libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp
+index eb5f6341363838b2ce3292090834f924eb025803..1f2a3da67776f8fd05663de853a48935e116f26b 100644
+--- a/libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp
++++ b/libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp
+@@ -19,12 +19,12 @@
+ #include <resources/StandardBackendUpdater.h>
+ #include <utils.h>
+ 
+-#include <AppStreamQt/bundle.h>
+-#include <AppStreamQt/icon.h>
+-#include <AppStreamQt/metadata.h>
+-#include <AppStreamQt/pool.h>
+-#include <AppStreamQt/release.h>
+-#include <AppStreamQt/version.h>
++#include <AppstreamQt6/bundle.h>
++#include <AppstreamQt6/icon.h>
++#include <AppstreamQt6/metadata.h>
++#include <AppstreamQt6/pool.h>
++#include <AppstreamQt6/release.h>
++#include <AppstreamQt6/version.h>
+ 
+ #include <KAboutData>
+ #include <KConfigGroup>
+diff --git a/libdiscover/backends/FlatpakBackend/FlatpakBackend.h b/libdiscover/backends/FlatpakBackend/FlatpakBackend.h
+index 2352214115fae62419c1dd8f12799c300b6fce3a..143edf9b13950be8f66f7d32c53a0d02cefce9ff 100644
+--- a/libdiscover/backends/FlatpakBackend/FlatpakBackend.h
++++ b/libdiscover/backends/FlatpakBackend/FlatpakBackend.h
+@@ -14,7 +14,7 @@
+ #include <QVariantList>
+ #include <resources/AbstractResourcesBackend.h>
+ 
+-#include <AppStreamQt/component.h>
++#include <AppstreamQt6/component.h>
+ 
+ #include "flatpak-helper.h"
+ 
+diff --git a/libdiscover/backends/FlatpakBackend/FlatpakResource.cpp b/libdiscover/backends/FlatpakBackend/FlatpakResource.cpp
+index 2139698b31631a1530ed8a941d9c483ba712778d..ba902eaf9de6f702ed606602100a5ae314e7ccd5 100644
+--- a/libdiscover/backends/FlatpakBackend/FlatpakResource.cpp
++++ b/libdiscover/backends/FlatpakBackend/FlatpakResource.cpp
+@@ -13,9 +13,9 @@
+ 
+ #include <Transaction/AddonList.h>
+ 
+-#include <AppStreamQt/icon.h>
+-#include <AppStreamQt/screenshot.h>
+-#include <AppStreamQt/utils.h>
++#include <AppstreamQt6/icon.h>
++#include <AppstreamQt6/screenshot.h>
++#include <AppstreamQt6/utils.h>
+ #include <appstream/AppStreamUtils.h>
+ 
+ #include <KConfigGroup>
+@@ -24,7 +24,7 @@
+ #include <KIO/ApplicationLauncherJob>
+ #include <KLocalizedString>
+ 
+-#include <AppStreamQt/release.h>
++#include <AppstreamQt6/release.h>
+ #include <QDebug>
+ #include <QDesktopServices>
+ #include <QDir>
+diff --git a/libdiscover/backends/FlatpakBackend/FlatpakResource.h b/libdiscover/backends/FlatpakBackend/FlatpakResource.h
+index 066d9e40078e47a3f0789a1a07599cb715eaf20d..4b22ef391e7f785c5b533e23175bfd184e5d42e3 100644
+--- a/libdiscover/backends/FlatpakBackend/FlatpakResource.h
++++ b/libdiscover/backends/FlatpakBackend/FlatpakResource.h
+@@ -12,7 +12,7 @@
+ #include "FlatpakPermission.h"
+ #include "flatpak-helper.h"
+ 
+-#include <AppStreamQt/component.h>
++#include <AppstreamQt6/component.h>
+ 
+ #include <QAbstractItemModel>
+ #include <QPixmap>
+diff --git a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
+index fe9722ae8253f7512eec1f6195e555a0287f40b6..5e410d3493b28b49540fcf8f821f2eff15318e81 100644
+--- a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
++++ b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
+@@ -6,10 +6,10 @@
+ 
+ #include "AppPackageKitResource.h"
+ #include "utils.h"
+-#include <AppStreamQt/icon.h>
+-#include <AppStreamQt/image.h>
+-#include <AppStreamQt/release.h>
+-#include <AppStreamQt/screenshot.h>
++#include <AppstreamQt6/icon.h>
++#include <AppstreamQt6/image.h>
++#include <AppstreamQt6/release.h>
++#include <AppstreamQt6/screenshot.h>
+ #include <KLocalizedString>
+ #include <KService>
+ #include <PackageKit/Daemon>
+diff --git a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
+index 3b4dada99e3914b70a25ed98cc40c883831eb94b..2c2c4fd208df2e6e14866e9273d372b414499465 100644
+--- a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
++++ b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
+@@ -12,9 +12,9 @@
+ #include "PKTransaction.h"
+ #include "PackageKitSourcesBackend.h"
+ #include "PackageKitUpdater.h"
+-#include <AppStreamQt/release.h>
+-#include <AppStreamQt/utils.h>
+-#include <AppStreamQt/version.h>
++#include <AppstreamQt6/release.h>
++#include <AppstreamQt6/utils.h>
++#include <AppstreamQt6/version.h>
+ #include <appstream/AppStreamIntegration.h>
+ #include <appstream/AppStreamUtils.h>
+ #include <appstream/OdrsReviewsBackend.h>
+diff --git a/libdiscover/backends/PackageKitBackend/PackageKitBackend.h b/libdiscover/backends/PackageKitBackend/PackageKitBackend.h
+index 52465b8e6958281ba2d6f16494503e2b333d240f..20e50e773184396d239295019853cd198963beff 100644
+--- a/libdiscover/backends/PackageKitBackend/PackageKitBackend.h
++++ b/libdiscover/backends/PackageKitBackend/PackageKitBackend.h
+@@ -7,7 +7,7 @@
+ #pragma once
+ 
+ #include "PackageKitResource.h"
+-#include <AppStreamQt/pool.h>
++#include <AppstreamQt6/pool.h>
+ #include <PackageKit/Transaction>
+ #include <QFile>
+ #include <QPointer>
+diff --git a/libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp b/libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp
+index ae5a58c51a60f7578f3c2a7bbbcdfd524d7d872b..d2243de70015cb798f631820b1b79db393d4136c 100644
+--- a/libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp
++++ b/libdiscover/backends/PackageKitBackend/PackageKitNotifier.cpp
+@@ -23,8 +23,8 @@
+ #include <QTextStream>
+ #include <QTimer>
+ 
+-#include <AppStreamQt/pool.h>
+-#include <AppStreamQt/release.h>
++#include <AppstreamQt6/pool.h>
++#include <AppstreamQt6/release.h>
+ #include <appstream/AppStreamIntegration.h>
+ 
+ #include "libdiscover_backend_debug.h"
+diff --git a/libdiscover/backends/PackageKitBackend/PackageKitNotifier.h b/libdiscover/backends/PackageKitBackend/PackageKitNotifier.h
+index 10bd3d1948aef23d00e07b33783e75f882af4864..2b0768f9c6aba0782e6e57f1b182cc2524a4eedf 100644
+--- a/libdiscover/backends/PackageKitBackend/PackageKitNotifier.h
++++ b/libdiscover/backends/PackageKitBackend/PackageKitNotifier.h
+@@ -5,7 +5,7 @@
+  */
+ #pragma once
+ 
+-#include <AppStreamQt/pool.h>
++#include <AppstreamQt6/pool.h>
+ #include <BackendNotifierModule.h>
+ #include <PackageKit/Transaction>
+ #include <QPointer>
+diff --git a/libdiscover/backends/PackageKitBackend/PackageKitResource.cpp b/libdiscover/backends/PackageKitBackend/PackageKitResource.cpp
+index d6de628f6b68eb22260ad659883f5338ce269b67..7543be1b7c64cf9cad67182de5702506b9852602 100644
+--- a/libdiscover/backends/PackageKitBackend/PackageKitResource.cpp
++++ b/libdiscover/backends/PackageKitBackend/PackageKitResource.cpp
+@@ -10,7 +10,7 @@
+ #include "PackageKitMessages.h"
+ #include "appstream/AppStreamUtils.h"
+ #include "config-paths.h"
+-#include <AppStreamQt/spdx.h>
++#include <AppstreamQt6/spdx.h>
+ #include <KIO/ApplicationLauncherJob>
+ #include <KLocalizedString>
+ #include <KService>
+diff --git a/libdiscover/backends/PackageKitBackend/PackageKitUpdater.cpp b/libdiscover/backends/PackageKitBackend/PackageKitUpdater.cpp
+index b04a7bb8d4dde83e5b69416c47c6763b93902cc6..f3bd93abb9f8fb9db336eadf21383316924c1959 100644
+--- a/libdiscover/backends/PackageKitBackend/PackageKitUpdater.cpp
++++ b/libdiscover/backends/PackageKitBackend/PackageKitUpdater.cpp
+@@ -5,7 +5,7 @@
+  */
+ #include "PackageKitUpdater.h"
+ #include "PackageKitMessages.h"
+-#include <AppStreamQt/release.h>
++#include <AppstreamQt6/release.h>
+ #include <appstream/AppStreamIntegration.h>
+ 
+ #include <PackageKit/Daemon>
+diff --git a/libdiscover/backends/RpmOstreeBackend/RpmOstreeBackend.cpp b/libdiscover/backends/RpmOstreeBackend/RpmOstreeBackend.cpp
+index a845b1daccaffe4f4e819c34bc6dbf382e4abf9b..d954942e3e949b99bf6adb3649379a3985e484c0 100644
+--- a/libdiscover/backends/RpmOstreeBackend/RpmOstreeBackend.cpp
++++ b/libdiscover/backends/RpmOstreeBackend/RpmOstreeBackend.cpp
+@@ -11,8 +11,8 @@
+ #include "Category/Category.h"
+ #include "Transaction/TransactionModel.h"
+ 
+-#include <AppStreamQt/release.h>
+-#include <AppStreamQt/utils.h>
++#include <AppstreamQt6/release.h>
++#include <AppstreamQt6/utils.h>
+ #include <KLocalizedString>
+ #include <appstream/AppStreamIntegration.h>
+ 
+diff --git a/libdiscover/backends/RpmOstreeBackend/RpmOstreeBackend.h b/libdiscover/backends/RpmOstreeBackend/RpmOstreeBackend.h
+index 8ceed1af1fa8919ee38c29c84c8ab0d0125dc497..8f8743547d0c070e3ae87c0f79ada78653f46ee4 100644
+--- a/libdiscover/backends/RpmOstreeBackend/RpmOstreeBackend.h
++++ b/libdiscover/backends/RpmOstreeBackend/RpmOstreeBackend.h
+@@ -14,7 +14,7 @@
+ #include <resources/AbstractResourcesBackend.h>
+ #include <resources/StandardBackendUpdater.h>
+ 
+-#include <AppStreamQt/pool.h>
++#include <AppstreamQt6/pool.h>
+ #include <QTimer>
+ 
+ class DiscoverAction;
