[neon/neon/debug-installer/Neon/unstable] debian/patches: Revert "use stable appstream"

Jonathan Esk-Riddell null at kde.org
Tue Oct 3 17:21:12 BST 2023


Git commit d3be9c7bed4ab77cd6c7f102162624468a7b3750 by Jonathan Esk-Riddell.
Committed on 03/10/2023 at 18:21.
Pushed by jriddell into branch 'Neon/unstable'.

Revert "use stable appstream"

This reverts commit e774828d330b47c57a8e217b2809af238c148679.

A  +52   -0    debian/patches/0001_appstreamqt
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/neon/debug-installer/-/commit/d3be9c7bed4ab77cd6c7f102162624468a7b3750

diff --git a/debian/patches/0001_appstreamqt b/debian/patches/0001_appstreamqt
new file mode 100644
index 0000000..5471d46
--- /dev/null
+++ b/debian/patches/0001_appstreamqt
@@ -0,0 +1,52 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 93ffbcb..9d4fc70 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,7 +37,7 @@ find_package(KF5CoreAddons ${KF5_MIN_VERSION} REQUIRED)
+ find_package(KF5I18n ${KF5_MIN_VERSION} REQUIRED)
+ find_package(KF5Declarative ${KF5_MIN_VERSION} REQUIRED)
+ find_package(PackageKitQt5 REQUIRED)
+-find_package(AppStreamQt 0.16 REQUIRED)
++find_package(AppStreamQt5 REQUIRED)
+
+ # Disable legacy stuff to get rid of some deprecation warnings.
+ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d878af2..cbd0a5e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -38,7 +38,7 @@ target_link_libraries(drkonqi-pk-debug-installer
+         KF5::I18n
+         PK::packagekitqt5
+         KF5::Declarative
+-        AppStreamQt
++        AppStreamQt5
+ )
+
+ install(TARGETS drkonqi-pk-debug-installer ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+diff --git a/src/DebugRepoEnabler.cpp b/src/DebugRepoEnabler.cpp
+index 110250a..fbb0c31 100644
+--- a/src/DebugRepoEnabler.cpp
++++ b/src/DebugRepoEnabler.cpp
+@@ -34,7 +34,7 @@ void DebugRepoEnabler::run()
+
+     QList<AppStream::Component> components;
+     for (const auto &id : ids) {
+-        const auto matchedComponents = pool.componentsById(id);
++        const auto matchedComponents = pool.componentsById(id).toList();
+         components += matchedComponents;
+
+         Q_ASSERT(components.count() == 1); // ensure distros use valid ids
+diff --git a/src/DebugRepoEnabler.h b/src/DebugRepoEnabler.h
+index 6bafdee..07311d8 100644
+--- a/src/DebugRepoEnabler.h
++++ b/src/DebugRepoEnabler.h
+@@ -3,7 +3,7 @@
+
+ #pragma once
+
+-#include <AppStreamQt/pool.h>
++#include <AppStreamQt5/pool.h>
+ #include <PackageKit/Daemon>
+ #include <QJsonObject>
+ #include <QVector>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..13a8193
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001_appstreamqt
\ No newline at end of file


More information about the Neon-commits mailing list