[neon/neon/debug-installer/Neon/release] debian/patches: proper for sure

[Carlos De Maine]

Git commit 55a5b38c3bc840558a116aa43fe1a718230823e8 by Carlos De Maine.
Committed on 03/10/2023 at 00:57.
Pushed by carlosdem into branch 'Neon/release'.

proper for sure

M  +26   -35   debian/patches/0001_appstreamqt

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

diff --git a/debian/patches/0001_appstreamqt b/debian/patches/0001_appstreamqt
index b4d3327..5471d46 100644
--- a/debian/patches/0001_appstreamqt
+++ b/debian/patches/0001_appstreamqt
@@ -1,61 +1,52 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9d4fc70..93ffbcb 100644
+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(AppStreamQt5 REQUIRED)
-+find_package(AppStreamQt 0.16 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 cbd0a5e..d878af2 100644
+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
--        AppStreamQt5
-+        AppStreamQt
+-        AppStreamQt
++        AppStreamQt5
  )
 
  install(TARGETS drkonqi-pk-debug-installer ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 diff --git a/src/DebugRepoEnabler.cpp b/src/DebugRepoEnabler.cpp
-index f2e835a..110250a 100644
+index 110250a..fbb0c31 100644
 --- a/src/DebugRepoEnabler.cpp
 +++ b/src/DebugRepoEnabler.cpp
-@@ -32,18 +32,18 @@ void DebugRepoEnabler::run()
-     qDebug() << ids << ids.count();
-     Q_ASSERT_X(ids.count() <= 1, Q_FUNC_INFO, "multiple ids are currently not supported - patches welcome");
+@@ -34,7 +34,7 @@ void DebugRepoEnabler::run()
 
--        QList<AppStream::Component> components;
--        for (const auto &id : ids) {
--            const auto matchedComponents = pool.componentsById(id).toList();
--            components += matchedComponents;
-+    QList<AppStream::Component> components;
-+    for (const auto &id : ids) {
-+        const auto matchedComponents = pool.componentsById(id);
-+        components += matchedComponents;
+     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
--            const auto &component = matchedComponents.at(0);
--            Q_ASSERT(component.isValid()); // we've seen crash reports that indicated invalid components, unclear why. verify them for now.
--            qWarning() << component.toString();
--            qWarning() << component.packageNames();
--            Q_ASSERT(component.kind() == AppStream::Component::KindRepository);
--        }
-+        Q_ASSERT(components.count() == 1); // ensure distros use valid ids
-+        const auto &component = matchedComponents.at(0);
-+        Q_ASSERT(component.isValid()); // we've seen crash reports that indicated invalid components, unclear why. verify them for now.
-+        qWarning() << component.toString();
-+        qWarning() << component.packageNames();
-+        Q_ASSERT(component.kind() == AppStream::Component::KindRepository);
-+    }
-
-     // TODO: for actual multi-id support the class would need various changes vis a vis tracking what is and isn't
-     const auto &component = components.at(0);
+         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>