[neon/kde/kpackage/Neon/release-lts] debian/patches: refresh patch
Jonathan Riddell
null at kde.org
Mon Mar 15 12:09:31 GMT 2021
Git commit db0c4763dd0ea09b8a4365cdf9d5be42a3380314 by Jonathan Riddell.
Committed on 15/03/2021 at 12:09.
Pushed by jriddell into branch 'Neon/release-lts'.
refresh patch
M +9 -9 debian/patches/Package-might-be-gone.patch
https://invent.kde.org/neon/kde/kpackage/commit/db0c4763dd0ea09b8a4365cdf9d5be42a3380314
diff --git a/debian/patches/Package-might-be-gone.patch b/debian/patches/Package-might-be-gone.patch
index 4630f4d..e2f73b5 100644
--- a/debian/patches/Package-might-be-gone.patch
+++ b/debian/patches/Package-might-be-gone.patch
@@ -8,16 +8,16 @@ package to nullptr, when the package is gone.
src/kpackage/private/packagejob.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/kpackage/private/packagejob.cpp b/src/kpackage/private/packagejob.cpp
-index 9be5c65..6117931 100644
---- a/src/kpackage/private/packagejob.cpp
-+++ b/src/kpackage/private/packagejob.cpp
-@@ -88,7 +88,7 @@ void PackageJob::install(const QString &src, const QString &dest)
+Index: kpackage/src/kpackage/private/packagejob.cpp
+===================================================================
+--- kpackage.orig/src/kpackage/private/packagejob.cpp
++++ kpackage/src/kpackage/private/packagejob.cpp
+@@ -99,7 +99,7 @@ void PackageJob::setupNotificationsOnJob
const QStringList serviceTypes = d->package->metadata().serviceTypes();
- //d-package can become dangling during the job if deleted externally
- connect(d->thread, &PackageJobThread::finished, this, [=](bool ok, const QString &error) {
+
+ auto onJobFinished = [=](bool ok, const QString &error) {
- if (ok) {
+ if (ok && d->package != nullptr) {
- for (auto& packageType: serviceTypes) {
- auto msg = QDBusMessage::createSignal(QStringLiteral("/KPackage/") + packageType, QStringLiteral("org.kde.plasma.kpackage"), QStringLiteral("packageInstalled"));
+ for (auto &packageType : serviceTypes) {
+ auto msg = QDBusMessage::createSignal(QStringLiteral("/KPackage/") + packageType, QStringLiteral("org.kde.plasma.kpackage"), messageName);
msg.setArguments({pluginId});
More information about the Neon-commits
mailing list