From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- .../files/kio-extras-21.04.3-libmtp-0.1.19.patch | 26 ---------------------- 1 file changed, 26 deletions(-) delete mode 100644 kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch (limited to 'kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch') diff --git a/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch b/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch deleted file mode 100644 index 400fdd859652..000000000000 --- a/kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a6ecc8855a0a2a8f76234f77422940b863960944 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Sat, 2 Oct 2021 12:53:27 +0200 -Subject: [PATCH] Fix kio-mtp with libmtp 1.1.19 - -In libmtp 1.1.19, an empty string is returned instead of NULL for devices without a deviceName, which breaks accessing those devices with kio-mtp ---- - mtp/kiod_module/mtpdevice.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mtp/kiod_module/mtpdevice.cpp b/mtp/kiod_module/mtpdevice.cpp -index 8fe4abb2..f32cd1a4 100644 ---- a/mtp/kiod_module/mtpdevice.cpp -+++ b/mtp/kiod_module/mtpdevice.cpp -@@ -40,7 +40,7 @@ MTPDevice::MTPDevice(const QString &dbusObjectPath, LIBMTP_mtpdevice_t *device, - const char *deviceModel = LIBMTP_Get_Modelname(device); - - // prefer friendly devicename over model -- if (!deviceName) { -+ if (!deviceName || strlen(deviceName) == 0) { - m_friendlyName = QString::fromUtf8(deviceModel); - } else { - m_friendlyName = QString::fromUtf8(deviceName); --- -GitLab - -- cgit v1.2.3