[neon/kde/plasma-discover/Neon/stable] debian/patches: new patchset for qt5 lib
Carlos De Maine
null at kde.org
Thu Sep 21 14:48:48 BST 2023
Git commit 72dac31d8477eadb8a9ba2f2b36f2f622de96436 by Carlos De Maine.
Committed on 21/09/2023 at 15:48.
Pushed by carlosdem into branch 'Neon/stable'.
new patchset for qt5 lib
appstream 1.0.0
M +177 -31 debian/patches/0001_qt5_appstream_1
https://invent.kde.org/neon/kde/plasma-discover/-/commit/72dac31d8477eadb8a9ba2f2b36f2f622de96436
diff --git a/debian/patches/0001_qt5_appstream_1 b/debian/patches/0001_qt5_appstream_1
index d06a6d3..1bde000 100644
--- a/debian/patches/0001_qt5_appstream_1
+++ b/debian/patches/0001_qt5_appstream_1
@@ -1,16 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index abb1515c6d4ce5495dfaae4a88cc4c35053027ef..b568d037939adbea90a5f288159cf68a64698f3b 100644
+index abb1515c6d4ce5495dfaae4a88cc4c35053027ef..74083e85b4bccddb67169eabc6e48d6272e84d2b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1,9 +1,9 @@
++cmake_minimum_required(VERSION 3.16)
++
+ project(discover)
+ set(PROJECT_VERSION "5.27.8")
+ set(PROJECT_VERSION_MAJOR 5)
+
+-cmake_minimum_required(VERSION 3.16)
+-
+ set(QT_MIN_VERSION "5.15.2")
+ set(KF5_MIN_VERSION "5.102.0")
+ set(KDE_COMPILERSETTINGS_LEVEL "5.82")
@@ -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"
@@ -21,32 +33,34 @@ index abb1515c6d4ce5495dfaae4a88cc4c35053027ef..b568d037939adbea90a5f288159cf68a
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
+index 32c49f3393e44404796fe1eb29403706047e9aa6..9f7927484a165492ccfee2f0b02391f7a8365362 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
-
-
+@@ -42,14 +42,14 @@ ecm_qt_declare_logging_category(discovercommon_SRCS HEADER libdiscover_debug.h I
+
+
add_library(DiscoverCommon ${discovercommon_SRCS})
-if(TARGET AppStreamQt)
-+if(TARGET AppStreamQt5)
++#if(TARGET AppStreamQt5)
target_sources(DiscoverCommon PRIVATE
appstream/OdrsReviewsBackend.cpp
appstream/AppStreamIntegration.cpp
appstream/AppStreamUtils.cpp
)
- target_link_libraries(DiscoverCommon PRIVATE Qt::Concurrent AppStreamQt)
+-endif()
+ target_link_libraries(DiscoverCommon PRIVATE Qt::Concurrent AppStreamQt5)
- endif()
-
++#endif()
+
target_link_libraries(DiscoverCommon
+ PUBLIC
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>
@@ -66,9 +80,9 @@ index 383e55aa84df3a95af08c17c0964c9285372cc94..906bd327aa7b030048867ef021a36860
--- 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>
@@ -78,14 +92,70 @@ index 383e55aa84df3a95af08c17c0964c9285372cc94..906bd327aa7b030048867ef021a36860
#include <QColor>
#include <QList>
#include <QUrl>
+diff --git a/libdiscover/backends/CMakeLists.txt b/libdiscover/backends/CMakeLists.txt
+index bd3a0325648f67fab593a88dea8ae25f04519768..dc663834089e9f77282e9377298b977d7f1d1fef 100644
+--- a/libdiscover/backends/CMakeLists.txt
++++ b/libdiscover/backends/CMakeLists.txt
+@@ -8,11 +8,11 @@ function(add_unit_test name)
+ Qt::Test Qt::Core ${EXTRA_LIBS})
+ endfunction()
+
+-if(KF5Attica_FOUND AND KF5NewStuff_FOUND AND AppStreamQt_FOUND)
++if(KF5Attica_FOUND AND KF5NewStuff_FOUND AND AppStreamQt5_FOUND)
+ add_subdirectory(KNSBackend)
+ endif()
+
+-if(packagekitqt5_FOUND AND AppStreamQt_FOUND)
++if(packagekitqt5_FOUND AND AppStreamQt5_FOUND)
+ add_subdirectory(PackageKitBackend)
+ endif()
+
+@@ -22,10 +22,10 @@ if(BUILD_DummyBackend)
+ endif()
+
+ option(BUILD_FlatpakBackend "Build Flatpak support" "ON")
+-if(Flatpak_FOUND AND AppStreamQt_FOUND AND BUILD_FlatpakBackend)
++if(Flatpak_FOUND AND AppStreamQt5_FOUND AND BUILD_FlatpakBackend)
+ add_subdirectory(FlatpakBackend)
+ elseif(BUILD_FlatpakBackend)
+- message(WARNING "BUILD_FlatpakBackend enabled but Flatpak=${Flatpak_FOUND} or AppStreamQt=${AppStreamQt_FOUND} not found")
++ message(WARNING "BUILD_FlatpakBackend enabled but Flatpak=${Flatpak_FOUND} or AppStreamQt5=${AppStreamQt5_FOUND} not found")
+ endif()
+
+ find_package(Snapd)
+@@ -41,7 +41,7 @@ if(BUILD_SteamOSBackend)
+ endif()
+
+ option(BUILD_SnapBackend "Build Snap support." "ON")
+-if(BUILD_SnapBackend AND AppStreamQt_FOUND AND Snapd_FOUND)
++if(BUILD_SnapBackend AND AppStreamQt5_FOUND AND Snapd_FOUND)
+ add_subdirectory(SnapBackend)
+ endif()
+
+diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
+index eac5a3241ba86254a468af079ef1569d08b4ef56..be16e2878e791f35553e5498abecb8f36545996f 100644
+--- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt
++++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
+@@ -13,9 +13,9 @@ set(flatpak-backend_SRCS
+ )
+
+ add_library(flatpak-backend MODULE ${flatpak-backend_SRCS})
+-target_link_libraries(flatpak-backend Qt::Core Qt::Widgets Qt::Concurrent KF5::CoreAddons KF5::ConfigCore KF5::KIOGui Discover::Common AppStreamQt PkgConfig::Flatpak)
++target_link_libraries(flatpak-backend Qt::Core Qt::Widgets Qt::Concurrent KF5::CoreAddons KF5::ConfigCore KF5::KIOGui Discover::Common AppStreamQt5 PkgConfig::Flatpak)
+
+-if (AppStreamQt_VERSION VERSION_GREATER 0.14.6)
++if (AppStreamQt5_VERSION VERSION_GREATER 0.14.6)
+ target_compile_definitions(flatpak-backend PRIVATE -DAPPSTREAM_NEW_POOL_API)
+ endif()
+
diff --git a/libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp b/libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp
-index 99488469b87f16be53258ca61867739d0e7087eb..2de11bdf855ea3dbe435952eefacc55f90302407 100644
+index 99488469b87f16be53258ca61867739d0e7087eb..5d1ebce9e03c17925d147fde34c6a50fbe56ae05 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>
@@ -98,9 +168,47 @@ index 99488469b87f16be53258ca61867739d0e7087eb..2de11bdf855ea3dbe435952eefacc55f
+#include <AppStreamQt5/pool.h>
+#include <AppStreamQt5/release.h>
+#include <AppStreamQt5/version.h>
-
+
#include <KAboutData>
#include <KConfigGroup>
+@@ -274,7 +274,11 @@ static std::optional<AppStream::Metadata> metadataFromBytes(GBytes *appstreamGz,
+ gconstpointer data = g_bytes_get_data(appstream, &len);
+
+ AppStream::Metadata metadata;
++#if ASQ_CHECK_VERSION(0, 16, 0)
++ metadata.setFormatStyle(AppStream::Metadata::FormatStyleCatalog);
++#else
+ metadata.setFormatStyle(AppStream::Metadata::FormatStyleCollection);
++#endif
+ AppStream::Metadata::MetadataError error = metadata.parse(QString::fromUtf8((char *)data, len), AppStream::Metadata::FormatKindXml);
+ if (error != AppStream::Metadata::MetadataErrorNoError) {
+ qWarning() << "Failed to parse appstream metadata: " << error;
+@@ -777,7 +781,11 @@ AppStream::Component fetchComponentFromRemote(const QSettings &settings, GCancel
+ AppStream::Pool pool;
+ #ifdef APPSTREAM_NEW_POOL_API
+ pool.setLoadStdDataLocations(false);
++#if ASQ_CHECK_VERSION(0, 16, 0)
++ pool.addExtraDataLocation(appstreamLocation, AppStream::Metadata::FormatStyleCatalog);
++#else
+ pool.addExtraDataLocation(appstreamLocation, AppStream::Metadata::FormatStyleCollection);
++#endif
+ #else
+ pool.clearMetadataLocations();
+ pool.addMetadataLocation(appstreamLocation);
+@@ -1079,8 +1087,13 @@ void FlatpakBackend::createPool(QSharedPointer<FlatpakSource> source)
+
+ #ifdef APPSTREAM_NEW_POOL_API
+ pool->setLoadStdDataLocations(false);
++#if ASQ_CHECK_VERSION(0, 16, 0)
++ pool->addExtraDataLocation(appstreamDirPath, AppStream::Metadata::FormatStyleCatalog);
++#else
+ pool->addExtraDataLocation(appstreamDirPath, AppStream::Metadata::FormatStyleCollection);
++#endif
+ #else
++
+ pool->clearMetadataLocations();
+ pool->addMetadataLocation(appstreamDirPath);
+ pool->setFlags(AppStream::Pool::FlagReadCollection);
diff --git a/libdiscover/backends/FlatpakBackend/FlatpakBackend.h b/libdiscover/backends/FlatpakBackend/FlatpakBackend.h
index 66188095ac16ebec2b19d5e0990d1aae15ea42e1..878965bfcbec19430d30a1e3f2c1836b271861dc 100644
--- a/libdiscover/backends/FlatpakBackend/FlatpakBackend.h
@@ -108,20 +216,20 @@ index 66188095ac16ebec2b19d5e0990d1aae15ea42e1..878965bfcbec19430d30a1e3f2c1836b
@@ -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>
@@ -129,12 +237,12 @@ index 7ed905ead9250549600a178a19b5425e56fb82b1..b889e2e12320e86e7cf2cc7c3131dfba
+#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>
@@ -147,18 +255,30 @@ index 06e1b030a450580a78d6f57054875d4ed3460fa3..648b6a5a72b4a9eba85fc52e8a8318d8
@@ -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/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt
+index 8c48e4f18cc92776b6df40730fdd90d9239bd6d5..760361d65e1b6b8e8dd2ab174db103a6abd0c68d 100644
+--- a/libdiscover/backends/KNSBackend/CMakeLists.txt
++++ b/libdiscover/backends/KNSBackend/CMakeLists.txt
+@@ -7,6 +7,6 @@ add_library(kns-backend MODULE
+ KNSTransaction.cpp
+ )
+
+-target_link_libraries(kns-backend Discover::Common AppStreamQt KF5::ConfigCore KF5::Attica KF5::NewStuffCore KF5::WidgetsAddons Qt::Xml)
++target_link_libraries(kns-backend Discover::Common AppStreamQt5 KF5::ConfigCore KF5::Attica KF5::NewStuffCore KF5::WidgetsAddons Qt::Xml)
+
+ install(TARGETS kns-backend DESTINATION ${KDE_INSTALL_PLUGINDIR}/discover)
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>
@@ -172,6 +292,19 @@ index 510266dfdcbf362bd6cd94bfe124e01b5003d3c5..70c44e9cca40db5a6771978df8970267
#include <KLocalizedString>
#include <KService>
#include <PackageKit/Daemon>
+diff --git a/libdiscover/backends/PackageKitBackend/CMakeLists.txt b/libdiscover/backends/PackageKitBackend/CMakeLists.txt
+index 415407fc1a8454cc6d7e71fe8fc87204b6ddea18..bee4c46a35f4cb499794282a070ebb0dbf129682 100644
+--- a/libdiscover/backends/PackageKitBackend/CMakeLists.txt
++++ b/libdiscover/backends/PackageKitBackend/CMakeLists.txt
+@@ -17,7 +17,7 @@ ecm_qt_declare_logging_category(packagekit-backend_SRCS HEADER libdiscover_backe
+
+ add_library(packagekit-backend MODULE ${packagekit-backend_SRCS})
+
+-target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt::Core Qt::Concurrent PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::KIOGui KF5::Archive AppStreamQt)
++target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt::Core Qt::Concurrent PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::KIOGui KF5::Archive AppStreamQt5)
+ install(TARGETS packagekit-backend DESTINATION ${KDE_INSTALL_PLUGINDIR}/discover)
+
+ if(TARGET PkgConfig::Markdown)
diff --git a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
index 3277a90a9c33234d9f4311e0e68cb70f47bdc529..3389e48db9f6ba00c62055ce8c412d5ba7b1ae80 100644
--- a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
@@ -195,7 +328,7 @@ index d9a5fd824f12f905759b8118bdde66383ce63ed5..93899450b5ed06240f89450b6042b7a7
+++ b/libdiscover/backends/PackageKitBackend/PackageKitBackend.h
@@ -7,7 +7,7 @@
#pragma once
-
+
#include "PackageKitResource.h"
-#include <AppStreamQt/pool.h>
+#include <AppStreamQt5/pool.h>
@@ -215,14 +348,27 @@ index 8bdaec395b9f2bff49caddedd5d8620ec9e17f17..c7e2c0077b9123e7454c67c1d0c68661
#include <KIO/ApplicationLauncherJob>
#include <KLocalizedString>
#include <KService>
+diff --git a/libdiscover/backends/RpmOstreeBackend/CMakeLists.txt b/libdiscover/backends/RpmOstreeBackend/CMakeLists.txt
+index 9effe9c81e559c939809a97c817b4846d6c23e9b..0de2579d14ac745adada22d3358a19f5a1037529 100644
+--- a/libdiscover/backends/RpmOstreeBackend/CMakeLists.txt
++++ b/libdiscover/backends/RpmOstreeBackend/CMakeLists.txt
+@@ -4,7 +4,7 @@ find_file(RpmOstreeDBusInterface org.projectatomic.rpmostree1.xml /usr/share/dbu
+ qt_add_dbus_interface(RpmOstreeDBusInterface_SRCS ${RpmOstreeDBusInterface} RpmOstreeDBusInterface)
+
+ add_library(rpm-ostree-backend MODULE OstreeFormat.cpp RpmOstreeResource.cpp RpmOstreeBackend.cpp RpmOstreeSourcesBackend.cpp RpmOstreeTransaction.cpp ${RpmOstreeDBusInterface_SRCS})
+-target_link_libraries(rpm-ostree-backend PRIVATE Discover::Common Qt::DBus KF5::CoreAddons KF5::I18n PkgConfig::Ostree AppStreamQt)
++target_link_libraries(rpm-ostree-backend PRIVATE Discover::Common Qt::DBus KF5::CoreAddons KF5::I18n PkgConfig::Ostree AppStreamQt5)
+
+ install(TARGETS rpm-ostree-backend DESTINATION ${KDE_INSTALL_PLUGINDIR}/discover)
+ install(FILES rpm-ostree-backend-categories.xml DESTINATION ${KDE_INSTALL_DATADIR}/libdiscover/categories)
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>
@@ -237,9 +383,9 @@ index 8ceed1af1fa8919ee38c29c84c8ab0d0125dc497..ea0a07c6f3cee98b81c88692a3554f4e
@@ -14,7 +14,7 @@
#include <resources/AbstractResourcesBackend.h>
#include <resources/StandardBackendUpdater.h>
-
+
-#include <AppStreamQt/pool.h>
+#include <AppStreamQt5/pool.h>
#include <QTimer>
-
+
class DiscoverAction;
More information about the Neon-commits
mailing list