[SCM] KDE Discover packaging branch, kubuntu_xenial_archive, updated. ubuntu/5.5.5-0ubuntu1-27-gef8e192

Matthias Klumpp mak at moszumanska.debian.org
Wed Apr 20 17:50:15 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-discover.git;a=commitdiff;h=3d6c974

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 3d6c974fb9bbdd78d6a3101fab887c57879bb6ae
Author: Matthias Klumpp <mak at debian.org>
Date:   Wed Apr 20 19:47:42 2016 +0200

    Prevent crash when encountering software withoutpackage as candidate
---
 debian/patches/01_components-without-pkgname.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/01_components-without-pkgname.patch b/debian/patches/01_components-without-pkgname.patch
new file mode 100644
index 0000000..747a7b4
--- /dev/null
+++ b/debian/patches/01_components-without-pkgname.patch
@@ -0,0 +1,26 @@
+From: Matthias Klumpp <matthias at tenstral.net>
+Date: Fri, 15 Apr 2016 18:38:23 +0000
+Subject: Account for components having no package as installation candidate
+X-Git-Url: http://quickgit.kde.org/?p=discover.git&a=commitdiff&h=683642fb214bfacec23b69dac9f82481337d572a
+---
+Account for components having no package as installation candidate
+
+AppStream components may also be installed via fwupd, a Limba or XdgApp
+bundle, etc.
+This prevents Discover from crashing when encountering such a component.
+---
+
+
+--- a/libdiscover/backends/ApplicationBackend/Application.cpp
++++ b/libdiscover/backends/ApplicationBackend/Application.cpp
+@@ -61,7 +61,8 @@
+     static QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP");
+ 
+     Q_ASSERT(component.packageNames().count() == 1);
+-    m_packageName = component.packageNames().at(0);
++    if (!component.packageNames().empty())
++        m_packageName = component.packageNames().at(0);
+     
+     m_package = backend->package(packageName());
+     m_isValid = bool(m_package);
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..1f4e9b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_components-without-pkgname.patch

-- 
KDE Discover packaging



More information about the pkg-kde-commits mailing list