[neon/neon/debug-installer/Neon/release] debian/patches: remove patch now in repo

Jonathan Esk-Riddell null at kde.org
Mon Feb 26 10:37:49 GMT 2024


Git commit 3abc83c6c41b723d1b6dc40aa27d612135a6ea65 by Jonathan Esk-Riddell.
Committed on 26/02/2024 at 10:37.
Pushed by jriddell into branch 'Neon/release'.

remove patch now in repo

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

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

diff --git a/debian/patches/0001_appstreamqt b/debian/patches/0001_appstreamqt
deleted file mode 100644
index 5471d46..0000000
--- a/debian/patches/0001_appstreamqt
+++ /dev/null
@@ -1,52 +0,0 @@
-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
deleted file mode 100644
index 13a8193..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001_appstreamqt
\ No newline at end of file


More information about the Neon-commits mailing list