[neon/kde/plasma-discover/Neon/release] debian: use stable appstream
Jonathan Esk-Riddell
null at kde.org
Tue Oct 3 17:09:20 BST 2023
Git commit c1744ce9bda9966560dc444b71bc759e738762e2 by Jonathan Esk-Riddell.
Committed on 03/10/2023 at 18:08.
Pushed by jriddell into branch 'Neon/release'.
use stable appstream
M +1 -1 debian/control
D +0 -245 debian/patches/0001_qt5_appstream_1
D +0 -1 debian/patches/series
https://invent.kde.org/neon/kde/plasma-discover/-/commit/c1744ce9bda9966560dc444b71bc759e738762e2
diff --git a/debian/control b/debian/control
index 810a963..47bebe4 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: cmake (>= 2.8.12),
extra-cmake-modules (>= 5.50.0~),
kirigami2-dev (>= 5.42),
kuserfeedback-dev,
- libappstreamqt5-dev,
+ libappstreamqt-dev,
libdebconf-kde-dev (>= 1.0.0),
libflatpak-dev (>= 0.10.2),
libfwupd-dev,
diff --git a/debian/patches/0001_qt5_appstream_1 b/debian/patches/0001_qt5_appstream_1
deleted file mode 100644
index d06a6d3..0000000
--- a/debian/patches/0001_qt5_appstream_1
+++ /dev/null
@@ -1,245 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index abb1515c6d4ce5495dfaae4a88cc4c35053027ef..b568d037939adbea90a5f288159cf68a64698f3b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,7 +31,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED CoreAddons Config Crash DBusAddons
- find_package(KF5Kirigami2 2.7.0)
-
- find_package(packagekitqt5 1.0.1 CONFIG)
--find_package(AppStreamQt 0.15.3 CONFIG REQUIRED)
-+find_package(AppStreamQt5 1.0.0 CONFIG REQUIRED)
- find_package(KF5Attica 5.23 CONFIG)
- find_package(KF5NewStuff 5.53 CONFIG)
-
-@@ -85,7 +85,7 @@ set_package_properties(packagekitqt5 PROPERTIES
- URL "https://www.freedesktop.org/software/PackageKit/"
- PURPOSE "Required to build the PackageKit backend"
- TYPE OPTIONAL)
--set_package_properties(AppStreamQt PROPERTIES
-+set_package_properties(AppStreamQt5 PROPERTIES
- DESCRIPTION "Library that lists Appstream resources"
- URL "https://www.freedesktop.org"
- PURPOSE "Required to build the PackageKit, Flatpak and Snap backends"
-diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
-index 32c49f3393e44404796fe1eb29403706047e9aa6..0c989501d196e0dafa9a92506ec05bc1620998fc 100644
---- a/libdiscover/CMakeLists.txt
-+++ b/libdiscover/CMakeLists.txt
-@@ -42,13 +42,13 @@ ecm_qt_declare_logging_category(discovercommon_SRCS HEADER libdiscover_debug.h I
-
-
- add_library(DiscoverCommon ${discovercommon_SRCS})
--if(TARGET AppStreamQt)
-+if(TARGET AppStreamQt5)
- target_sources(DiscoverCommon PRIVATE
- appstream/OdrsReviewsBackend.cpp
- appstream/AppStreamIntegration.cpp
- appstream/AppStreamUtils.cpp
- )
-- target_link_libraries(DiscoverCommon PRIVATE Qt::Concurrent AppStreamQt)
-+ target_link_libraries(DiscoverCommon PRIVATE Qt::Concurrent AppStreamQt5)
- endif()
-
- target_link_libraries(DiscoverCommon
-diff --git a/libdiscover/appstream/AppStreamUtils.cpp b/libdiscover/appstream/AppStreamUtils.cpp
-index 94f030c9d51a9d5f83db26e2fc2082bbdc60a63e..341ccc8015e58e754ab51c435734a05b2b3d8adc 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 <AppStreamQt5/pool.h>
-+#include <AppStreamQt5/release.h>
-+#include <AppStreamQt5/screenshot.h>
-+#include <AppStreamQt5/spdx.h>
-+#include <AppStreamQt5/version.h>
- #include <Category/Category.h>
- #include <KLocalizedString>
- #include <QDebug>
-diff --git a/libdiscover/appstream/AppStreamUtils.h b/libdiscover/appstream/AppStreamUtils.h
-index 383e55aa84df3a95af08c17c0964c9285372cc94..906bd327aa7b030048867ef021a368600b8bceb0 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 <AppStreamQt5/component.h>
-+#include <AppStreamQt5/image.h>
-+#include <AppStreamQt5/pool.h>
- #include <QColor>
- #include <QList>
- #include <QUrl>
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp b/libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp
-index 99488469b87f16be53258ca61867739d0e7087eb..2de11bdf855ea3dbe435952eefacc55f90302407 100644
---- a/libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp
-+++ b/libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp
-@@ -20,12 +20,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 <AppStreamQt5/bundle.h>
-+#include <AppStreamQt5/icon.h>
-+#include <AppStreamQt5/metadata.h>
-+#include <AppStreamQt5/pool.h>
-+#include <AppStreamQt5/release.h>
-+#include <AppStreamQt5/version.h>
-
- #include <KAboutData>
- #include <KConfigGroup>
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakBackend.h b/libdiscover/backends/FlatpakBackend/FlatpakBackend.h
-index 66188095ac16ebec2b19d5e0990d1aae15ea42e1..878965bfcbec19430d30a1e3f2c1836b271861dc 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 <AppStreamQt5/component.h>
-
- #include "flatpak-helper.h"
-
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakResource.cpp b/libdiscover/backends/FlatpakBackend/FlatpakResource.cpp
-index 7ed905ead9250549600a178a19b5425e56fb82b1..b889e2e12320e86e7cf2cc7c3131dfbacc2f8ce4 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 <AppStreamQt5/icon.h>
-+#include <AppStreamQt5/screenshot.h>
-+#include <AppStreamQt5/utils.h>
- #include <appstream/AppStreamUtils.h>
-
- #include <KConfigGroup>
-@@ -24,7 +24,7 @@
- #include <KIO/ApplicationLauncherJob>
- #include <KLocalizedString>
-
--#include <AppStreamQt/release.h>
-+#include <AppStreamQt5/release.h>
- #include <QDebug>
- #include <QDesktopServices>
- #include <QDir>
-diff --git a/libdiscover/backends/FlatpakBackend/FlatpakResource.h b/libdiscover/backends/FlatpakBackend/FlatpakResource.h
-index 06e1b030a450580a78d6f57054875d4ed3460fa3..648b6a5a72b4a9eba85fc52e8a8318d88491fdc4 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 <AppStreamQt5/component.h>
-
- #include <QAbstractItemModel>
- #include <QPixmap>
-diff --git a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
-index 510266dfdcbf362bd6cd94bfe124e01b5003d3c5..70c44e9cca40db5a6771978df89702673e5c229c 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 <AppStreamQt5/icon.h>
-+#include <AppStreamQt5/image.h>
-+#include <AppStreamQt5/release.h>
-+#include <AppStreamQt5/screenshot.h>
- #include <KLocalizedString>
- #include <KService>
- #include <PackageKit/Daemon>
-diff --git a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
-index 3277a90a9c33234d9f4311e0e68cb70f47bdc529..3389e48db9f6ba00c62055ce8c412d5ba7b1ae80 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 <AppStreamQt5/release.h>
-+#include <AppStreamQt5/utils.h>
-+#include <AppStreamQt5/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 d9a5fd824f12f905759b8118bdde66383ce63ed5..93899450b5ed06240f89450b6042b7a73db781b4 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 <AppStreamQt5/pool.h>
- #include <PackageKit/Transaction>
- #include <QFile>
- #include <QPointer>
-diff --git a/libdiscover/backends/PackageKitBackend/PackageKitResource.cpp b/libdiscover/backends/PackageKitBackend/PackageKitResource.cpp
-index 8bdaec395b9f2bff49caddedd5d8620ec9e17f17..c7e2c0077b9123e7454c67c1d0c686610473cc62 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 <AppStreamQt5/spdx.h>
- #include <KIO/ApplicationLauncherJob>
- #include <KLocalizedString>
- #include <KService>
-diff --git a/libdiscover/backends/RpmOstreeBackend/RpmOstreeBackend.cpp b/libdiscover/backends/RpmOstreeBackend/RpmOstreeBackend.cpp
-index 6e1528be49eb5ebc514dd97f4d53413c384d4269..748b2807cebe67de56d353259df89c29f14e12a7 100644
---- a/libdiscover/backends/RpmOstreeBackend/RpmOstreeBackend.cpp
-+++ b/libdiscover/backends/RpmOstreeBackend/RpmOstreeBackend.cpp
-@@ -10,8 +10,8 @@
-
- #include "Transaction/TransactionModel.h"
-
--#include <AppStreamQt/release.h>
--#include <AppStreamQt/utils.h>
-+#include <AppStreamQt5/release.h>
-+#include <AppStreamQt5/utils.h>
- #include <Category/Category.h>
- #include <KLocalizedString>
- #include <appstream/AppStreamIntegration.h>
-diff --git a/libdiscover/backends/RpmOstreeBackend/RpmOstreeBackend.h b/libdiscover/backends/RpmOstreeBackend/RpmOstreeBackend.h
-index 8ceed1af1fa8919ee38c29c84c8ab0d0125dc497..ea0a07c6f3cee98b81c88692a3554f4e41d7d790 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 <AppStreamQt5/pool.h>
- #include <QTimer>
-
- class DiscoverAction;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 89044d4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001_qt5_appstream_1
More information about the Neon-commits
mailing list