1 |
commit: 3f0b2caa2ee9f9f9f102d551f39bb632ec9f8652 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 8 10:44:11 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 8 10:47:12 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f0b2caa |
7 |
|
8 |
kde-plasma/plasma-integration: Fix initial remote dir selection |
9 |
|
10 |
Package-Manager: Portage-2.3.28, Repoman-2.3.9 |
11 |
|
12 |
...a-integration-5.12.4-remote-dir-selection.patch | 62 ++++++++++++++++++++++ |
13 |
.../plasma-integration-5.12.4-r1.ebuild | 45 ++++++++++++++++ |
14 |
2 files changed, 107 insertions(+) |
15 |
|
16 |
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 |
17 |
new file mode 100644 |
18 |
index 00000000000..a3c6d931e2b |
19 |
--- /dev/null |
20 |
+++ b/kde-plasma/plasma-integration/files/plasma-integration-5.12.4-remote-dir-selection.patch |
21 |
@@ -0,0 +1,62 @@ |
22 |
+From bfd41a95530f90ee8d44cbcfd1fa8c62978334a2 Mon Sep 17 00:00:00 2001 |
23 |
+From: Alex Richardson <Alexander.Richardson@×××××××××.uk> |
24 |
+Date: Sun, 8 Apr 2018 11:06:32 +0100 |
25 |
+Subject: KDEPlatformFileDialog: Fix initial directory selection for remote |
26 |
+ files |
27 |
+ |
28 |
+Summary: |
29 |
+Previously KDEPlatformFileDialogHelper::selectFile() would change |
30 |
+options()->initialDirectory() unconditionally even if it was already |
31 |
+set by the QFileDialog code. Since Qt 5.7.1 it is no longer necessary |
32 |
+to derive initialDirectory from the selectFile() call. In fact it is |
33 |
+actuall harmful since it will now override the correct initial directory |
34 |
+that was set by Qt. Without this patch I got the following debug output: |
35 |
+ |
36 |
+``` |
37 |
+KDEPlatformFileDialogHelper::setDirectory QUrl("sftp://server/home/alr48/cheri/build_sdk.sh") |
38 |
+KDEPlatformFileDialogHelper::setDirectory QUrl("sftp://server/home/alr48/cheri/build_sdk.sh") |
39 |
+KDEPlatformFileDialogHelper::selectFile QUrl("file:///home/alex/build_sdk.sh") |
40 |
+KDEPlatformFileDialogHelper::setDirectory QUrl("file:///home/alex/) |
41 |
+``` |
42 |
+The final setDirectory() call is actually a call to |
43 |
+`setDirectory(options->initialDirectory())` which was set in `selectFile()`. |
44 |
+ |
45 |
+We now depend on Qt 5.9 so we can remove this code without a check for |
46 |
+version >= 5.7.1. |
47 |
+ |
48 |
+BUG: 374913 |
49 |
+ |
50 |
+Test Plan: Remote directory is now opened correctly (tested with Qt 5.10.0) |
51 |
+ |
52 |
+Reviewers: #plasma, elvisangelaccio |
53 |
+ |
54 |
+Reviewed By: elvisangelaccio |
55 |
+ |
56 |
+Subscribers: ngraham, krzyc, anthonyfieroni, elvisangelaccio, graesslin, plasma-devel |
57 |
+ |
58 |
+Tags: #plasma |
59 |
+ |
60 |
+Differential Revision: https://phabricator.kde.org/D4193 |
61 |
+--- |
62 |
+ src/platformtheme/kdeplatformfiledialoghelper.cpp | 5 ----- |
63 |
+ 1 file changed, 5 deletions(-) |
64 |
+ |
65 |
+diff --git a/src/platformtheme/kdeplatformfiledialoghelper.cpp b/src/platformtheme/kdeplatformfiledialoghelper.cpp |
66 |
+index 1a2b1b5..d4ea0cd 100644 |
67 |
+--- a/src/platformtheme/kdeplatformfiledialoghelper.cpp |
68 |
++++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp |
69 |
+@@ -409,11 +409,6 @@ QUrl KDEPlatformFileDialogHelper::directory() const |
70 |
+ void KDEPlatformFileDialogHelper::selectFile(const QUrl &filename) |
71 |
+ { |
72 |
+ m_dialog->selectFile(filename); |
73 |
+- |
74 |
+- // Qt 5 at least <= 5.8.0 does not derive the directory from the passed url |
75 |
+- // and set the initialDirectory option accordingly, also not for known schemes |
76 |
+- // like file://, so we have to do it ourselves |
77 |
+- options()->setInitialDirectory(m_dialog->directory()); |
78 |
+ } |
79 |
+ |
80 |
+ void KDEPlatformFileDialogHelper::setDirectory(const QUrl &directory) |
81 |
+-- |
82 |
+cgit v0.11.2 |
83 |
+ |
84 |
|
85 |
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.12.4-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.12.4-r1.ebuild |
86 |
new file mode 100644 |
87 |
index 00000000000..d9391f82d7d |
88 |
--- /dev/null |
89 |
+++ b/kde-plasma/plasma-integration/plasma-integration-5.12.4-r1.ebuild |
90 |
@@ -0,0 +1,45 @@ |
91 |
+# Copyright 1999-2018 Gentoo Foundation |
92 |
+# Distributed under the terms of the GNU General Public License v2 |
93 |
+ |
94 |
+EAPI=6 |
95 |
+ |
96 |
+VIRTUALX_REQUIRED="test" |
97 |
+inherit kde5 |
98 |
+ |
99 |
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces" |
100 |
+LICENSE="LGPL-2+" |
101 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
102 |
+IUSE="" |
103 |
+ |
104 |
+DEPEND=" |
105 |
+ $(add_frameworks_dep kcompletion) |
106 |
+ $(add_frameworks_dep kconfig) |
107 |
+ $(add_frameworks_dep kconfigwidgets) |
108 |
+ $(add_frameworks_dep kcoreaddons) |
109 |
+ $(add_frameworks_dep ki18n) |
110 |
+ $(add_frameworks_dep kiconthemes) |
111 |
+ $(add_frameworks_dep kio) |
112 |
+ $(add_frameworks_dep kjobwidgets) |
113 |
+ $(add_frameworks_dep knotifications) |
114 |
+ $(add_frameworks_dep kwayland) |
115 |
+ $(add_frameworks_dep kwidgetsaddons) |
116 |
+ $(add_frameworks_dep kwindowsystem) |
117 |
+ $(add_frameworks_dep kxmlgui) |
118 |
+ $(add_plasma_dep breeze) |
119 |
+ $(add_qt_dep qtdbus) |
120 |
+ $(add_qt_dep qtgui 'dbus' '' '5=') |
121 |
+ $(add_qt_dep qtquickcontrols2) |
122 |
+ $(add_qt_dep qtwidgets) |
123 |
+ $(add_qt_dep qtx11extras) |
124 |
+ x11-libs/libXcursor |
125 |
+ x11-libs/libxcb |
126 |
+" |
127 |
+RDEPEND="${DEPEND} |
128 |
+ media-fonts/hack |
129 |
+ media-fonts/noto |
130 |
+" |
131 |
+ |
132 |
+# requires running kde environment |
133 |
+RESTRICT+=" test" |
134 |
+ |
135 |
+PATCHES=( "${FILESDIR}/${P}-remote-dir-selection.patch" ) |