[neon/kde/frameworkintegration/Neon/unstable] debian/patches: split

Carlos De Maine null at kde.org
Sun Oct 1 08:56:15 BST 2023


Git commit 3ee21316841ba5d4f580d49578b5f10e6c55ecba by Carlos De Maine.
Committed on 01/10/2023 at 09:56.
Pushed by carlosdem into branch 'Neon/unstable'.

split

M  +0    -13   debian/patches/0001_appstreamqt
A  +13   -0    debian/patches/0002
M  +2    -1    debian/patches/series

https://invent.kde.org/neon/kde/frameworkintegration/-/commit/3ee21316841ba5d4f580d49578b5f10e6c55ecba

diff --git a/debian/patches/0001_appstreamqt b/debian/patches/0001_appstreamqt
index 0b044cc..29afdaa 100644
--- a/debian/patches/0001_appstreamqt
+++ b/debian/patches/0001_appstreamqt
@@ -45,16 +45,3 @@ index 82328f7068228b79f82e085352d3d78733dcd4b5..8bde139b243eb3f42ca10f1005018100
  #include <PackageKit/Daemon>
  #include <QCoreApplication>
  #include <QDebug>
- diff --git a/src/kpackage-install-handlers/appstream/main.cpp b/src/kpackage-install-handlers/appstream/main.cpp
-index 8bde139b243eb3f42ca10f1005018100e3121f79..9dc90b433152ae6021237f3f3ef4040256715b5b 100644
---- a/src/kpackage-install-handlers/appstream/main.cpp
-+++ b/src/kpackage-install-handlers/appstream/main.cpp
-@@ -30,7 +30,7 @@ int main(int argc, char **argv)
-     Pool pool;
-     auto b = pool.load();
-     Q_ASSERT(b);
--    const auto components = pool.componentsById(componentName);
-+    const auto components = pool.componentsById(componentName).toList();
-     if (components.isEmpty()) {
-         qWarning() << "couldn't find" << componentName;
-         return 1;
diff --git a/debian/patches/0002 b/debian/patches/0002
new file mode 100644
index 0000000..3d72da4
--- /dev/null
+++ b/debian/patches/0002
@@ -0,0 +1,13 @@
+diff --git a/src/kpackage-install-handlers/appstream/main.cpp b/src/kpackage-install-handlers/appstream/main.cpp
+index 8bde139b243eb3f42ca10f1005018100e3121f79..9dc90b433152ae6021237f3f3ef4040256715b5b 100644
+--- a/src/kpackage-install-handlers/appstream/main.cpp
++++ b/src/kpackage-install-handlers/appstream/main.cpp
+@@ -30,7 +30,7 @@ int main(int argc, char **argv)
+     Pool pool;
+     auto b = pool.load();
+     Q_ASSERT(b);
+-    const auto components = pool.componentsById(componentName);
++    const auto components = pool.componentsById(componentName).toList();
+     if (components.isEmpty()) {
+         qWarning() << "couldn't find" << componentName;
+         return 1;
diff --git a/debian/patches/series b/debian/patches/series
index 13a8193..60866da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-0001_appstreamqt
\ No newline at end of file
+0001_appstreamqt
+0002
\ No newline at end of file


More information about the Neon-commits mailing list