diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
commit | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch) | |
tree | c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /kde-apps/kio-extras/files | |
parent | e9d044d4b9b71200a96adfa280848858c0f468c9 (diff) |
gentoo resync : 05.12.2021
Diffstat (limited to 'kde-apps/kio-extras/files')
-rw-r--r-- | kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch | 36 | ||||
-rw-r--r-- | kde-apps/kio-extras/files/kio-extras-21.04.3-libmtp-0.1.19.patch | 26 |
2 files changed, 0 insertions, 62 deletions
diff --git a/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch b/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch deleted file mode 100644 index dff398e68a25..000000000000 --- a/kde-apps/kio-extras/files/kio-extras-21.04.3-kio_filenamesearch-crash.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5dff395ecea2977cf149c293c16c4d4a5151493b Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -Date: Fri, 9 Jul 2021 17:11:02 +0200 -Subject: [PATCH] kio_filenamesearch: fix crash due to KCoreDirLister changes - -Error reporting was changed in KCoreDirlister, to match the original behaviour -we need to explicitly disable auto error handling. - -This fixes a crash while searching in Dolphin, kio_filenamesearch intrenally -uses a dirlister, and a nested event loop, if there is an error while listing -some dir it tries to report it using a job ui delegate, but the parent job -could well be dead by that time, which causes a crash: -"QWidget: Cannot create a QWidget without QApplication" - -Note that this crash only happens if KDE_FORK_SLAVES is _not_ set. - -BUG: 438187 ---- - filenamesearch/kio_filenamesearch.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/filenamesearch/kio_filenamesearch.cpp b/filenamesearch/kio_filenamesearch.cpp -index 4d15aac2..5651a025 100644 ---- a/filenamesearch/kio_filenamesearch.cpp -+++ b/filenamesearch/kio_filenamesearch.cpp -@@ -102,6 +102,7 @@ void FileNameSearchProtocol::searchDirectory(const QUrl &directory, - QScopedPointer<KCoreDirLister> dirLister(new KCoreDirLister); - dirLister->setDelayedMimeTypes(true); - dirLister->openUrl(directory); -+ dirLister->setAutoErrorHandlingEnabled(false); - - QEventLoop eventLoop; - QObject::connect(dirLister.data(), static_cast<void(KCoreDirLister::*)()>(&KCoreDirLister::canceled), --- -GitLab - 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 <arojas@archlinux.org> -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 - |