From 49377dee86da01afeac3d77400376cb7010994c6 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 9 Apr 2018 16:20:13 +0200 Subject: kde-plasma/plasma-integration: Remove patch, applied upstream Package-Manager: Portage-2.3.24, Repoman-2.3.6 --- ...a-integration-5.12.4-remote-dir-selection.patch | 62 ---------------------- .../plasma-integration-5.12.49.9999.ebuild | 2 - 2 files changed, 64 deletions(-) delete mode 100644 kde-plasma/plasma-integration/files/plasma-integration-5.12.4-remote-dir-selection.patch diff --git a/kde-plasma/plasma-integration/files/plasma-integration-5.12.4-remote-dir-selection.patch b/kde-plasma/plasma-integration/files/plasma-integration-5.12.4-remote-dir-selection.patch deleted file mode 100644 index a3c6d931e2..0000000000 --- a/kde-plasma/plasma-integration/files/plasma-integration-5.12.4-remote-dir-selection.patch +++ /dev/null @@ -1,62 +0,0 @@ -From bfd41a95530f90ee8d44cbcfd1fa8c62978334a2 Mon Sep 17 00:00:00 2001 -From: Alex Richardson -Date: Sun, 8 Apr 2018 11:06:32 +0100 -Subject: KDEPlatformFileDialog: Fix initial directory selection for remote - files - -Summary: -Previously KDEPlatformFileDialogHelper::selectFile() would change -options()->initialDirectory() unconditionally even if it was already -set by the QFileDialog code. Since Qt 5.7.1 it is no longer necessary -to derive initialDirectory from the selectFile() call. In fact it is -actuall harmful since it will now override the correct initial directory -that was set by Qt. Without this patch I got the following debug output: - -``` -KDEPlatformFileDialogHelper::setDirectory QUrl("sftp://server/home/alr48/cheri/build_sdk.sh") -KDEPlatformFileDialogHelper::setDirectory QUrl("sftp://server/home/alr48/cheri/build_sdk.sh") -KDEPlatformFileDialogHelper::selectFile QUrl("file:///home/alex/build_sdk.sh") -KDEPlatformFileDialogHelper::setDirectory QUrl("file:///home/alex/) -``` -The final setDirectory() call is actually a call to -`setDirectory(options->initialDirectory())` which was set in `selectFile()`. - -We now depend on Qt 5.9 so we can remove this code without a check for -version >= 5.7.1. - -BUG: 374913 - -Test Plan: Remote directory is now opened correctly (tested with Qt 5.10.0) - -Reviewers: #plasma, elvisangelaccio - -Reviewed By: elvisangelaccio - -Subscribers: ngraham, krzyc, anthonyfieroni, elvisangelaccio, graesslin, plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D4193 ---- - src/platformtheme/kdeplatformfiledialoghelper.cpp | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/platformtheme/kdeplatformfiledialoghelper.cpp b/src/platformtheme/kdeplatformfiledialoghelper.cpp -index 1a2b1b5..d4ea0cd 100644 ---- a/src/platformtheme/kdeplatformfiledialoghelper.cpp -+++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp -@@ -409,11 +409,6 @@ QUrl KDEPlatformFileDialogHelper::directory() const - void KDEPlatformFileDialogHelper::selectFile(const QUrl &filename) - { - m_dialog->selectFile(filename); -- -- // Qt 5 at least <= 5.8.0 does not derive the directory from the passed url -- // and set the initialDirectory option accordingly, also not for known schemes -- // like file://, so we have to do it ourselves -- options()->setInitialDirectory(m_dialog->directory()); - } - - void KDEPlatformFileDialogHelper::setDirectory(const QUrl &directory) --- -cgit v0.11.2 - diff --git a/kde-plasma/plasma-integration/plasma-integration-5.12.49.9999.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.12.49.9999.ebuild index ecf070fa24..f508a4b391 100644 --- a/kde-plasma/plasma-integration/plasma-integration-5.12.49.9999.ebuild +++ b/kde-plasma/plasma-integration/plasma-integration-5.12.49.9999.ebuild @@ -41,5 +41,3 @@ RDEPEND="${DEPEND} # requires running kde environment RESTRICT+=" test" - -PATCHES=( "${FILESDIR}/${PN}-5.12.4-remote-dir-selection.patch" ) -- cgit v1.2.3-65-gdbad