Subject: [PATCH] community/kio: fix nullpointer causing crash in testing/dolphin

From: Bart Ribbers <[email-masked]>
Date: Mon, 2 Sep 2019 16:33:01 +0200

---
 community/kio/APKBUILD     |  8 +++++---
 community/kio/D23670.patch | 27 +++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 community/kio/D23670.patch

diff --git a/community/kio/APKBUILD b/community/kio/APKBUILD
index 33d926f2ef..bca49bf00b 100644
--- a/community/kio/APKBUILD
+++ b/community/kio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <[email-masked]>
 pkgname=kio
 pkgver=5.61.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Resource and network access abstraction"
 arch="all"
 url="https://community.kde.org/Frameworks"
@@ -14,7 +14,8 @@ depends_dev="qt5-qtscript-dev karchive-dev kconfig-dev kcoreaddons-dev
 	knotifications-dev"
 makedepends="$depends_dev extra-cmake-modules doxygen qt5-qttools-dev libxslt-dev libxml2-dev kdoctools-dev"
 checkdepends="xvfb-run"
-source="https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
+source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kio-$pkgver.tar.xz
+	D23670.patch"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 options="!check" # Fails due to requiring physical devices not normally available and test 14 hangs
 
@@ -34,4 +35,5 @@ check() {
 package() {
 	DESTDIR="$pkgdir" make install
 }
-sha512sums="ae744e393fc0466b1221fb97db030782af1bd60724e1d4033b88e577fd516fe6ebfe9367e13ea9818da57cfb84375aa8ce5c2d69829ebdc754343bcdd2d65f44  kio-5.61.0.tar.xz"
+sha512sums="ae744e393fc0466b1221fb97db030782af1bd60724e1d4033b88e577fd516fe6ebfe9367e13ea9818da57cfb84375aa8ce5c2d69829ebdc754343bcdd2d65f44  kio-5.61.0.tar.xz
+ca4262f0e702b4b1dcf5ffd95c2ea2ae70cc217a62e4473500f9252a9c05fb6a6fff32ff8ff4aab249ac8ecc91fc169358090710b8fe43adff368a9a5c57d2dc  D23670.patch"
diff --git a/community/kio/D23670.patch b/community/kio/D23670.patch
new file mode 100644
index 0000000000..7eb064e7d0
--- /dev/null
+++ b/community/kio/D23670.patch
@@ -0,0 +1,27 @@
+diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
+--- a/src/widgets/kpropertiesdialog.cpp
++++ b/src/widgets/kpropertiesdialog.cpp
+@@ -1155,15 +1155,15 @@
+         if (isLocal) {
+             KMountPoint::Ptr mp = KMountPoint::currentMountPoints().findByPath(url.toLocalFile());
+ 
+-            l = new QLabel(i18n("File System:"), d->m_frame);
+-            grid->addWidget(l, curRow, 0, Qt::AlignRight);
++            if (mp) {
++                l = new QLabel(i18n("File System:"), d->m_frame);
++                grid->addWidget(l, curRow, 0, Qt::AlignRight);
+ 
+-            l = new QLabel(d->m_frame);
+-            grid->addWidget(l, curRow++, 2);
+-            l->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
+-            l->setText(mp->mountType());
++                l = new QLabel(d->m_frame);
++                grid->addWidget(l, curRow++, 2);
++                l->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
++                l->setText(mp->mountType());
+ 
+-            if (mp) {
+                 l = new QLabel(i18n("Mounted on:"), d->m_frame);
+                 grid->addWidget(l, curRow, 0, Qt::AlignRight);
+ 
+
-- 
2.23.0